Emmanuel Bourg pushed to branch master at Debian Java Maintainers / afterburner.fx
Commits: 6d0d172e by Emmanuel Bourg at 2019-09-17T22:15:24Z Fixed the tests to work with Mockito 2.x - - - - - e142f6e0 by Emmanuel Bourg at 2019-09-17T22:15:30Z Standards-Version updated to 4.4.0 - - - - - 093bf8a8 by Emmanuel Bourg at 2019-09-17T22:15:39Z Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/mockito-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +afterburner.fx (1.7.0-3) unstable; urgency=medium + + * Team upload. + * Fixed the tests to work with Mockito 2.x + * Standards-Version updated to 4.4.0 + + -- Emmanuel Bourg <[email protected]> Wed, 18 Sep 2019 00:15:33 +0200 + afterburner.fx (1.7.0-2) unstable; urgency=medium * Update Vcs URLs to point to Salsa ===================================== debian/control ===================================== @@ -17,7 +17,7 @@ Build-Depends-Indep: default-jdk-doc, libopenjfx-java, xauth, xvfb -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/java-team/afterburner.fx.git Vcs-Browser: https://salsa.debian.org/java-team/afterburner.fx Homepage: http://afterburner.adam-bien.com ===================================== debian/patches/mockito-compatibility.patch ===================================== @@ -0,0 +1,25 @@ +Description: Fixes the compatibility with the version of Mockito in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/com/airhacks/afterburner/injection/InjectorTest.java ++++ b/src/test/java/com/airhacks/afterburner/injection/InjectorTest.java +@@ -109,7 +109,7 @@ + Function<Class<?>, Object> provider = t -> Mockito.mock(t); + Injector.setInstanceSupplier(provider); + Object mock = Injector.instantiateModelOrService(Model.class); +- assertTrue(mock.getClass().getName().contains("ByMockito")); ++ assertTrue(mock.getClass().getName().contains("Mockito")); + Injector.resetInstanceSupplier(); + } + +--- a/src/test/java/com/airhacks/afterburner/injection/MockingTest.java ++++ b/src/test/java/com/airhacks/afterburner/injection/MockingTest.java +@@ -99,7 +99,7 @@ + Injector.setInstanceSupplier(provider); + TopgunView view = new TopgunView(); + TopgunPresenter cut = (TopgunPresenter) view.getPresenter(); +- assertTrue(cut.getGunService().getClass().getName().contains("ByMockito")); ++ assertTrue(cut.getGunService().getClass().getName().contains("Mockito")); + + } + ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ javafx_pom.patch javax_pom.patch disable_shade_jar.patch +mockito-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/afterburner.fx/compare/a0436421fddbd2cea32d559c46a36c1b7d2580c8...093bf8a8a48b26c0d3890087bf22ea0e535f9542 -- View it on GitLab: https://salsa.debian.org/java-team/afterburner.fx/compare/a0436421fddbd2cea32d559c46a36c1b7d2580c8...093bf8a8a48b26c0d3890087bf22ea0e535f9542 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
