Move to migrationsupport.parameterized package

Author: LiamClark

…upport/rules/ParameterizedExtension.java …arameterized/ParameterizedExtension.javajunit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ParameterizedExtension.java renamed to junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/parameterized/ParameterizedExtension.java junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ParameterizedExtension.java renamed to junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/parameterized/ParameterizedExtension.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.jupiter.migrationsupport.rules;
+package org.junit.jupiter.migrationsupport.parameterized;
 
 import static java.util.Collections.singletonList;
 import static java.util.function.Function.identity;
@@ -27,14 +27,13 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
 import org.junit.jupiter.api.extension.ContainerExtensionContext;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.TestExtensionContext;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
 import org.junit.platform.commons.meta.API;
@@ -215,15 +214,15 @@ public List<Extension> getAdditionalExtensions() {
 		};
 	}
 
-	private static class InjectionExtension implements BeforeTestExecutionCallback {
+	private static class InjectionExtension implements TestInstancePostProcessor {
 		private final Object[] parameters;
 
 		public InjectionExtension(Object[] parameters) {
 			this.parameters = parameters;
 		}
 
 		@Override
-		public void beforeTestExecution(TestExtensionContext context) throws Exception {
+		public void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
 			List<Field> parameters = parametersFields(context);
 
 			if (!parameters.isEmpty() && parameters.size() != this.parameters.length) {
@@ -233,7 +232,7 @@ public void beforeTestExecution(TestExtensionContext context) throws Exception {
 			for (Field param : parameters) {
 				Parameterized.Parameter annotation = param.getAnnotation(Parameterized.Parameter.class);
 				int paramIndex = annotation.value();
-				param.set(context.getTestInstance(), this.parameters[paramIndex]);
+				param.set(testInstance, this.parameters[paramIndex]);
 			}
 		}
 	}

junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/parameterized/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Extension to run JUnit 4 style parameterized tests in JUnit Jupiter.
+ */
+
+package org.junit.jupiter.migrationsupport.parameterized;

…nsupport/ParametrizedExtensionTests.java …eterized/ParametrizedExtensionTests.javajunit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/ParametrizedExtensionTests.java renamed to junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/parameterized/ParametrizedExtensionTests.java junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/ParametrizedExtensionTests.java renamed to junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/parameterized/ParametrizedExtensionTests.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.jupiter.migrationsupport;
+package org.junit.jupiter.migrationsupport.parameterized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.engine.JupiterTestEngine;
-import org.junit.jupiter.migrationsupport.rules.ParameterizedExtension;
 import org.junit.platform.engine.ExecutionRequest;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
@@ -41,10 +40,10 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-public class ParametrizedExtensionTests {
+class ParametrizedExtensionTests {
 
 	@Test
-	public void parametrizedWithParameterFieldInjection() {
+	void parametrizedWithParameterFieldInjection() {
 		ExecutionEventRecorder executionEventRecorder = executeTestsForClass(FibonacciTest.class);
 		assertThat(executionEventRecorder.getTestSuccessfulCount()).isEqualTo(7);
 	}
@@ -83,7 +82,7 @@ private static int compute(int n) {
 	}
 
 	@Test
-	public void paremeterizedWithConstructorInjection() {
+	void paremeterizedWithConstructorInjection() {
 		ExecutionEventRecorder executionEventRecorder = executeTestsForClass(ParameterizedTestWithConstructor.class);
 		assertThat(executionEventRecorder.getTestSuccessfulCount()).isEqualTo(7);
 	}
@@ -224,8 +223,6 @@ void emptyParametersList() {
 	protected static class EmptyParameters {
 
 		public EmptyParameters() {
-			int a = 0;
-			int b = a + 3;
 		}
 
 		@Parameters