Merge branch 'issue118-compatibility-junit-jupiter-5.5.0'

* issue118-compatibility-junit-jupiter-5.5.0: fix compatibility with 5.5.0 and above (#118)
TNG · Jul 6, 2019 · e7cdfee · e7cdfee
2 parents 469a6f2 + 594f099
commit e7cdfee
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ dist: trusty
 sudo: false
 
 script:
-  - ./gradlew build -Pjunit4Version=4.10  -PjunitJupiterVersion=5.4.0 -PskipSpotBugs
-  - ./gradlew build -Pjunit4Version=4.11  -PjunitJupiterVersion=5.4.2 -PskipSpotBugs
+  - ./gradlew build -Pjunit4Version=4.10  -PjunitJupiterVersion=5.5.0-RC2 -PskipSpotBugs
+  - ./gradlew build -Pjunit4Version=4.11  -PjunitJupiterVersion=5.5.0     -PskipSpotBugs
 
   - ./gradlew build
 

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ if (!hasProperty("junit4Version")) { // set default junit version if not set via
 println "Using JUnit4 version ${junit4Version} for current build."
 
 if (!hasProperty("junitJupiterVersion")) { // set default junit version if not set via command line
-    ext.junitJupiterVersion = "5.4.0"
+    ext.junitJupiterVersion = "5.5.0"
 }
 println "Using JUnit Jupiter version ${junitJupiterVersion} for current build."
 
@@ -39,7 +39,7 @@ subprojects {
     apply plugin: "osgi"
 
     group = "com.tngtech.junit.dataprovider"
-    version = "2.5"
+    version = "2.6-SNAPSHOT"
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"

diff --git a/junit-jupiter-params/pom.xml b/junit-jupiter-params/pom.xml
@@ -70,12 +70,12 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.4.2</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>

diff --git a/...src/main/java/com/tngtech/junit/dataprovider/AbstractUseDataProviderArgumentProvider.java b/...src/main/java/com/tngtech/junit/dataprovider/AbstractUseDataProviderArgumentProvider.java
@@ -2,7 +2,7 @@
 
 import static com.tngtech.junit.dataprovider.Preconditions.checkNotNull;
 import static com.tngtech.junit.dataprovider.resolver.DataProviderMethodResolverHelper.findDataProviderMethods;
-import static org.junit.jupiter.engine.extension.ExtensionRegistry.createRegistryWithDefaultExtensions;
+import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
 import org.junit.jupiter.engine.execution.ExecutableInvoker;
@@ -136,9 +137,10 @@ protected Object invokeDataProviderMethodToRetrieveData(Method dataProviderMetho
         }
         try {
             // TODO how to not require junit-jupiter-engine dependency and reuse already existing ExtensionRegistry?
-            ExtensionRegistry extensionRegistry = createRegistryWithDefaultExtensions(new DefaultJupiterConfiguration(emptyConfigurationParameters()));
+            ExtensionRegistry extensionRegistry = createRegistryWithDefaultExtensions(
+                    new DefaultJupiterConfiguration(emptyConfigurationParameters()));
             Object data = executableInvoker.invoke(dataProviderMethod, context.getTestInstance().orElse(null), context,
-                    extensionRegistry);
+                    extensionRegistry, InvocationInterceptor::interceptTestFactoryMethod);
             if (cacheDataProviderResult) {
                 store.put(dataProviderMethod, data);
             }

diff --git a/junit-jupiter/pom.xml b/junit-jupiter/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>

diff --git a/...rc/main/java/com/tngtech/junit/dataprovider/UseDataProviderInvocationContextProvider.java b/...rc/main/java/com/tngtech/junit/dataprovider/UseDataProviderInvocationContextProvider.java
@@ -3,7 +3,7 @@
 import static com.tngtech.junit.dataprovider.Preconditions.checkArgument;
 import static com.tngtech.junit.dataprovider.Preconditions.checkNotNull;
 import static com.tngtech.junit.dataprovider.resolver.DataProviderMethodResolverHelper.findDataProviderMethods;
-import static org.junit.jupiter.engine.extension.ExtensionRegistry.createRegistryWithDefaultExtensions;
+import static org.junit.jupiter.engine.extension.MutableExtensionRegistry.createRegistryWithDefaultExtensions;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
@@ -158,9 +159,10 @@ protected Object invokeDataProviderMethodToRetrieveData(Method dataProviderMetho
         }
         try {
             // TODO how to not require junit-jupiter-engine dependency and reuse already existing ExtensionRegistry?
-            ExtensionRegistry extensionRegistry = createRegistryWithDefaultExtensions(new DefaultJupiterConfiguration(emptyConfigurationParameters()));
+            ExtensionRegistry extensionRegistry = createRegistryWithDefaultExtensions(
+                    new DefaultJupiterConfiguration(emptyConfigurationParameters()));
             Object data = executableInvoker.invoke(dataProviderMethod, context.getTestInstance().orElse(null), context,
-                    extensionRegistry);
+                    extensionRegistry, InvocationInterceptor::interceptTestFactoryMethod);
             if (cacheDataProviderResult) {
                 store.put(dataProviderMethod, data);
             }