From f79562f8d14b8e93ea6f06f217aa4c5febf967f1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 30 Mar 2018 12:12:21 +0200
Subject: [PATCH] Introduce tests for generics & @Nested test classes

---
 .../GenericComicCharactersTestCase.java       |  8 +--
 .../GenericsAndNestedTestsTestCase.java       | 68 +++++++++++++++++++
 2 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericsAndNestedTestsTestCase.java

diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTestCase.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTestCase.java
index 67ac61dd5a0..2a8610e7312 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericComicCharactersTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -19,12 +19,11 @@ package org.springframework.test.context.junit.jupiter.generics;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.SpringJUnitJupiterTestSuite;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.context.junit.jupiter.TestConfig;
 import org.springframework.test.context.junit.jupiter.comics.Character;
 
@@ -41,8 +40,7 @@ import static org.junit.jupiter.api.Assertions.*;
  * @author Sam Brannen
  * @since 5.0
  */
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = TestConfig.class)
+@SpringJUnitConfig(TestConfig.class)
 abstract class GenericComicCharactersTestCase<T extends Character> {
 
 	@Autowired
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericsAndNestedTestsTestCase.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericsAndNestedTestsTestCase.java
new file mode 100644
index 00000000000..433e34fdd1a
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/generics/GenericsAndNestedTestsTestCase.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2018 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.generics;
+
+import org.junit.jupiter.api.Nested;
+
+import org.springframework.test.context.junit.SpringJUnitJupiterTestSuite;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit.jupiter.comics.Cat;
+import org.springframework.test.context.junit.jupiter.comics.Dog;
+
+/**
+ * Integration tests that verify support for Java generics combined with {@code @Nested}
+ * test classes when used with the Spring TestContext Framework and 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.5
+ */
+class GenericsAndNestedTestsTestCase {
+
+	@Nested
+	class CatTestCase extends GenericComicCharactersTestCase<Cat> {
+
+		@Override
+		int getExpectedNumCharacters() {
+			return 2;
+		}
+
+		@Override
+		String getExpectedName() {
+			return "Catbert";
+		}
+	}
+
+	@Nested
+	class DogTestCase extends GenericComicCharactersTestCase<Dog> {
+
+		@Override
+		int getExpectedNumCharacters() {
+			return 1;
+		}
+
+		@Override
+		String getExpectedName() {
+			return "Dogbert";
+		}
+	}
+
+}