gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/stringtemplate: fixed tests in java 21+ for 4.3.4 + simplified applying the patch

Browse Source 
Closes: https://bugs.gentoo.org/936535
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
2024-07-26 11:33:47 +02:00
parent d692e3e1fb
commit 8fc319802f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch → dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
View File

@@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = "datetime: 7/5/05, 12:00 AM";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = "datetime: 7/5/05 12:00 AM";
+ } else if ( javaVersion.startsWith("21") ) {
+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = "datetime: 7/5/05, 12:00 AM";
}
String result = st.render();
@@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = " datetime: 7/5/05, 12:00 AM ";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = " datetime: 7/5/05 12:00 AM ";
+ } else if ( javaVersion.startsWith("21") ) {
+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " datetime: 7/5/05, 12:00 AM ";
}
String result = st.render();
@@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow space)
String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
+ } else if ( javaVersion.startsWith("21") ) {
+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
}
String result = st.render();
@@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow space)
ST st = group.getInstanceOf("dateThing");
st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
String expecting = " time: 12:00:00 AM ";
+ if ( javaVersion.startsWith("21") ) {
+ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
+ expecting = " time: 12:00:00 AM ";
+ }
String result = st.render();

9
dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
View File

@@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
PATCHES=(
"${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch"
"${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch"
)
src_prepare() {
default #780585
@@ -65,10 +68,6 @@ src_prepare() {
}
src_test() {
local vm_version="$(java-config -g PROVIDES_VERSION)"
if ver_test "${vm_version}" -ge 21; then
eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
fi
# Make sure no older versions of this slot are present in the classpath
# https://bugs.gentoo.org/834138#c4
local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"