Author: nthykier Date: 2012-06-19 19:06:08 +0000 (Tue, 19 Jun 2012) New Revision: 16165
Added: trunk/junit4/debian/patches/java7-ignore-test.patch Modified: trunk/junit4/debian/changelog trunk/junit4/debian/patches/series Log: Fix FTBFS with Java7 Modified: trunk/junit4/debian/changelog =================================================================== --- trunk/junit4/debian/changelog 2012-06-19 18:33:36 UTC (rev 16164) +++ trunk/junit4/debian/changelog 2012-06-19 19:06:08 UTC (rev 16165) @@ -1,3 +1,12 @@ +junit4 (4.10-3) UNRELEASED; urgency=low + + * Team upload. + * Skip test that relies on execution order that is not + guaranteed with Java7. Thanks to James Page for the + patch. (Closes: #678171) + + -- Niels Thykier <[email protected]> Tue, 19 Jun 2012 21:02:29 +0200 + junit4 (4.10-2) unstable; urgency=low * Remove Bundle-ClassPath attribute from jar manifest. Added: trunk/junit4/debian/patches/java7-ignore-test.patch =================================================================== --- trunk/junit4/debian/patches/java7-ignore-test.patch (rev 0) +++ trunk/junit4/debian/patches/java7-ignore-test.patch 2012-06-19 19:06:08 UTC (rev 16165) @@ -0,0 +1,28 @@ +Description: This test case makes assumptions about the order + of execution of tests in the Fruit.class test which are not + guaranteed under Java 7. + . + This is being worked on upstream for a future release on JUnit. +Author: James Page <[email protected]> +Forwarded: not-needed + +Index: junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java +=================================================================== +--- junit4.orig/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:04:38.165350000 +0100 ++++ junit4/src/test/java/org/junit/tests/running/classes/ParentRunnerTest.java 2012-05-21 14:29:26.162439110 +0100 +@@ -9,6 +9,7 @@ + + import org.hamcrest.Matcher; + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.internal.matchers.TypeSafeMatcher; + import org.junit.runner.Description; + import org.junit.runner.JUnitCore; +@@ -38,6 +39,7 @@ + } + } + ++ @Ignore + @Test + public void useChildHarvester() throws InitializationError { + log= ""; Modified: trunk/junit4/debian/patches/series =================================================================== --- trunk/junit4/debian/patches/series 2012-06-19 18:33:36 UTC (rev 16164) +++ trunk/junit4/debian/patches/series 2012-06-19 19:06:08 UTC (rev 16165) @@ -1,2 +1,3 @@ workaround_typing_bug.diff manifest_jar.diff +java7-ignore-test.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
