remove TODO and adjust custom Providers / Extensions (#104)

TNG · Jan 14, 2018 · 91253de · 91253de
1 parent 98e8825
commit 91253de
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/core/src/main/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContext.java b/core/src/main/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContext.java
@@ -50,7 +50,6 @@ public static List<Class<?>> generateLocations(Class<?> testClass, Class<?>... e
     private final Class<? extends Annotation> dataProviderAnnotationClass;
     private final String dataProviderName;
 
-    // TODO refactor above ... whats a good solution?
     /**
      * @param testMethod for which a dataprovider should be resolved
      * @param resolverClasses to use for resolving dataproviders

diff --git a/...egTest/java/com/tngtech/test/junit/dataprovider/custom/meta/DataProviderTestProvider.java b/...egTest/java/com/tngtech/test/junit/dataprovider/custom/meta/DataProviderTestProvider.java
@@ -1,5 +1,6 @@
 package com.tngtech.test.junit.dataprovider.custom.meta;
 
+import static com.tngtech.junit.dataprovider.resolver.DataProviderResolverContext.generateLocations;
 import static java.util.Arrays.asList;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -25,7 +26,9 @@ public void accept(DataProviderTest sourceAnnotation) {
     protected DataProviderResolverContext getDataProviderResolverContext(ExtensionContext extensionContext,
             DataProviderTest annotation) {
         return new DataProviderResolverContext(extensionContext.getRequiredTestMethod(), asList(annotation.resolver()),
-                annotation.resolveStrategy(), asList(annotation.location()), DataProvider.class, annotation.value());
+                annotation.resolveStrategy(),
+                generateLocations(extensionContext.getRequiredTestClass(), annotation.location()),
+                DataProvider.class, annotation.value());
     }
 
     @Override

diff --git a/...est/junit/dataprovider/custom/resolver/CustomResolverUseDataProviderArgumentProvider.java b/...est/junit/dataprovider/custom/resolver/CustomResolverUseDataProviderArgumentProvider.java
@@ -1,5 +1,6 @@
 package com.tngtech.test.junit.dataprovider.custom.resolver;
 
+import static com.tngtech.junit.dataprovider.resolver.DataProviderResolverContext.generateLocations;
 import static java.util.Arrays.asList;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -26,7 +27,9 @@ public void accept(CustomResolverUseDataProvider sourceAnnotation) {
     protected DataProviderResolverContext getDataProviderResolverContext(ExtensionContext extensionContext,
             CustomResolverUseDataProvider annotation) {
         return new DataProviderResolverContext(extensionContext.getRequiredTestMethod(), asList(annotation.resolver()),
-                annotation.resolveStrategy(), asList(annotation.location()), DataProvider.class, annotation.value());
+                annotation.resolveStrategy(),
+                generateLocations(extensionContext.getRequiredTestClass(), annotation.location()),
+                DataProvider.class, annotation.value());
     }
 
     @Override

diff --git a/...gTest/java/com/tngtech/test/junit/dataprovider/custom/meta/DataProviderTestExtension.java b/...gTest/java/com/tngtech/test/junit/dataprovider/custom/meta/DataProviderTestExtension.java
@@ -1,5 +1,6 @@
 package com.tngtech.test.junit.dataprovider.custom.meta;
 
+import static com.tngtech.junit.dataprovider.resolver.DataProviderResolverContext.generateLocations;
 import static java.util.Arrays.asList;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -21,7 +22,9 @@ class DataProviderTestExtension extends UseDataProviderInvocationContextProvider
     protected DataProviderResolverContext getDataProviderResolverContext(ExtensionContext extensionContext,
             DataProviderTest annotation) {
         return new DataProviderResolverContext(extensionContext.getRequiredTestMethod(), asList(annotation.resolver()),
-                annotation.resolveStrategy(), asList(annotation.location()), DataProvider.class, annotation.value());
+                annotation.resolveStrategy(),
+                generateLocations(extensionContext.getRequiredTestClass(), annotation.location()), DataProvider.class,
+                annotation.value());
     }
 
     @Override

diff --git a/...tech/test/junit/dataprovider/custom/resolver/CustomResolverDataProviderTestExtension.java b/...tech/test/junit/dataprovider/custom/resolver/CustomResolverDataProviderTestExtension.java
@@ -1,5 +1,6 @@
 package com.tngtech.test.junit.dataprovider.custom.resolver;
 
+import static com.tngtech.junit.dataprovider.resolver.DataProviderResolverContext.generateLocations;
 import static java.util.Arrays.asList;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -22,7 +23,9 @@ class CustomResolverDataProviderTestExtension
     protected DataProviderResolverContext getDataProviderResolverContext(ExtensionContext extensionContext,
             CustomResolverDataProviderTest annotation) {
         return new DataProviderResolverContext(extensionContext.getRequiredTestMethod(), asList(annotation.resolver()),
-                annotation.resolveStrategy(), asList(annotation.location()), DataProvider.class, annotation.value());
+                annotation.resolveStrategy(),
+                generateLocations(extensionContext.getRequiredTestClass(), annotation.location()),
+                DataProvider.class, annotation.value());
     }
 
     @Override