Fix bug in test data collection paths

Author: ashleyfrieze

test-gadgets-core/src/main/java/uk/org/webcompere/testgadgets/testdatafactory/TestDataCollectionProxy.java

@@ -9,6 +9,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Act as an interface tagged by <code>@TestDataCollection</code>
@@ -17,18 +18,24 @@ public class TestDataCollectionProxy implements InvocationHandler {
     private Path parentPath;
     private TestDataLoader loader;
 
-    private TestDataCollectionProxy(TestData fieldAnnotation, Path parentPath, TestDataLoader loader) {
-        if (parentPath == null && fieldAnnotation.value().length > 0) {
-            this.parentPath = pathFrom(fieldAnnotation.value());
-        } else if (parentPath != null && fieldAnnotation.value().length > 0) {
-            this.parentPath = parentPath.resolve(pathFrom(fieldAnnotation.value()));
-        } else if (parentPath != null) {
-            this.parentPath = parentPath;
-        }
+    private TestDataCollectionProxy(
+            TestData fieldAnnotation, TestDataCollection classAnnotation, Path parentPath, TestDataLoader loader) {
+        this.parentPath = Stream.of(
+                        Optional.ofNullable(parentPath),
+                        toOptionalPath(fieldAnnotation.value()),
+                        toOptionalPath(classAnnotation.value()))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .reduce(Path::resolve)
+                .orElse(null);
 
         this.loader = loader;
     }
 
+    private static Optional<Path> toOptionalPath(String[] path) {
+        return Optional.of(path).filter(p -> p.length > 0).map(TestDataLoaderAnnotations::pathFrom);
+    }
+
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (method.isAnnotationPresent(TestData.class)) {
@@ -71,6 +78,7 @@ public static <T> Optional<T> proxyFor(
         return Optional.of((T) Proxy.newProxyInstance(
                 clazz.getClassLoader(),
                 new Class<?>[] {clazz},
-                new TestDataCollectionProxy(fieldAnnotation, parentPath, loader)));
+                new TestDataCollectionProxy(
+                        fieldAnnotation, clazz.getAnnotation(TestDataCollection.class), parentPath, loader)));
     }
 }

test-gadgets-core/src/test/java/uk/org/webcompere/testgadgets/testdatafactory/TestDataCollectionProxyTest.java

@@ -0,0 +1,59 @@
+package uk.org.webcompere.testgadgets.testdatafactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static uk.org.webcompere.testgadgets.testdatafactory.TestDataLoaderAnnotations.bindAnnotatedFields;
+
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+class TestDataCollectionProxyTest {
+
+    interface NotACollection {}
+
+    class ClassThatInjectsNonCollection {
+        @TestData
+        NotACollection notACollection;
+    }
+
+    @Test
+    void cannotInjectTestDataAtAllForInterfaceWithNoAnnotation() {
+        var loader = new TestDataLoader();
+        var object = new ClassThatInjectsNonCollection();
+
+        assertThatThrownBy(() -> bindAnnotatedFields(loader, object)).isInstanceOf(IOException.class);
+    }
+
+    @TestDataCollection("child")
+    interface ChildCollection {
+        @TestData("somefile.txt")
+        String someText();
+
+        String someOtherMethod();
+    }
+
+    class InjectNestedCollection {
+        @TestData("loader")
+        ChildCollection childCollection;
+    }
+
+    @Test
+    void canLoadChildViaPaths() throws Exception {
+        var loader = new TestDataLoader();
+        var object = new InjectNestedCollection();
+
+        bindAnnotatedFields(loader, object);
+
+        assertThat(object.childCollection.someText()).isEqualTo("Child1\nChild2");
+    }
+
+    @Test
+    void nonTestDataMethodsReturnNull() throws Exception {
+        var loader = new TestDataLoader();
+        var object = new InjectNestedCollection();
+
+        bindAnnotatedFields(loader, object);
+
+        assertThat(object.childCollection.someOtherMethod()).isNull();
+    }
+}

test-gadgets-core/src/test/resources/loader/child/somefile.txt

@@ -0,0 +1,2 @@
+Child1
+Child2