commit: 7fb9bfdf0bd566987a8ee0ae872199e40d38460a Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Oct 18 16:09:30 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Oct 19 07:33:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb9bfdf
dev-java/jcommander: v1.64 enable tests Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/33398 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../jcommander-1.64-DynamicParameterTest.patch | 57 ++++++++++++++++++++++ ...ander-1.64.ebuild => jcommander-1.64-r1.ebuild} | 15 +++++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch new file mode 100644 index 000000000000..9867533bcf25 --- /dev/null +++ b/dev-java/jcommander/files/jcommander-1.64-DynamicParameterTest.patch @@ -0,0 +1,57 @@ +FAILED: usage +java.lang.NullPointerException: Cannot invoke "com.beust.jcommander.Parameter.order()" because "<local3>" is null + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:144) + at com.beust.jcommander.JCommander$Options$1.compare(JCommander.java:139) + at java.base/java.util.TimSort.countRunAndMakeAscending(TimSort.java:355) + at java.base/java.util.TimSort.sort(TimSort.java:220) + at java.base/java.util.Arrays.sort(Arrays.java:1307) + at java.base/java.util.ArrayList.sort(ArrayList.java:1721) + at java.base/java.util.Collections.sort(Collections.java:179) + at com.beust.jcommander.JCommander.usage(JCommander.java:1158) + at com.beust.jcommander.JCommander.usage(JCommander.java:1113) + at com.beust.jcommander.dynamic.DynamicParameterTest.usage(DynamicParameterTest.java:40) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:568) + at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:108) + at org.testng.internal.Invoker.invokeMethod(Invoker.java:661) + at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:869) + at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1193) + at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:129) + at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:112) + at org.testng.TestRunner.privateRun(TestRunner.java:756) + at org.testng.TestRunner.run(TestRunner.java:610) + at org.testng.SuiteRunner.runTest(SuiteRunner.java:380) + at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:375) + at org.testng.SuiteRunner.privateRun(SuiteRunner.java:340) + at org.testng.SuiteRunner.run(SuiteRunner.java:289) + at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52) + at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86) + at org.testng.TestNG.runSuitesSequentially(TestNG.java:1306) + at org.testng.TestNG.runSuitesLocally(TestNG.java:1231) + at org.testng.TestNG.runSuites(TestNG.java:1146) + at org.testng.TestNG.run(TestNG.java:1117) + at org.testng.TestNG.privateMain(TestNG.java:1447) + at org.testng.TestNG.main(TestNG.java:1416) + + +=============================================== + JCommander tests + Tests run: 189, Failures: 1, Skips: 0 +=============================================== +--- a/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java ++++ b/src/test/java/com/beust/jcommander/dynamic/DynamicParameterTest.java +@@ -35,10 +35,12 @@ public class DynamicParameterTest { + simple("-Da=b", "-Dc=d"); + } + ++ /* + public void usage() { + DSimple ds = new DSimple(); + new JCommander(ds).usage(new StringBuilder()); + } ++ */ + + public void differentAssignment() { + DSimple ds = new DSimple(); diff --git a/dev-java/jcommander/jcommander-1.64.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild similarity index 60% rename from dev-java/jcommander/jcommander-1.64.ebuild rename to dev-java/jcommander/jcommander-1.64-r1.ebuild index cb9a9a664486..56c20292fbc5 100644 --- a/dev-java/jcommander/jcommander-1.64.ebuild +++ b/dev-java/jcommander/jcommander-1.64-r1.ebuild @@ -3,8 +3,9 @@ EAPI=8 -JAVA_PKG_IUSE="doc source" +JAVA_PKG_IUSE="doc source test" MAVEN_ID="com.beust:jcommander:${PV}" +JAVA_TESTING_FRAMEWORKS="testng" inherit java-pkg-2 java-pkg-simple @@ -20,4 +21,16 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" +PATCHES=( "${FILESDIR}/jcommander-1.64-DynamicParameterTest.patch" ) + JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="testng" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" +JAVA_TEST_RUN_ONLY="src/test/resources/testng.xml" +JAVA_TEST_SRC_DIR="src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +}
