Merge pull request junit-team#968 from stefanbirkner/category

Avoid repeated checks.
marcphilipp · Dec 6, 2014 · 1fc1c12 · 1fc1c12
2 parents d712ef9 + 7216e4b
commit 1fc1c12
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/junit/experimental/categories/Categories.java b/src/main/java/org/junit/experimental/categories/Categories.java
@@ -339,12 +339,13 @@ private static boolean isAnyExcluded(Class<?> klass) {
     }
 
     private static void assertNoCategorizedDescendentsOfUncategorizeableParents(Description description) throws InitializationError {
-        if (!canHaveCategorizedChildren(description)) {
+        if (canHaveCategorizedChildren(description)) {
+            for (Description each : description.getChildren()) {
+                assertNoCategorizedDescendentsOfUncategorizeableParents(each);
+            }
+        } else {
             assertNoDescendantsHaveCategoryAnnotations(description);
         }
-        for (Description each : description.getChildren()) {
-            assertNoCategorizedDescendentsOfUncategorizeableParents(each);
-        }
     }
 
     private static void assertNoDescendantsHaveCategoryAnnotations(Description description) throws InitializationError {