Merge pull request #716 from brettchabot/master

Fix annotation collection from super classes of JUnit3 tests.
junit-team · Aug 20, 2013 · 53e940c · 53e940c
2 parents db32e53 + 8105369
commit 53e940c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java b/src/main/java/org/junit/internal/runners/JUnit38ClassRunner.java
@@ -128,7 +128,7 @@ private static Description makeDescription(Test test) {
      */
     private static Annotation[] getAnnotations(TestCase test) {
         try {
-            Method m = test.getClass().getDeclaredMethod(test.getName());
+            Method m = test.getClass().getMethod(test.getName());
             return m.getDeclaredAnnotations();
         } catch (SecurityException e) {
         } catch (NoSuchMethodException e) {

diff --git a/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java b/src/test/java/org/junit/tests/junit3compatibility/JUnit38ClassRunnerTest.java
@@ -103,9 +103,22 @@ public void testNotAnnotated() {
         }
     }
 
+    public static class DerivedAnnotatedMethod extends JUnit3ClassWithAnnotatedMethod {
+    }
+
     @Test
     public void getDescriptionWithAnnotation() {
         JUnit38ClassRunner runner = new JUnit38ClassRunner(JUnit3ClassWithAnnotatedMethod.class);
+        assertAnnotationFiltering(runner);
+    }
+
+    @Test
+    public void getDescriptionWithAnnotationInSuper() {
+        JUnit38ClassRunner runner = new JUnit38ClassRunner(DerivedAnnotatedMethod.class);
+        assertAnnotationFiltering(runner);
+    }
+
+    private void assertAnnotationFiltering(JUnit38ClassRunner runner) {
         Description d = runner.getDescription();
         assertEquals(2, d.testCount());
         for (Description methodDesc : d.getChildren()) {