Move tests to JUnit 5 wherever possible

Author: wilkinsona

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

@@ -41,7 +41,7 @@
  *
  * @author Dave Syer
  */
-public class SpringApplicationHierarchyTests {
+class SpringApplicationHierarchyTests {
 
 	private ConfigurableApplicationContext context;
 
@@ -51,14 +51,14 @@ public void after() {
 	}
 
 	@Test
-	public void testParent() {
+	void testParent() {
 		SpringApplicationBuilder builder = new SpringApplicationBuilder(Child.class);
 		builder.parent(Parent.class);
 		this.context = builder.run("--server.port=0", "--management.metrics.use-global-registry=false");
 	}
 
 	@Test
-	public void testChild() {
+	void testChild() {
 		SpringApplicationBuilder builder = new SpringApplicationBuilder(Parent.class);
 		builder.child(Child.class);
 		this.context = builder.run("--server.port=0", "--management.metrics.use-global-registry=false");

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthIndicatorAutoConfigurationTests.java

@@ -32,20 +32,20 @@
  *
  * @author Phillip Webb
  */
-public class RabbitHealthIndicatorAutoConfigurationTests {
+class RabbitHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(RabbitAutoConfiguration.class,
 					RabbitHealthIndicatorAutoConfiguration.class, HealthIndicatorAutoConfiguration.class));
 
 	@Test
-	public void runShouldCreateIndicator() {
+	void runShouldCreateIndicator() {
 		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(RabbitHealthIndicator.class)
 				.doesNotHaveBean(ApplicationHealthIndicator.class));
 	}
 
 	@Test
-	public void runWhenDisabledShouldNotCreateIndicator() {
+	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.rabbit.enabled:false")
 				.run((context) -> assertThat(context).doesNotHaveBean(RabbitHealthIndicator.class)
 						.hasSingleBean(ApplicationHealthIndicator.class));

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfigurationTests.java

@@ -44,18 +44,18 @@
  * @author Vedran Pavic
  * @author Madhura Bhave
  */
-public class AuditAutoConfigurationTests {
+class AuditAutoConfigurationTests {
 
 	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(AuditAutoConfiguration.class));
 
 	@Test
-	public void autoConfigurationIsDisabledByDefault() {
+	void autoConfigurationIsDisabledByDefault() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(AuditAutoConfiguration.class));
 	}
 
 	@Test
-	public void autoConfigurationIsEnabledWhenAuditEventRepositoryBeanPresent() {
+	void autoConfigurationIsEnabledWhenAuditEventRepositoryBeanPresent() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class).run((context) -> {
 			assertThat(context.getBean(AuditEventRepository.class)).isNotNull();
 			assertThat(context.getBean(AuthenticationAuditListener.class)).isNotNull();
@@ -64,31 +64,31 @@ public void autoConfigurationIsEnabledWhenAuditEventRepositoryBeanPresent() {
 	}
 
 	@Test
-	public void ownAuthenticationAuditListener() {
+	void ownAuthenticationAuditListener() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withUserConfiguration(CustomAuthenticationAuditListenerConfiguration.class)
 				.run((context) -> assertThat(context.getBean(AbstractAuthenticationAuditListener.class))
 						.isInstanceOf(TestAuthenticationAuditListener.class));
 	}
 
 	@Test
-	public void ownAuthorizationAuditListener() {
+	void ownAuthorizationAuditListener() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withUserConfiguration(CustomAuthorizationAuditListenerConfiguration.class)
 				.run((context) -> assertThat(context.getBean(AbstractAuthorizationAuditListener.class))
 						.isInstanceOf(TestAuthorizationAuditListener.class));
 	}
 
 	@Test
-	public void ownAuditListener() {
+	void ownAuditListener() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withUserConfiguration(CustomAuditListenerConfiguration.class)
 				.run((context) -> assertThat(context.getBean(AbstractAuditListener.class))
 						.isInstanceOf(TestAuditListener.class));
 	}
 
 	@Test
-	public void backsOffWhenDisabled() {
+	void backsOffWhenDisabled() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withPropertyValues("management.auditevents.enabled=false")
 				.run((context) -> assertThat(context).doesNotHaveBean(AuditListener.class)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfigurationTests.java

@@ -34,31 +34,31 @@
  * @author Phillip Webb
  * @author Vedran Pavic
  */
-public class AuditEventsEndpointAutoConfigurationTests {
+class AuditEventsEndpointAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
 			AutoConfigurations.of(AuditAutoConfiguration.class, AuditEventsEndpointAutoConfiguration.class));
 
 	@Test
-	public void runWhenRepositoryBeanAvailableShouldHaveEndpointBean() {
+	void runWhenRepositoryBeanAvailableShouldHaveEndpointBean() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withPropertyValues("management.endpoints.web.exposure.include=auditevents")
 				.run((context) -> assertThat(context).hasSingleBean(AuditEventsEndpoint.class));
 	}
 
 	@Test
-	public void endpointBacksOffWhenRepositoryNotAvailable() {
+	void endpointBacksOffWhenRepositoryNotAvailable() {
 		this.contextRunner.withPropertyValues("management.endpoints.web.exposure.include=auditevents")
 				.run((context) -> assertThat(context).doesNotHaveBean(AuditEventsEndpoint.class));
 	}
 
 	@Test
-	public void runWhenNotExposedShouldNotHaveEndpointBean() {
+	void runWhenNotExposedShouldNotHaveEndpointBean() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(AuditEventsEndpoint.class));
 	}
 
 	@Test
-	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpoint() {
+	void runWhenEnabledPropertyIsFalseShouldNotHaveEndpoint() {
 		this.contextRunner.withUserConfiguration(CustomAuditEventRepositoryConfiguration.class)
 				.withPropertyValues("management.endpoint.auditevents.enabled:false")
 				.withPropertyValues("management.endpoints.web.exposure.include=*")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointAutoConfigurationTests.java

@@ -29,24 +29,24 @@
  *
  * @author Phillip Webb
  */
-public class BeansEndpointAutoConfigurationTests {
+class BeansEndpointAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(BeansEndpointAutoConfiguration.class));
 
 	@Test
-	public void runShouldHaveEndpointBean() {
+	void runShouldHaveEndpointBean() {
 		this.contextRunner.withPropertyValues("management.endpoints.web.exposure.include=beans")
 				.run((context) -> assertThat(context).hasSingleBean(BeansEndpoint.class));
 	}
 
 	@Test
-	public void runWhenNotExposedShouldNotHaveEndpointBean() {
+	void runWhenNotExposedShouldNotHaveEndpointBean() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(BeansEndpoint.class));
 	}
 
 	@Test
-	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
+	void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
 		this.contextRunner.withPropertyValues("management.endpoint.beans.enabled:false")
 				.withPropertyValues("management.endpoints.web.exposure.include=*")
 				.run((context) -> assertThat(context).doesNotHaveBean(BeansEndpoint.class));

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

@@ -32,32 +32,32 @@
  * @author Johannes Edmeier
  * @author Stephane Nicoll
  */
-public class CachesEndpointAutoConfigurationTests {
+class CachesEndpointAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(CachesEndpointAutoConfiguration.class));
 
 	@Test
-	public void runShouldHaveEndpointBean() {
+	void runShouldHaveEndpointBean() {
 		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
 				.withPropertyValues("management.endpoints.web.exposure.include=caches")
 				.run((context) -> assertThat(context).hasSingleBean(CachesEndpoint.class));
 	}
 
 	@Test
-	public void runWithoutCacheManagerShouldHaveEndpointBean() {
+	void runWithoutCacheManagerShouldHaveEndpointBean() {
 		this.contextRunner.withPropertyValues("management.endpoints.web.exposure.include=caches")
 				.run((context) -> assertThat(context).hasSingleBean(CachesEndpoint.class));
 	}
 
 	@Test
-	public void runWhenNotExposedShouldNotHaveEndpointBean() {
+	void runWhenNotExposedShouldNotHaveEndpointBean() {
 		this.contextRunner.withBean(CacheManager.class, () -> mock(CacheManager.class))
 				.run((context) -> assertThat(context).doesNotHaveBean(CachesEndpoint.class));
 	}
 
 	@Test
-	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
+	void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
 		this.contextRunner.withPropertyValues("management.endpoint.caches.enabled:false")
 				.withPropertyValues("management.endpoints.web.exposure.include=*")
 				.withBean(CacheManager.class, () -> mock(CacheManager.class))

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

@@ -36,20 +36,20 @@
  *
  * @author Phillip Webb
  */
-public class CassandraHealthIndicatorAutoConfigurationTests {
+class CassandraHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(CassandraConfiguration.class,
 					CassandraHealthIndicatorAutoConfiguration.class, HealthIndicatorAutoConfiguration.class));
 
 	@Test
-	public void runShouldCreateIndicator() {
+	void runShouldCreateIndicator() {
 		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(CassandraHealthIndicator.class)
 				.doesNotHaveBean(ApplicationHealthIndicator.class));
 	}
 
 	@Test
-	public void runWhenDisabledShouldNotCreateIndicator() {
+	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.cassandra.enabled:false")
 				.run((context) -> assertThat(context).doesNotHaveBean(CassandraHealthIndicator.class)
 						.hasSingleBean(ApplicationHealthIndicator.class));

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

@@ -35,21 +35,21 @@
  * @author Artsiom Yudovin
  * @author Stephane Nicoll
  */
-public class CassandraReactiveHealthIndicatorAutoConfigurationTests {
+class CassandraReactiveHealthIndicatorAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withBean(ReactiveCassandraOperations.class, () -> mock(ReactiveCassandraOperations.class))
 			.withConfiguration(AutoConfigurations.of(CassandraReactiveHealthIndicatorAutoConfiguration.class,
 					HealthIndicatorAutoConfiguration.class));
 
 	@Test
-	public void runShouldCreateIndicator() {
+	void runShouldCreateIndicator() {
 		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(CassandraReactiveHealthIndicator.class)
 				.doesNotHaveBean(CassandraHealthIndicator.class).doesNotHaveBean(ApplicationHealthIndicator.class));
 	}
 
 	@Test
-	public void runWhenDisabledShouldNotCreateIndicator() {
+	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.cassandra.enabled:false")
 				.run((context) -> assertThat(context).doesNotHaveBean(CassandraReactiveHealthIndicator.class)
 						.hasSingleBean(ApplicationHealthIndicator.class));

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

@@ -25,28 +25,28 @@
  *
  * @author Madhura Bhave
  */
-public class AccessLevelTests {
+class AccessLevelTests {
 
 	@Test
-	public void accessToHealthEndpointShouldNotBeRestricted() {
+	void accessToHealthEndpointShouldNotBeRestricted() {
 		assertThat(AccessLevel.RESTRICTED.isAccessAllowed("health")).isTrue();
 		assertThat(AccessLevel.FULL.isAccessAllowed("health")).isTrue();
 	}
 
 	@Test
-	public void accessToInfoEndpointShouldNotBeRestricted() {
+	void accessToInfoEndpointShouldNotBeRestricted() {
 		assertThat(AccessLevel.RESTRICTED.isAccessAllowed("info")).isTrue();
 		assertThat(AccessLevel.FULL.isAccessAllowed("info")).isTrue();
 	}
 
 	@Test
-	public void accessToDiscoveryEndpointShouldNotBeRestricted() {
+	void accessToDiscoveryEndpointShouldNotBeRestricted() {
 		assertThat(AccessLevel.RESTRICTED.isAccessAllowed("")).isTrue();
 		assertThat(AccessLevel.FULL.isAccessAllowed("")).isTrue();
 	}
 
 	@Test
-	public void accessToAnyOtherEndpointShouldBeRestricted() {
+	void accessToAnyOtherEndpointShouldBeRestricted() {
 		assertThat(AccessLevel.RESTRICTED.isAccessAllowed("env")).isFalse();
 		assertThat(AccessLevel.FULL.isAccessAllowed("")).isTrue();
 	}

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

@@ -28,51 +28,51 @@
  *
  * @author Madhura Bhave
  */
-public class CloudFoundryAuthorizationExceptionTests {
+class CloudFoundryAuthorizationExceptionTests {
 
 	@Test
-	public void statusCodeForInvalidTokenReasonShouldBe401() {
+	void statusCodeForInvalidTokenReasonShouldBe401() {
 		assertThat(createException(Reason.INVALID_TOKEN).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForInvalidIssuerReasonShouldBe401() {
+	void statusCodeForInvalidIssuerReasonShouldBe401() {
 		assertThat(createException(Reason.INVALID_ISSUER).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForInvalidAudienceReasonShouldBe401() {
+	void statusCodeForInvalidAudienceReasonShouldBe401() {
 		assertThat(createException(Reason.INVALID_AUDIENCE).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForInvalidSignatureReasonShouldBe401() {
+	void statusCodeForInvalidSignatureReasonShouldBe401() {
 		assertThat(createException(Reason.INVALID_SIGNATURE).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForMissingAuthorizationReasonShouldBe401() {
+	void statusCodeForMissingAuthorizationReasonShouldBe401() {
 		assertThat(createException(Reason.MISSING_AUTHORIZATION).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForUnsupportedSignatureAlgorithmReasonShouldBe401() {
+	void statusCodeForUnsupportedSignatureAlgorithmReasonShouldBe401() {
 		assertThat(createException(Reason.UNSUPPORTED_TOKEN_SIGNING_ALGORITHM).getStatusCode())
 				.isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForTokenExpiredReasonShouldBe401() {
+	void statusCodeForTokenExpiredReasonShouldBe401() {
 		assertThat(createException(Reason.TOKEN_EXPIRED).getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
-	public void statusCodeForAccessDeniedReasonShouldBe403() {
+	void statusCodeForAccessDeniedReasonShouldBe403() {
 		assertThat(createException(Reason.ACCESS_DENIED).getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
 	}
 
 	@Test
-	public void statusCodeForServiceUnavailableReasonShouldBe503() {
+	void statusCodeForServiceUnavailableReasonShouldBe503() {
 		assertThat(createException(Reason.SERVICE_UNAVAILABLE).getStatusCode())
 				.isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
 	}

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

@@ -29,19 +29,19 @@
  *
  * @author Madhura Bhave
  */
-public class CloudFoundryEndpointFilterTests {
+class CloudFoundryEndpointFilterTests {
 
 	private CloudFoundryEndpointFilter filter = new CloudFoundryEndpointFilter();
 
 	@Test
-	public void matchIfDiscovererCloudFoundryShouldReturnFalse() {
+	void matchIfDiscovererCloudFoundryShouldReturnFalse() {
 		DiscoveredEndpoint<?> endpoint = mock(DiscoveredEndpoint.class);
 		given(endpoint.wasDiscoveredBy(CloudFoundryWebEndpointDiscoverer.class)).willReturn(true);
 		assertThat(this.filter.match(endpoint)).isTrue();
 	}
 
 	@Test
-	public void matchIfDiscovererNotCloudFoundryShouldReturnFalse() {
+	void matchIfDiscovererNotCloudFoundryShouldReturnFalse() {
 		DiscoveredEndpoint<?> endpoint = mock(DiscoveredEndpoint.class);
 		given(endpoint.wasDiscoveredBy(CloudFoundryWebEndpointDiscoverer.class)).willReturn(false);
 		assertThat(this.filter.match(endpoint)).isFalse();

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

@@ -50,10 +50,10 @@
  *
  * @author Madhura Bhave
  */
-public class CloudFoundryWebEndpointDiscovererTests {
+class CloudFoundryWebEndpointDiscovererTests {
 
 	@Test
-	public void getEndpointsShouldAddCloudFoundryHealthExtension() {
+	void getEndpointsShouldAddCloudFoundryHealthExtension() {
 		load(TestConfiguration.class, (discoverer) -> {
 			Collection<ExposableWebEndpoint> endpoints = discoverer.getEndpoints();
 			assertThat(endpoints.size()).isEqualTo(2);