Fix CartesianProductResolver::supportsParameter

src/main/java/org/junitpioneer/jupiter/cartesian/CartesianProductResolver.java

@@ -14,7 +14,6 @@
 
 import java.util.List;
 
-import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
@@ -48,10 +47,7 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 		// parameter with correct type (or `null`)
 		if (parameter == null)
 			return true;
-		if (parameterClass.isAssignableFrom(parameter.getClass()))
-			return true;
-		throw new ExtensionConfigurationException(
-			"CartesianTest was supplied arguments but parameter is not supported.");
+		return parameterClass.isAssignableFrom(parameter.getClass());
 	}
 
 	@Override

src/test/java/org/junitpioneer/jupiter/cartesian/CartesianTestExtensionTests.java

@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -380,6 +381,40 @@ void factorySourceWithTestReporter() {
 						"Look on my works, ye Mighty, and despair!The lone and level sands stretch far away.");
 		}
 
+		@Test
+		@DisplayName("ignores 'oversupplied' parameters")
+		void factorySourceWithTestReporterNoSecondParam() {
+			ExecutionResults results = PioneerTestKit
+					.executeTestMethodWithParameterTypes(CartesianFactorySourceTestCases.class, "ignoredParam",
+						String.class, TestReporter.class);
+
+			assertThat(results)
+					.hasNumberOfReportEntries(9)
+					.withValues("And on the pedestal these words appear:", "My name is Ozymandias, king of kings;",
+						"Look on my works, ye Mighty, and despair!", "And on the pedestal these words appear:",
+						"My name is Ozymandias, king of kings;", "Look on my works, ye Mighty, and despair!",
+						"And on the pedestal these words appear:", "My name is Ozymandias, king of kings;",
+						"Look on my works, ye Mighty, and despair!");
+		}
+
+		@Test
+		@DisplayName("works when test class has a constructor with auto-injected values")
+		void testClassWithConstructor() {
+			ExecutionResults results = PioneerTestKit.executeTestClass(TestClassWithConstructorTestCases.class);
+
+			assertThat(results).hasNumberOfDynamicallyRegisteredTests(4).hasNumberOfSucceededTests(4);
+			assertThat(results).hasNumberOfReportEntries(4).withValues("13", "14", "23", "24");
+		}
+
+		@Test
+		@DisplayName("works when test class has @BeforeEach with auto-injected values")
+		void testClassWithBeforeEach() {
+			ExecutionResults results = PioneerTestKit.executeTestClass(TestClassWithBeforeEachTestCases.class);
+
+			assertThat(results).hasNumberOfDynamicallyRegisteredTests(4).hasNumberOfSucceededTests(4);
+			assertThat(results).hasNumberOfReportEntries(4).withValues("13", "14", "23", "24");
+		}
+
 		@Nested
 		@DisplayName("removes redundant parameters from input sets")
 		class CartesianProductRedundancyTests {
@@ -396,15 +431,6 @@ void removesExtraFromAnnotation() {
 
 			}
 
-			@Test
-			@DisplayName("when test class has a constructor with auto-injected values")
-			void testClassWithConstructor() {
-				ExecutionResults results = PioneerTestKit.executeTestClass(TestClassWithConstructorTestCases.class);
-
-				assertThat(results).hasNumberOfDynamicallyRegisteredTests(4).hasNumberOfSucceededTests(4);
-				assertThat(results).hasNumberOfReportEntries(4).withValues("13", "14", "23", "24");
-			}
-
 		}
 
 		@Nested
@@ -741,23 +767,6 @@ void rethrowProviderException() {
 					.hasMessage("Could not provide arguments because of exception.");
 		}
 
-		@Test
-		@DisplayName("there is an auto-injected param but arguments were supplied")
-		void factorySourceWithTestReporter() {
-			ExecutionResults results = PioneerTestKit
-					.executeTestMethodWithParameterTypes(CartesianFactorySourceTestCases.class, "competingInject",
-						String.class, TestReporter.class);
-
-			assertThat(results)
-					.hasNumberOfDynamicallyRegisteredTests(9)
-					.hasNumberOfFailedTests(9)
-					.andThenCheckExceptions(exceptions -> assertThat(exceptions)
-							.extracting(Throwable::getCause)
-							.hasOnlyElementsOfType(ExtensionConfigurationException.class)
-							.extracting(Throwable::getMessage)
-							.containsOnly("CartesianTest was supplied arguments but parameter is not supported."));
-		}
-
 		@Test
 		@DisplayName("parameter annotation arguments provider implements CartesianMethodArgumentsProvider")
 		void mismatchingInterfaceParam() {
@@ -1033,7 +1042,8 @@ void autoInjectedParam(String line, String otherLine, TestReporter reporter) {
 
 		@CartesianTest
 		@CartesianTest.MethodFactory("poem")
-		void competingInject(String line, TestReporter reporter) {
+		void ignoredParam(String line, TestReporter reporter) {
+			reporter.publishEntry(line);
 		}
 
 		static ArgumentSets poem() {
@@ -1131,6 +1141,24 @@ void shouldHaveTestInfo(@CartesianTest.Values(ints = { 1, 2 }) int i,
 
 	}
 
+	static class TestClassWithBeforeEachTestCases {
+
+		private TestInfo info;
+
+		@BeforeEach
+		void setUp(TestInfo info) {
+			this.info = info;
+		}
+
+		@CartesianTest
+		@ReportEntry("{0}{1}")
+		void shouldHaveTestInfo(@CartesianTest.Values(ints = { 1, 2 }) int i,
+				@CartesianTest.Values(ints = { 3, 4 }) int j) {
+			assertThat(info).isNotNull();
+		}
+
+	}
+
 	static class CustomCartesianArgumentsProviderTestCases {
 
 		@CartesianTest