commit: 3bd01cd20a42ef1e896f8cd9172c23fb68c81cc3 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Nov 15 18:41:00 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Nov 15 18:41:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd01cd2
dev-java/mockito: fixed a test in 2.28.2 Bug: https://bugs.gentoo.org/930103 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/mockito-2.28.2-fix-unused-stubbings-test.patch | 14 ++++++++++++++ dev-java/mockito/mockito-2.28.2.ebuild | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch new file mode 100644 index 000000000000..7689b4e64f65 --- /dev/null +++ b/dev-java/mockito/files/mockito-2.28.2-fix-unused-stubbings-test.patch @@ -0,0 +1,14 @@ +--- a/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java ++++ b/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java +@@ -53,7 +53,10 @@ public class UnusedStubbingsTest extends TestBase { + "[MockitoHint] 2. Unused -> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n", + "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" + //Java 9 + "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" + +- "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n" ++ "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n", ++ "[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):\n" + //Java 21 ++ "[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n" + ++ "[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)\n" + ); + } + } diff --git a/dev-java/mockito/mockito-2.28.2.ebuild b/dev-java/mockito/mockito-2.28.2.ebuild index e4b9495c0ec1..92706ad5b55e 100644 --- a/dev-java/mockito/mockito-2.28.2.ebuild +++ b/dev-java/mockito/mockito-2.28.2.ebuild @@ -38,7 +38,10 @@ RDEPEND=" " # see https://bugs.gentoo.org/903897 -PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" ) +PATCHES=( + "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" + "${FILESDIR}/mockito-2.28.2-fix-unused-stubbings-test.patch" +) JAVA_AUTOMATIC_MODULE_NAME="org.mockito" JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
