Skip to content

Commit

Permalink
dev-java/mockito: conditionally skip a test failing with jdk:21
Browse files Browse the repository at this point in the history
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
  • Loading branch information
vaukai committed Apr 15, 2024
1 parent 2f229c0 commit 19b1fca
Show file tree
Hide file tree
Showing 3 changed files with 149 additions and 1 deletion.
@@ -0,0 +1,41 @@
There was 1 failure:
1) unused_stubbings(org.mockito.internal.junit.UnusedStubbingsTest)
java.lang.AssertionError:
Expecting:
<"[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):
[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)
[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:0)
">
to be in:
<["[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):
[MockitoHint] 1. Unused -> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
[MockitoHint] 2. Unused -> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
",
"[MockitoHint] MyTest.myTestMethod (see javadoc for MockitoHint):
[MockitoHint] 1. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
[MockitoHint] 2. Unused -> at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
"]>

at org.mockito.internal.junit.UnusedStubbingsTest.unused_stubbings(UnusedStubbingsTest.java:50)

FAILURES!!!
Tests run: 2, Failures: 1
--- a/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java
+++ b/src/test/java/org/mockito/internal/junit/UnusedStubbingsTest.java
@@ -5,6 +5,7 @@
package org.mockito.internal.junit;

import org.junit.Test;
+import org.junit.Ignore;
import org.mockito.internal.invocation.InvocationBuilder;
import org.mockito.internal.stubbing.StubbedInvocationMatcher;
import org.mockito.internal.util.SimpleMockitoLogger;
@@ -34,7 +35,7 @@ public class UnusedStubbingsTest extends TestBase {
assertEquals("", logger.getLoggedInfo());
}

- @Test
+ @Test @Ignore
public void unused_stubbings() throws Exception {
//given
UnusedStubbings stubbings = new UnusedStubbings(Arrays.asList(
107 changes: 107 additions & 0 deletions dev-java/mockito/mockito-2.28.2-r1.ebuild
@@ -0,0 +1,107 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

JAVA_PKG_IUSE="doc source test"
MAVEN_ID="org.mockito:mockito-core:${PV}"
JAVA_TESTING_FRAMEWORKS="junit-4"

inherit java-pkg-2 java-pkg-simple

DESCRIPTION="Mockito mock objects library core API and implementation"
HOMEPAGE="https://github.com/mockito/mockito"
SRC_URI="https://github.com/mockito/mockito/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}"

LICENSE="MIT"
SLOT="2"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"

# Tests need a version of byte-buddy supporting Java 21.
CP_DEPEND="
dev-java/asm:9
>=dev-java/byte-buddy-1.14.13:0
dev-java/objenesis:0
"

DEPEND="
dev-java/junit:4
dev-java/opentest4j:0
>=virtual/jdk-1.8:*
${CP_DEPEND}
test? ( dev-java/assertj-core:3 )
"

RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}
"

# see https://bugs.gentoo.org/903897
PATCHES=( "${FILESDIR}/mockito-2.28.2-skip-failing-tests.patch" )

JAVA_AUTOMATIC_MODULE_NAME="org.mockito"
JAVA_CLASSPATH_EXTRA="junit-4 opentest4j"
JAVA_SRC_DIR="src/main/java"

JAVA_TEST_EXCLUDES=(
org.mockito.internal.junit.JUnitRuleTest # We run it in JAVA_TEST_RUN_ONLY
org.mockito.internal.util.reflection.DummyClassForTests # No runnable methods
org.mockito.internal.util.reflection.DummyParentClassForTests # No runnable methods
org.mockito.junit.TestableJUnitRunner # No runnable methods
org.mockitoutil.TestBase # No runnable methods
)
JAVA_TEST_GENTOO_CLASSPATH="assertj-core-3,junit-4"
JAVA_TEST_RUN_ONLY=(
# This needs to run separately, otherwise one of its 4 tests would fail.
org.mockito.internal.junit.JUnitRuleTest
)
JAVA_TEST_SRC_DIR="src/test/java"

src_prepare() {
java-pkg-2_src_prepare
default
# dev-java/byte-buddy is built from byte-buddy-dep without shaded stuff.
sed \
-e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \
-i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \
-i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die
}

src_compile() {
java-pkg-simple_src_compile
mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} || die
jar ufv mockito.jar -C target/classes org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.raw || die
}

src_test() {
# Increasing number of test failures with higher Java versions
# Test failures are documented in https://bugs.gentoo.org/903897
local vm_version="$(java-config -g PROVIDES_VERSION)"
if ver_test "${vm_version}" -ge 21; then
eapply "${FILESDIR}/mockito-2.28.2-UnusedStubbingsTest-java21.patch"
fi
if ver_test "${vm_version}" -ge 11; then
JAVA_TEST_EXCLUDES+=(
org.mockito.internal.stubbing.defaultanswers.ReturnsMocksTest
org.mockitousage.bugs.GenericsMockitoAnnotationsTest
)
fi
if ver_test "${vm_version}" -ge 17; then
JAVA_TEST_EXCLUDES+=(
org.concurrentmockito.ThreadsRunAllTestsHalfManualTest
org.mockitousage.matchers.InvalidUseOfMatchersTest
org.mockitousage.serialization.DeepStubsSerializableTest
org.mockitousage.stubbing.StubbingWithDelegateTest
)
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED )
fi
# First run what needs to run separately
java-pkg-simple_src_test
# And then the other tests
JAVA_TEST_RUN_ONLY=""
java-pkg-simple_src_test
}
2 changes: 1 addition & 1 deletion dev-java/mockito/mockito-2.28.2.ebuild
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8
Expand Down

0 comments on commit 19b1fca

Please sign in to comment.