commit: ad23555f42b141a10663229c379349a6408b02c5 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Tue Apr 5 18:06:30 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sun Apr 10 15:12:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad23555f
dev-java/fop: Enable tests on fop-core Closes: https://bugs.gentoo.org/836752 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/24920 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/fop/fop-2.7.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index b6bc2ad9ebca..01d732a46cb4 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -31,7 +31,7 @@ DEPEND="${CP_DEPEND} dev-java/ant-core:0 dev-java/sun-jai-bin:0 test? ( - dev-java/mockito:0 + dev-java/mockito:4 dev-java/pdfbox:0 dev-java/xmlunit:1 ) @@ -119,7 +119,7 @@ src_compile() { } src_test() { - JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,pdfbox,xmlunit-1" + JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,pdfbox,xmlunit-1" JAVA_TEST_SRC_DIR="fop-events/src/test/java" JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase" @@ -130,13 +130,14 @@ src_test() { java-pkg-simple_src_test + sed \ + -e 's:verifyZeroInteractions:verifyNoInteractions:' \ + -i fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java || die + JAVA_TEST_SRC_DIR="fop-core/src/test/java" JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources" - # Testing fop-core seems to want a newer mockito: - # error: cannot find symbol - # import static org.mockito.ArgumentMatchers.anyInt; -# java-pkg-simple_src_test + java-pkg-simple_src_test } src_install() {
