Merge pull request #499 from avaje/feature/fix-testscope-inherited-fields-injection

Fix for @InjectTest with inherited field injection

Author: SentryMan

inject-test/src/main/java/io/avaje/inject/test/GlobalTestScope.java

@@ -12,7 +12,7 @@
 /**
  * Holds the global BeanScope used for all tests.
  */
-final class GlobalTestScope implements  ExtensionContext.Store.CloseableResource {
+final class GlobalTestScope implements ExtensionContext.Store.CloseableResource {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.inject");
 

inject-test/src/main/java/io/avaje/inject/test/MetaReader.java

@@ -17,6 +17,7 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 final class MetaReader {
@@ -38,10 +39,23 @@ final class MetaReader {
 
   MetaReader(Class<?> testClass, Plugin plugin) {
     this.plugin = plugin;
-    this.methodFinder = new SetupMethods(testClass);
-    for (Field field : testClass.getDeclaredFields()) {
-      readField(field);
+    final var hierarchy = typeHierarchy(testClass);
+    this.methodFinder = new SetupMethods(hierarchy);
+    for (Class<?> aTestClass : hierarchy) {
+      for (Field field : aTestClass.getDeclaredFields()) {
+        readField(field);
+      }
+    }
+  }
+
+  private static LinkedList<Class<?>> typeHierarchy(Class<?> testClass) {
+    var hierarchy = new LinkedList<Class<?>>();
+    var analyzedClass = testClass;
+    while (analyzedClass != null && !analyzedClass.equals(Object.class)) {
+      hierarchy.addFirst(analyzedClass);
+      analyzedClass = analyzedClass.getSuperclass();
     }
+    return hierarchy;
   }
 
   boolean hasClassInjection() {

inject-test/src/main/java/io/avaje/inject/test/SetupMethods.java

@@ -14,13 +14,7 @@ final class SetupMethods {
   private final List<Method> staticMethods = new ArrayList<>();
   private final List<Method> instanceMethods = new ArrayList<>();
 
-  SetupMethods(Class<?> testClass) {
-    var analyzedClass = testClass;
-    var hierarchy = new LinkedList<Class<?>>();
-    while (analyzedClass != null && !analyzedClass.equals(Object.class)) {
-      hierarchy.addFirst(analyzedClass);
-      analyzedClass = analyzedClass.getSuperclass();
-    }
+  SetupMethods(LinkedList<Class<?>> hierarchy) {
     for (Class<?> aClass : hierarchy) {
       for (Method method : aClass.getDeclaredMethods()) {
         if (method.getDeclaredAnnotation(Setup.class) != null) {

inject-test/src/test/java/org/example/inherit/MyOneAbstract.java

@@ -0,0 +1,10 @@
+package org.example.inherit;
+
+import jakarta.inject.Inject;
+import org.example.coffee.core.Steamer;
+
+public abstract class MyOneAbstract {
+
+  @Inject
+  Steamer steamer;
+}

inject-test/src/test/java/org/example/inherit/MyOneTest.java

@@ -0,0 +1,22 @@
+package org.example.inherit;
+
+import io.avaje.inject.test.InjectExtension;
+import jakarta.inject.Inject;
+import org.example.inherit.notpublic.PubExposed;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(InjectExtension.class)
+public class MyOneTest extends MyOneAbstract {
+
+  @Inject
+  PubExposed something;
+
+  @Test
+  void test_expect_inheritedFieldIsInjected() {
+    assertThat(something).isNotNull();
+    assertThat(steamer).isNotNull();
+  }
+}