Migrate tests to use withBean

See gh-16011

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointAutoConfigurationTests.java

@@ -22,8 +22,6 @@ import org.springframework.boot.actuate.cache.CachesEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cache.CacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -42,7 +40,7 @@ public class CachesEndpointAutoConfigurationTests {
 
 	@Test
 	public void runShouldHaveEndpointBean() {
-		this.contextRunner.withUserConfiguration(CacheConfiguration.class)
+		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
 				.withPropertyValues("management.endpoints.web.exposure.include=caches")
 				.run((context) -> assertThat(context)
 						.hasSingleBean(CachesEndpoint.class));
@@ -58,27 +56,18 @@ public class CachesEndpointAutoConfigurationTests {
 
 	@Test
 	public void runWhenNotExposedShouldNotHaveEndpointBean() {
-		this.contextRunner.withUserConfiguration(CacheConfiguration.class).run(
-				(context) -> assertThat(context).doesNotHaveBean(CachesEndpoint.class));
+		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
+				.run((context) -> assertThat(context)
+						.doesNotHaveBean(CachesEndpoint.class));
 	}
 
 	@Test
 	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
 		this.contextRunner.withPropertyValues("management.endpoint.caches.enabled:false")
 				.withPropertyValues("management.endpoints.web.exposure.include=*")
-				.withUserConfiguration(CacheConfiguration.class)
+				.withBean(CacheManager.class, () -> mock(CacheManager.class))
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(CachesEndpoint.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class CacheConfiguration {
-
-		@Bean
-		public CacheManager cacheManager() {
-			return mock(CacheManager.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfigurationTests.java

@@ -24,8 +24,6 @@ import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicat
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,7 +38,8 @@ import static org.mockito.Mockito.mock;
 public class CassandraReactiveHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withUserConfiguration(CassandraMockConfiguration.class)
+			.withBean(ReactiveCassandraOperations.class,
+					() -> mock(ReactiveCassandraOperations.class))
 			.withConfiguration(AutoConfigurations.of(
 					CassandraReactiveHealthIndicatorAutoConfiguration.class,
 					HealthIndicatorAutoConfiguration.class));
@@ -61,14 +60,4 @@ public class CassandraReactiveHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	protected static class CassandraMockConfiguration {
-
-		@Bean
-		public ReactiveCassandraOperations cassandraOperations() {
-			return mock(ReactiveCassandraOperations.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java

@@ -242,7 +242,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 
 	@Test
 	public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWebIncludes() {
-		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+		this.contextRunner.withBean(TestEndpoint.class, TestEndpoint::new)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
 						"vcap.application.cf_api:https://my-cloud-controller.com")
@@ -260,7 +260,7 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 
 	@Test
 	public void endpointPathCustomizationIsNotApplied() {
-		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+		this.contextRunner.withBean(TestEndpoint.class, TestEndpoint::new)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
 						"vcap.application.cf_api:https://my-cloud-controller.com")
@@ -380,16 +380,6 @@ public class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 				+ requestPath + " from " + endpoint.getOperations());
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class TestConfiguration {
-
-		@Bean
-		public TestEndpoint testEndpoint() {
-			return new TestEndpoint();
-		}
-
-	}
-
 	@Endpoint(id = "test")
 	static class TestEndpoint {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java

@@ -44,8 +44,6 @@ import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoC
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.config.BeanIds;
@@ -227,7 +225,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 
 	@Test
 	public void allEndpointsAvailableUnderCloudFoundryWithoutExposeAllOnWeb() {
-		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+		this.contextRunner.withBean(TestEndpoint.class, TestEndpoint::new)
 				.withPropertyValues("VCAP_APPLICATION:---",
 						"vcap.application.application_id:my-app-id",
 						"vcap.application.cf_api:https://my-cloud-controller.com")
@@ -250,7 +248,7 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 						"vcap.application.application_id:my-app-id",
 						"vcap.application.cf_api:https://my-cloud-controller.com",
 						"management.endpoints.web.path-mapping.test=custom")
-				.withUserConfiguration(TestConfiguration.class).run((context) -> {
+				.withBean(TestEndpoint.class, TestEndpoint::new).run((context) -> {
 					CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(
 							context);
 					Collection<ExposableWebEndpoint> endpoints = handlerMapping
@@ -309,16 +307,6 @@ public class CloudFoundryActuatorAutoConfigurationTests {
 				+ requestPath + " from " + endpoint.getOperations());
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class TestConfiguration {
-
-		@Bean
-		public TestEndpoint testEndpoint() {
-			return new TestEndpoint();
-		}
-
-	}
-
 	@Endpoint(id = "test")
 	static class TestEndpoint {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthIndicatorAutoConfigurationTests.java

@@ -24,8 +24,6 @@ import org.springframework.boot.actuate.couchbase.CouchbaseReactiveHealthIndicat
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -39,7 +37,7 @@ import static org.mockito.Mockito.mock;
 public class CouchbaseHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withUserConfiguration(CouchbaseMockConfiguration.class).withConfiguration(
+			.withBean(Cluster.class, () -> mock(Cluster.class)).withConfiguration(
 					AutoConfigurations.of(CouchbaseHealthIndicatorAutoConfiguration.class,
 							HealthIndicatorAutoConfiguration.class));
 
@@ -59,14 +57,4 @@ public class CouchbaseHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	protected static class CouchbaseMockConfiguration {
-
-		@Bean
-		public Cluster cluster() {
-			return mock(Cluster.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthIndicatorAutoConfigurationTests.java

@@ -24,8 +24,6 @@ import org.springframework.boot.actuate.couchbase.CouchbaseReactiveHealthIndicat
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,7 +36,7 @@ import static org.mockito.Mockito.mock;
 public class CouchbaseReactiveHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withUserConfiguration(CouchbaseMockConfiguration.class)
+			.withBean(Cluster.class, () -> mock(Cluster.class))
 			.withConfiguration(AutoConfigurations.of(
 					CouchbaseReactiveHealthIndicatorAutoConfiguration.class,
 					HealthIndicatorAutoConfiguration.class));
@@ -59,14 +57,4 @@ public class CouchbaseReactiveHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	protected static class CouchbaseMockConfiguration {
-
-		@Bean
-		public Cluster couchbaseCluster() {
-			return mock(Cluster.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfigurationTests.java

@@ -24,12 +24,8 @@ import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicat
 import org.springframework.boot.actuate.elasticsearch.ElasticsearchJestHealthIndicator;
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
-import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -61,7 +57,7 @@ public class ElasticsearchHealthIndicatorAutoConfigurationTests {
 
 	@Test
 	public void runWhenUsingJestClientShouldCreateIndicator() {
-		this.contextRunner.withUserConfiguration(JestClientConfiguration.class)
+		this.contextRunner.withBean(JestClient.class, () -> mock(JestClient.class))
 				.withSystemProperties("es.set.netty.runtime.available.processors=false")
 				.run((context) -> assertThat(context)
 						.hasSingleBean(ElasticsearchJestHealthIndicator.class)
@@ -79,15 +75,4 @@ public class ElasticsearchHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@AutoConfigureBefore(JestAutoConfiguration.class)
-	protected static class JestClientConfiguration {
-
-		@Bean
-		public JestClient jestClient() {
-			return mock(JestClient.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java

@@ -29,8 +29,6 @@ import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -45,7 +43,7 @@ public class JerseyWebEndpointManagementContextConfigurationTests {
 	private final WebApplicationContextRunner runner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(WebEndpointAutoConfiguration.class,
 					JerseyWebEndpointManagementContextConfiguration.class))
-			.withUserConfiguration(WebEndpointsSupplierConfig.class);
+			.withBean(WebEndpointsSupplier.class, () -> Collections::emptyList);
 
 	@Test
 	public void resourceConfigCustomizerForEndpointsIsAutoConfigured() {
@@ -69,14 +67,4 @@ public class JerseyWebEndpointManagementContextConfigurationTests {
 						.doesNotHaveBean(JerseySameManagementContextConfiguration.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class WebEndpointsSupplierConfig {
-
-		@Bean
-		public WebEndpointsSupplier webEndpointsSupplier() {
-			return Collections::emptyList;
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointAutoConfigurationTests.java

@@ -22,8 +22,6 @@ import org.junit.Test;
 import org.springframework.boot.actuate.flyway.FlywayEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,7 +36,7 @@ public class FlywayEndpointAutoConfigurationTests {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(
 					AutoConfigurations.of(FlywayEndpointAutoConfiguration.class))
-			.withUserConfiguration(FlywayConfiguration.class);
+			.withBean(Flyway.class, () -> mock(Flyway.class));
 
 	@Test
 	public void runShouldHaveEndpointBean() {
@@ -61,14 +59,4 @@ public class FlywayEndpointAutoConfigurationTests {
 				(context) -> assertThat(context).doesNotHaveBean(FlywayEndpoint.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class FlywayConfiguration {
-
-		@Bean
-		public Flyway flyway() {
-			return mock(Flyway.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointAutoConfigurationTests.java

@@ -26,8 +26,6 @@ import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
 import org.springframework.boot.actuate.health.Status;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
@@ -52,7 +50,7 @@ public class HealthEndpointAutoConfigurationTests {
 	@Test
 	public void healthEndpointShowDetailsDefault() {
 		this.contextRunner
-				.withUserConfiguration(ReactiveHealthIndicatorConfiguration.class)
+				.withBean(ReactiveHealthIndicator.class, this::reactiveHealthIndicator)
 				.run((context) -> {
 					ReactiveHealthIndicator indicator = context.getBean(
 							"reactiveHealthIndicator", ReactiveHealthIndicator.class);
@@ -68,7 +66,7 @@ public class HealthEndpointAutoConfigurationTests {
 	public void healthEndpointAdaptReactiveHealthIndicator() {
 		this.contextRunner
 				.withPropertyValues("management.endpoint.health.show-details=always")
-				.withUserConfiguration(ReactiveHealthIndicatorConfiguration.class)
+				.withBean(ReactiveHealthIndicator.class, this::reactiveHealthIndicator)
 				.run((context) -> {
 					ReactiveHealthIndicator indicator = context.getBean(
 							"reactiveHealthIndicator", ReactiveHealthIndicator.class);
@@ -84,8 +82,10 @@ public class HealthEndpointAutoConfigurationTests {
 	public void healthEndpointMergeRegularAndReactive() {
 		this.contextRunner
 				.withPropertyValues("management.endpoint.health.show-details=always")
-				.withUserConfiguration(HealthIndicatorConfiguration.class,
-						ReactiveHealthIndicatorConfiguration.class)
+				.withBean("simpleHealthIndicator", HealthIndicator.class,
+						this::simpleHealthIndicator)
+				.withBean("reactiveHealthIndicator", ReactiveHealthIndicator.class,
+						this::reactiveHealthIndicator)
 				.run((context) -> {
 					HealthIndicator indicator = context.getBean("simpleHealthIndicator",
 							HealthIndicator.class);
@@ -102,28 +102,16 @@ public class HealthEndpointAutoConfigurationTests {
 				});
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class HealthIndicatorConfiguration {
-
-		@Bean
-		public HealthIndicator simpleHealthIndicator() {
-			HealthIndicator mock = mock(HealthIndicator.class);
-			given(mock.health()).willReturn(Health.status(Status.UP).build());
-			return mock;
-		}
-
+	private HealthIndicator simpleHealthIndicator() {
+		HealthIndicator mock = mock(HealthIndicator.class);
+		given(mock.health()).willReturn(Health.status(Status.UP).build());
+		return mock;
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class ReactiveHealthIndicatorConfiguration {
-
-		@Bean
-		public ReactiveHealthIndicator reactiveHealthIndicator() {
-			ReactiveHealthIndicator mock = mock(ReactiveHealthIndicator.class);
-			given(mock.health()).willReturn(Mono.just(Health.status(Status.UP).build()));
-			return mock;
-		}
-
+	private ReactiveHealthIndicator reactiveHealthIndicator() {
+		ReactiveHealthIndicator mock = mock(ReactiveHealthIndicator.class);
+		given(mock.health()).willReturn(Mono.just(Health.status(Status.UP).build()));
+		return mock;
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/influx/InfluxDbHealthIndicatorAutoConfigurationTests.java

@@ -24,8 +24,6 @@ import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.actuate.influx.InfluxDbHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -38,7 +36,7 @@ import static org.mockito.Mockito.mock;
 public class InfluxDbHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withUserConfiguration(InfluxDbConfiguration.class).withConfiguration(
+			.withBean(InfluxDB.class, () -> mock(InfluxDB.class)).withConfiguration(
 					AutoConfigurations.of(InfluxDbHealthIndicatorAutoConfiguration.class,
 							HealthIndicatorAutoConfiguration.class));
 
@@ -57,14 +55,4 @@ public class InfluxDbHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class InfluxDbConfiguration {
-
-		@Bean
-		public InfluxDB influxdb() {
-			return mock(InfluxDB.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ldap/LdapHealthIndicatorAutoConfigurationTests.java

@@ -22,10 +22,7 @@ import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAuto
 import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.actuate.ldap.LdapHealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.ldap.core.LdapOperations;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,7 +37,8 @@ import static org.mockito.Mockito.mock;
 public class LdapHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withUserConfiguration(LdapConfiguration.class).withConfiguration(
+			.withBean(LdapOperations.class, () -> mock(LdapOperations.class))
+			.withConfiguration(
 					AutoConfigurations.of(LdapHealthIndicatorAutoConfiguration.class,
 							HealthIndicatorAutoConfiguration.class));
 
@@ -59,15 +57,4 @@ public class LdapHealthIndicatorAutoConfigurationTests {
 						.hasSingleBean(ApplicationHealthIndicator.class));
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@AutoConfigureBefore(LdapHealthIndicatorAutoConfiguration.class)
-	protected static class LdapConfiguration {
-
-		@Bean
-		public LdapOperations ldapOperations() {
-			return mock(LdapOperations.class);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.liquibase;
 
-import liquibase.exception.LiquibaseException;
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
 
@@ -45,14 +44,15 @@ public class LiquibaseEndpointAutoConfigurationTests {
 	public void runShouldHaveEndpointBean() {
 		this.contextRunner
 				.withPropertyValues("management.endpoints.web.exposure.include=liquibase")
-				.withUserConfiguration(LiquibaseConfiguration.class)
+				.withBean(SpringLiquibase.class, () -> mock(SpringLiquibase.class))
 				.run((context) -> assertThat(context)
 						.hasSingleBean(LiquibaseEndpoint.class));
 	}
 
 	@Test
 	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
-		this.contextRunner.withUserConfiguration(LiquibaseConfiguration.class)
+		this.contextRunner
+				.withBean(SpringLiquibase.class, () -> mock(SpringLiquibase.class))
 				.withPropertyValues("management.endpoint.liquibase.enabled:false")
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(LiquibaseEndpoint.class));
@@ -91,16 +91,6 @@ public class LiquibaseEndpointAutoConfigurationTests {
 				});
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class LiquibaseConfiguration {
-
-		@Bean
-		public SpringLiquibase liquibase() {
-			return mock(SpringLiquibase.class);
-		}
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	static class DataSourceClosingLiquibaseConfiguration {
 
@@ -121,7 +111,7 @@ public class LiquibaseEndpointAutoConfigurationTests {
 				}
 
 				@Override
-				public void afterPropertiesSet() throws LiquibaseException {
+				public void afterPropertiesSet() {
 					this.propertiesSet = true;
 				}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java

@@ -21,14 +21,11 @@ import java.util.Map;
 import org.junit.Test;
 
 import org.springframework.boot.actuate.flyway.FlywayEndpoint.FlywayDescriptor;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -41,57 +38,36 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class FlywayEndpointTests {
 
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(FlywayAutoConfiguration.class))
+			.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withBean("endpoint", FlywayEndpoint.class, FlywayEndpoint::new);
+
 	@Test
 	public void flywayReportIsProduced() {
-		new ApplicationContextRunner().withUserConfiguration(Config.class)
-				.run((context) -> {
-					Map<String, FlywayDescriptor> flywayBeans = context
-							.getBean(FlywayEndpoint.class).flywayBeans().getContexts()
-							.get(context.getId()).getFlywayBeans();
-					assertThat(flywayBeans).hasSize(1);
-					assertThat(flywayBeans.values().iterator().next().getMigrations())
-							.hasSize(3);
-				});
+		this.contextRunner.run((context) -> {
+			Map<String, FlywayDescriptor> flywayBeans = context
+					.getBean(FlywayEndpoint.class).flywayBeans().getContexts()
+					.get(context.getId()).getFlywayBeans();
+			assertThat(flywayBeans).hasSize(1);
+			assertThat(flywayBeans.values().iterator().next().getMigrations()).hasSize(3);
+		});
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void whenFlywayHasBeenBaselinedFlywayReportIsProduced() {
-		new ApplicationContextRunner()
-				.withUserConfiguration(BaselinedFlywayConfig.class, Config.class)
-				.run((context) -> {
-					Map<String, FlywayDescriptor> flywayBeans = context
-							.getBean(FlywayEndpoint.class).flywayBeans().getContexts()
-							.get(context.getId()).getFlywayBeans();
-					assertThat(flywayBeans).hasSize(1);
-					assertThat(flywayBeans.values().iterator().next().getMigrations())
-							.hasSize(3);
-				});
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import({ EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class })
-	public static class Config {
-
-		@Bean
-		public FlywayEndpoint endpoint(ApplicationContext context) {
-			return new FlywayEndpoint(context);
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	public static class BaselinedFlywayConfig {
-
-		@SuppressWarnings("deprecation")
-		@Bean
-		public FlywayMigrationStrategy baseliningMigrationStrategy() {
-			return (flyway) -> {
-				flyway.setBaselineVersionAsString("2");
-				flyway.baseline();
-				flyway.migrate();
-			};
-		}
-
+		this.contextRunner.withBean(FlywayMigrationStrategy.class, () -> (flyway) -> {
+			flyway.setBaselineVersionAsString("2");
+			flyway.baseline();
+			flyway.migrate();
+		}).run((context) -> {
+			Map<String, FlywayDescriptor> flywayBeans = context
+					.getBean(FlywayEndpoint.class).flywayBeans().getContexts()
+					.get(context.getId()).getFlywayBeans();
+			assertThat(flywayBeans).hasSize(1);
+			assertThat(flywayBeans.values().iterator().next().getMigrations()).hasSize(3);
+		});
 	}
 
 }