[pkg-java] r18266 - in trunk/junit4/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-16 21:19:22 +0000 (Wed, 16 Jul 2014)
New Revision: 18266

Added:
   trunk/junit4/debian/patches/java8-compatibility.patch
Modified:
   trunk/junit4/debian/changelog
   trunk/junit4/debian/patches/series
Log:
Fixed a compatibility issue with Java 8



Modified: trunk/junit4/debian/changelog
===================================================================
--- trunk/junit4/debian/changelog	2014-07-16 20:11:50 UTC (rev 18265)
+++ trunk/junit4/debian/changelog	2014-07-16 21:19:22 UTC (rev 18266)
@@ -1,5 +1,6 @@
 junit4 (4.11-3) UNRELEASED; urgency=medium
 
+  * Fixed a compatibility issue with Java 8
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Added: trunk/junit4/debian/patches/java8-compatibility.patch
===================================================================
--- trunk/junit4/debian/patches/java8-compatibility.patch	                        (rev 0)
+++ trunk/junit4/debian/patches/java8-compatibility.patch	2014-07-16 21:19:22 UTC (rev 18266)
@@ -0,0 +1,49 @@
+Description: Fixes the build with Java 8
+Origin: upstream, https://github.com/junit-team/junit/commit/88f7a12
+Bug: https://github.com/junit-team/junit/issues/749
+--- a/src/main/java/org/junit/runners/model/FrameworkMethod.java
++++ b/src/main/java/org/junit/runners/model/FrameworkMethod.java
+@@ -87,9 +87,6 @@
+             String state = isStatic ? "should" : "should not";
+             errors.add(new Exception("Method " + fMethod.getName() + "() " + state + " be static"));
+         }
+-        if (!Modifier.isPublic(fMethod.getDeclaringClass().getModifiers())) {
+-            errors.add(new Exception("Class " + fMethod.getDeclaringClass().getName() + " should be public"));
+-        }
+         if (!Modifier.isPublic(fMethod.getModifiers())) {
+             errors.add(new Exception("Method " + fMethod.getName() + "() should be public"));
+         }
+--- a/src/test/java/org/junit/tests/AllTests.java
++++ b/src/test/java/org/junit/tests/AllTests.java
+@@ -77,7 +77,6 @@
+ import org.junit.tests.running.methods.TimeoutTest;
+ import org.junit.tests.validation.BadlyFormedClassesTest;
+ import org.junit.tests.validation.FailedConstructionTest;
+-import org.junit.tests.validation.InaccessibleBaseClassTest;
+ import org.junit.tests.validation.ValidationTest;
+ 
+ // These test files need to be cleaned. See
+@@ -118,7 +117,6 @@
+         JUnit38ClassRunnerTest.class,
+         SystemExitTest.class,
+         JUnitCoreReturnsCorrectExitCodeTest.class,
+-        InaccessibleBaseClassTest.class,
+         SuiteMethodTest.class,
+         BadlyFormedClassesTest.class,
+         IgnoreClassTest.class,
+--- a/src/test/java/org/junit/tests/validation/InaccessibleBaseClassTest.java
++++ /dev/null
+@@ -1,13 +0,0 @@
+-package org.junit.tests.validation;
+-
+-import org.junit.Test;
+-import org.junit.runners.BlockJUnit4ClassRunner;
+-import org.junit.runners.model.InitializationError;
+-import org.junit.tests.validation.anotherpackage.Sub;
+-
+-public class InaccessibleBaseClassTest {
+-    @Test(expected = InitializationError.class)
+-    public void inaccessibleBaseClassIsCaughtAtValidation() throws InitializationError {
+-        new BlockJUnit4ClassRunner(Sub.class);
+-    }
+-}

Modified: trunk/junit4/debian/patches/series
===================================================================
--- trunk/junit4/debian/patches/series	2014-07-16 20:11:50 UTC (rev 18265)
+++ trunk/junit4/debian/patches/series	2014-07-16 21:19:22 UTC (rev 18266)
@@ -1,3 +1,4 @@
 manifest_jar.diff
 java7-ignore-test.patch
 003_javadoc-fix.patch
+java8-compatibility.patch