Fix test active conditions for beans defined in super class

micronaut-projects · Oct 5, 2020 · 608c882 · 608c882
1 parent 0643574
commit 608c882
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/test-core/src/main/java/io/micronaut/test/condition/TestActiveCondition.java b/test-core/src/main/java/io/micronaut/test/condition/TestActiveCondition.java
@@ -63,7 +63,11 @@ public boolean matches(ConditionContext context) {
                             final String rootName = packageName + ".$" + simpleName;
                             return declaringTypeClass.isAssignableFrom(activeSpecClazz) || declaringTypeName.equals(rootName) || declaringTypeName.startsWith(rootName + "$");
                         } else {
-                            return declaringTypeClass.isAssignableFrom(activeSpecClazz) || activeSpecName.equals(declaringTypeName) || declaringTypeName.startsWith(activeSpecName + "$");
+                            final String simpleName = NameUtils.getSimpleName(activeSpecName);
+                            return declaringTypeClass.isAssignableFrom(activeSpecClazz) &&
+                                    definition.getClass().getSimpleName().contains(simpleName) // Check if super class def is part of the current spec
+                                    || activeSpecName.equals(declaringTypeName)
+                                    || declaringTypeName.startsWith(activeSpecName + "$");
                         }
                     } else {
                         context.fail(

diff --git a/test-junit5/src/test/java/io/micronaut/test/junit5/SimpleBaseTest.java b/test-junit5/src/test/java/io/micronaut/test/junit5/SimpleBaseTest.java
@@ -10,5 +10,4 @@ public abstract class SimpleBaseTest {
     SimpleService simpleService() {
         return mock(SimpleService.class);
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,5 +10,4 @@ public abstract class SimpleBaseTest { @@
         SimpleService simpleService() {
             return mock(SimpleService.class);
         }
     }