#811 @InjectTest field Lookup, fix use field.getDeclaringClass(); (#812)

* #811 Failing test for @InjectTest field Lookup

* #811 @InjectTest field Lookup should use field.getDeclaringClass();

Author: rbygrave

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

@@ -25,12 +25,13 @@ static Lookup getLookup(Class<?> type) {
     return MODULE_LOOKUP_MAP.getOrDefault(type.getModule().getName(), DEFAULT_LOOKUP);
   }
 
-  static VarHandle getVarhandle(Class<?> testClass, Field field) {
+  static VarHandle getVarhandle(Field field) {
     try {
-      var lookup = getLookup(testClass);
+      Class<?> declaringClass = field.getDeclaringClass();
+      var lookup = getLookup(declaringClass);
       lookup =
           lookup.hasPrivateAccess()
-              ? MethodHandles.privateLookupIn(testClass, getLookup(testClass))
+              ? MethodHandles.privateLookupIn(declaringClass, getLookup(declaringClass))
               : lookup;
 
       return lookup.unreflectVarHandle(field);

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

@@ -154,7 +154,7 @@ private void add(FieldTarget target, List<FieldTarget> instanceList, List<FieldT
   }
 
   private FieldTarget newTarget(Field field) {
-    return new FieldTarget(field, name(field), Lookups.getVarhandle(testClass, field));
+    return new FieldTarget(field, name(field), Lookups.getVarhandle(field));
   }
 
   private String name(Field field) {
@@ -190,7 +190,7 @@ private TestBeans setForInstance(TestBeans metaScope, Object testInstance) {
       for (Field field : captors) {
         set(
             Modifier.isStatic(field.getModifiers()),
-            Lookups.getVarhandle(testClass, field),
+            Lookups.getVarhandle(field),
             captorFor(field),
             testInstance);
       }

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

@@ -2,8 +2,9 @@
 
 import jakarta.inject.Inject;
 import org.example.coffee.core.Steamer;
+import org.example.inherit.sub.MySubAbstract;
 
-public abstract class MyOneAbstract {
+public abstract class MyOneAbstract extends MySubAbstract {
 
   @Inject
   Steamer steamer;

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

@@ -18,5 +18,6 @@ public class MyOneTest extends MyOneAbstract {
   void test_expect_inheritedFieldIsInjected() {
     assertThat(something).isNotNull();
     assertThat(steamer).isNotNull();
+    assertThat(someNested()).isNotNull();
   }
 }

inject-test/src/test/java/org/example/inherit/sub/MySubAbstract.java

@@ -0,0 +1,14 @@
+package org.example.inherit.sub;
+
+import jakarta.inject.Inject;
+import org.example.iface.MySomeNested;
+
+public abstract class MySubAbstract {
+
+  @Inject
+  MySomeNested someNested;
+
+  protected MySomeNested someNested() {
+    return someNested;
+  }
+}