Merge branch '2.0.x'

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunnerTests.java

@@ -30,8 +30,12 @@ import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.ApplicationContextAssertProvider;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -150,7 +154,7 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
 	}
 
 	@Test
-	public void runWithClassLoaderShouldSetClassLoader() {
+	public void runWithClassLoaderShouldSetClassLoaderOnContext() {
 		get().withClassLoader(new FilteredClassLoader(Gson.class.getPackage().getName()))
 				.run((context) -> {
 					try {
@@ -164,6 +168,14 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
 				});
 	}
 
+	@Test
+	public void runWithClassLoaderShouldSetClassLoaderOnConditionContext() {
+		get().withClassLoader(new FilteredClassLoader(Gson.class.getPackage().getName()))
+				.withUserConfiguration(ConditionalConfig.class)
+				.run((context) -> assertThat(context)
+						.hasSingleBean(ConditionalConfig.class));
+	}
+
 	@Test
 	public void thrownRuleWorksWithCheckedException() {
 		get().run((context) -> {
@@ -209,4 +221,19 @@ public abstract class AbstractApplicationContextRunnerTests<T extends AbstractAp
 
 	}
 
+	@Configuration
+	@Conditional(FilteredClassLoaderCondition.class)
+	static class ConditionalConfig {
+
+	}
+
+	static class FilteredClassLoaderCondition implements Condition {
+
+		@Override
+		public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+			return context.getClassLoader() instanceof FilteredClassLoader;
+		}
+
+	}
+
 }