From eabdf0892f779c6f232d4ad6b40bb846072ab5c1 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Fri, 1 Dec 2023 11:02:17 +0100 Subject: dev-java/felix-gogo-runtime: enabled tests for all java versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Šulc --- .../felix-gogo-runtime-1.1.6.ebuild | 17 ++++------------- ...-gogo-runtime-1.1.6-skip-tests-non-java-8.patch | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch (limited to 'dev-java/felix-gogo-runtime') diff --git a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild index 2b36a365fe85..ce4df3018c1d 100644 --- a/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild +++ b/dev-java/felix-gogo-runtime/felix-gogo-runtime-1.1.6.ebuild @@ -37,6 +37,8 @@ RDEPEND="${CP_DEPEND} BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc" +PATCHES=( "${FILESDIR}/${P}-skip-tests-non-java-8.patch" ) + JAVA_SRC_DIR="src/main/java" JAVA_TEST_EXCLUDES=( #Invalid test class No runnable methods @@ -48,17 +50,6 @@ JAVA_TEST_GENTOO_CLASSPATH=" " JAVA_TEST_SRC_DIR="src/test/java" -src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -lt 11; then - java-pkg-simple_src_test - else - # There was 1 failure: - # 1) testPipe(org.apache.felix.gogo.runtime.TestParser) - # org.junit.ComparisonFailure: expected:<[def]> but was:<[]> - # at org.junit.Assert.assertEquals(Assert.java:117) - # at org.junit.Assert.assertEquals(Assert.java:146) - # at org.apache.felix.gogo.runtime.TestParser.testPipe(TestParser.java:152) - einfo "Tests would fail with Java 11 or higher" - fi +src_prepare() { + default } diff --git a/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch new file mode 100644 index 000000000000..270b01be759a --- /dev/null +++ b/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-1.1.6-skip-tests-non-java-8.patch @@ -0,0 +1,22 @@ +skip tests that fail with java > 1.8 if java > 1.8 is used + +we compare here just that the first part of the version is 1 +which is true only for version 1.8, other versions have first number +like 11, 17, 21 and those fail the condition hence the remaining tests +are skipped +we cannot use System.version() here as this is available only since java 9 + +--- a/src/test/java/org/apache/felix/gogo/runtime/TestParser.java ++++ b/src/test/java/org/apache/felix/gogo/runtime/TestParser.java +@@ -149,9 +149,10 @@ public class TestParser extends AbstractParserTest + assertEquals("def", c.execute("echo def|grep d.*|capture")); + assertEquals("def", c.execute("echoout def|grep d.*|capture")); + assertEquals("def", c.execute("myecho def|grep d.*|capture")); +- assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("", c.execute("echoout def; echoout ghi | grep d.* | capture")); + assertEquals("hello world", c.execute("echo hello world|capture")); ++ org.junit.Assume.assumeTrue("1".equals(System.getProperty("java.version").split("\\.")[0])); ++ assertEquals("def", c.execute("(echoout abc; echoout def; echoout ghi)|grep d.*|capture")); + assertEquals("defghi", c.execute("(echoout abc; echoout def; echoout ghi)|grep 'def|ghi'|capture")); + } + -- cgit v1.2.3-65-gdbad