From 1c07369406c77940eeac443940dfeddfe7c775c3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 7 Jul 2017 16:45:40 +0200
Subject: [PATCH] Verify interoperability w/ JUnit Jupiter's @ParameterizedTest
 in TCF

This commit introduces integration tests which verify that the
SpringExtension can be used in conjunction with JUnit Jupiter's
@ParameterizedTest support.
---
 build.gradle                                  |  1 +
 .../SpringExtensionParameterizedTestCase.java | 67 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTestCase.java

diff --git a/build.gradle b/build.gradle
index d170af174c3..3b9aaa47133 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1057,6 +1057,7 @@ project("spring-test") {
 		testCompile("org.hibernate:hibernate-validator:${hibvalVersion}")
 		// Enable use of the JUnitPlatform Runner
 		testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
+		testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
 		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 		testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		testCompile("com.rometools:rome:${romeVersion}")
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTestCase.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTestCase.java
new file mode 100644
index 00000000000..d8e7a50e3a2
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/SpringExtensionParameterizedTestCase.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.junit.jupiter;
+
+import java.util.List;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit.SpringJUnitJupiterTestSuite;
+import org.springframework.test.context.junit.jupiter.comics.Cat;
+import org.springframework.test.context.junit.jupiter.comics.Dog;
+import org.springframework.test.context.junit.jupiter.comics.Person;
+
+import static org.junit.Assert.*;
+
+/**
+ * Integration tests which demonstrate that the Spring TestContext Framework
+ * can be used with JUnit Jupiter's {@link ParameterizedTest @ParameterizedTest}
+ * support in conjunction with the {@link SpringExtension}.
+ *
+ * <p>To run these tests in an IDE that does not have built-in support for the
+ * JUnit Platform, simply run {@link SpringJUnitJupiterTestSuite} as a JUnit 4 test.
+ *
+ * @author Sam Brannen
+ * @since 5.0
+ * @see SpringExtension
+ * @see ParameterizedTest
+ */
+@SpringJUnitConfig(TestConfig.class)
+class SpringExtensionParameterizedTestCase {
+
+	@ParameterizedTest
+	@ValueSource(strings = { "Dilbert", "Wally" })
+	void people(String name, @Autowired List<Person> people) {
+		assertTrue(people.stream().map(Person::getName).filter(str -> name.equals(str)).findFirst().isPresent());
+	}
+
+	@ParameterizedTest
+	@CsvSource("dogbert, Dogbert")
+	void dogs(String beanName, String dogName, ApplicationContext context) {
+		assertEquals(dogName, context.getBean(beanName, Dog.class).getName());
+	}
+
+	@ParameterizedTest
+	@CsvSource({ "garfield, Garfield", "catbert, Catbert" })
+	void cats(String beanName, String catName, ApplicationContext context) {
+		assertEquals(catName, context.getBean(beanName, Cat.class).getName());
+	}
+
+}