Merge branch '2.1.x'

Closes gh-18234

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilter.java

@@ -33,7 +33,8 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
 class TestTypeExcludeFilter extends TypeExcludeFilter {
 
 	private static final String[] CLASS_ANNOTATIONS = { "org.junit.runner.RunWith",
-			"org.junit.jupiter.api.extension.ExtendWith", "org.testng.annotations.Test" };
+			"org.junit.jupiter.api.extension.ExtendWith", "org.junit.platform.commons.annotation.Testable",
+			"org.testng.annotations.Test" };
 
 	private static final String[] METHOD_ANNOTATIONS = { "org.junit.Test",
 			"org.junit.platform.commons.annotation.Testable", "org.testng.annotations.Test" };

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/AbstractJupiterTestWithConfigAndTestable.java

+/*
+ * Copyright 2012-2019 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
+ *
+ *      https://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.boot.test.context.filter;
+
+import org.junit.platform.commons.annotation.Testable;
+
+import org.springframework.context.annotation.Configuration;
+
+@Testable
+public abstract class AbstractJupiterTestWithConfigAndTestable {
+
+	@Configuration(proxyBeanMethods = false)
+	static class Config {
+
+	}
+
+}

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/TestTypeExcludeFilterTests.java

@@ -79,6 +79,12 @@ class TestTypeExcludeFilterTests {
 				this.metadataReaderFactory)).isTrue();
 	}
 
+	@Test
+	void matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable() throws Exception {
+		assertThat(this.filter.match(getMetadataReader(AbstractJupiterTestWithConfigAndExtendWith.Config.class),
+				this.metadataReaderFactory)).isTrue();
+	}
+
 	@Test
 	void matchesTestConfiguration() throws Exception {
 		assertThat(this.filter.match(getMetadataReader(SampleTestConfig.class), this.metadataReaderFactory)).isTrue();