[gentoo-commits] repo/gentoo:master commit in: dev-java/easymock/

[Florian Schmaus]

commit:     53e15a41acd0c5076a04e904d8eaed7b173b2cae
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 29 12:04:01 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 08:56:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e15a41

dev-java/easymock: fix tests with jdk-17

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25674
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/easymock/easymock-3.3.1-r1.ebuild | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 26eb0db0b3c8..8a7db3b2235f 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -58,3 +58,14 @@ src_prepare() {
 	# cannot find symbol   o = ProxyBuilder.forClass(ArrayList.class)
 	rm easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java || die
 }
+
+src_test() {
+	# ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws
+	# java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @66da75e4
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}