Fix test active conditions for beans defined in super class

test-core/src/main/java/io/micronaut/test/condition/TestActiveCondition.java

@@ -57,13 +57,16 @@ public boolean matches(ConditionContext context) {
                     final Class<?> declaringTypeClass = declaringType.get();
                     String declaringTypeName = declaringTypeClass.getName();
                     if (activeSpecClazz != null) {
+                        final String packageName = NameUtils.getPackageName(activeSpecName);
+                        final String simpleName = NameUtils.getSimpleName(activeSpecName);
+                        final String rootName = packageName + ".$" + simpleName;
                         if (definition.isProxy()) {
-                            final String packageName = NameUtils.getPackageName(activeSpecName);
-                            final String simpleName = NameUtils.getSimpleName(activeSpecName);
-                            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 + "$");
+                            return declaringTypeClass.isAssignableFrom(activeSpecClazz) &&
+                                    definition.getClass().getName().startsWith(rootName + "$") // Check if super class def is part of the current spec
+                                    || activeSpecName.equals(declaringTypeName)
+                                    || declaringTypeName.startsWith(activeSpecName + "$");
                         }
                     } else {
                         context.fail(

test-junit5/src/test/java/io/micronaut/test/junit5/SimpleBaseTest.java

@@ -7,8 +7,7 @@
 public abstract class SimpleBaseTest {
 
     @MockBean(SimpleService.class)
-    SimpleServiceInterface simpleService() {
+    SimpleService simpleService() {
         return mock(SimpleService.class);
     }
-
 }

test-junit5/src/test/java/io/micronaut/test/junit5/SimpleService.java

@@ -3,7 +3,7 @@
 import javax.inject.Singleton;
 
 @Singleton
-public class SimpleService implements SimpleServiceInterface {
+public class SimpleService {
 
     private SimpleWorker simpleWorker;