Merge pull request #19294

* gh-19294:
  Reduce visibility of test methods

Closes gh-19294
See gh-19287

spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java

@@ -32,11 +32,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Andy Wilkinson
  */
-public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
+class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void addARequestMappingToAnExistingController(ApplicationLauncher applicationLauncher) throws Exception {
+	void addARequestMappingToAnExistingController(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -51,8 +51,7 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void removeARequestMappingFromAnExistingController(ApplicationLauncher applicationLauncher)
-			throws Exception {
+	void removeARequestMappingFromAnExistingController(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -65,7 +64,7 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void createAController(ApplicationLauncher applicationLauncher) throws Exception {
+	void createAController(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -81,7 +80,7 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void createAControllerAndThenAddARequestMapping(ApplicationLauncher applicationLauncher) throws Exception {
+	void createAControllerAndThenAddARequestMapping(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -99,8 +98,8 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void createAControllerAndThenAddARequestMappingToAnExistingController(
-			ApplicationLauncher applicationLauncher) throws Exception {
+	void createAControllerAndThenAddARequestMappingToAnExistingController(ApplicationLauncher applicationLauncher)
+			throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -120,7 +119,7 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void deleteAController(ApplicationLauncher applicationLauncher) throws Exception {
+	void deleteAController(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();
@@ -135,7 +134,7 @@ public class DevToolsIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void createAControllerAndThenDeleteIt(ApplicationLauncher applicationLauncher) throws Exception {
+	void createAControllerAndThenDeleteIt(ApplicationLauncher applicationLauncher) throws Exception {
 		launchApplication(applicationLauncher);
 		TestRestTemplate template = new TestRestTemplate();
 		String urlBase = "http://localhost:" + awaitServerPort();

spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsWithLazyInitializationIntegrationTests.java

@@ -31,11 +31,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Madhura Bhave
  */
-public class DevToolsWithLazyInitializationIntegrationTests extends AbstractDevToolsIntegrationTests {
+class DevToolsWithLazyInitializationIntegrationTests extends AbstractDevToolsIntegrationTests {
 
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("parameters")
-	public void addARequestMappingToAnExistingControllerWhenLazyInit(ApplicationLauncher applicationLauncher)
+	void addARequestMappingToAnExistingControllerWhenLazyInit(ApplicationLauncher applicationLauncher)
 			throws Exception {
 		launchApplication(applicationLauncher, "--spring.main.lazy-initialization=true");
 		TestRestTemplate template = new TestRestTemplate();

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarDevelopmentIntegrationTests.java

@@ -34,18 +34,17 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @EmbeddedServletContainerTest(packaging = "jar",
 		launchers = { BootRunApplicationLauncher.class, IdeApplicationLauncher.class })
-public class EmbeddedServletContainerJarDevelopmentIntegrationTests {
+class EmbeddedServletContainerJarDevelopmentIntegrationTests {
 
 	@TestTemplate
-	public void metaInfResourceFromDependencyIsAvailableViaHttp(RestTemplate rest) {
+	void metaInfResourceFromDependencyIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/nested-meta-inf-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
 	@DisabledOnOs(OS.WINDOWS)
-	public void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp(
-			RestTemplate rest) {
+	void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity(
 				"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
 				String.class);
@@ -54,7 +53,7 @@ public class EmbeddedServletContainerJarDevelopmentIntegrationTests {
 	}
 
 	@TestTemplate
-	public void metaInfResourceFromDependencyIsAvailableViaServletContext(RestTemplate rest) {
+	void metaInfResourceFromDependencyIsAvailableViaServletContext(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/servletContext?/nested-meta-inf-resource.txt",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerJarPackagingIntegrationTests.java

@@ -34,17 +34,17 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @EmbeddedServletContainerTest(packaging = "jar",
 		launchers = { PackagedApplicationLauncher.class, ExplodedApplicationLauncher.class })
-public class EmbeddedServletContainerJarPackagingIntegrationTests {
+class EmbeddedServletContainerJarPackagingIntegrationTests {
 
 	@TestTemplate
-	public void nestedMetaInfResourceIsAvailableViaHttp(RestTemplate rest) {
+	void nestedMetaInfResourceIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/nested-meta-inf-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
 	@DisabledOnOs(OS.WINDOWS)
-	public void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
+	void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity(
 				"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
 				String.class);
@@ -53,27 +53,27 @@ public class EmbeddedServletContainerJarPackagingIntegrationTests {
 	}
 
 	@TestTemplate
-	public void nestedMetaInfResourceIsAvailableViaServletContext(RestTemplate rest) {
+	void nestedMetaInfResourceIsAvailableViaServletContext(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/servletContext?/nested-meta-inf-resource.txt",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
-	public void nestedJarIsNotAvailableViaHttp(RestTemplate rest) {
+	void nestedJarIsNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/BOOT-INF/lib/resources-1.0.jar", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
 	@TestTemplate
-	public void applicationClassesAreNotAvailableViaHttp(RestTemplate rest) {
+	void applicationClassesAreNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest
 				.getForEntity("/BOOT-INF/classes/com/example/ResourceHandlingApplication.class", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
 	@TestTemplate
-	public void launcherIsNotAvailableViaHttp(RestTemplate rest) {
+	void launcherIsNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/org/springframework/boot/loader/Launcher.class",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarDevelopmentIntegrationTests.java

@@ -41,18 +41,17 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @EmbeddedServletContainerTest(packaging = "war",
 		launchers = { BootRunApplicationLauncher.class, IdeApplicationLauncher.class })
-public class EmbeddedServletContainerWarDevelopmentIntegrationTests {
+class EmbeddedServletContainerWarDevelopmentIntegrationTests {
 
 	@TestTemplate
-	public void metaInfResourceFromDependencyIsAvailableViaHttp(RestTemplate rest) {
+	void metaInfResourceFromDependencyIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/nested-meta-inf-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
 	@DisabledOnOs(OS.WINDOWS)
-	public void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp(
-			RestTemplate rest) {
+	void metaInfResourceFromDependencyWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity(
 				"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
 				String.class);
@@ -61,20 +60,20 @@ public class EmbeddedServletContainerWarDevelopmentIntegrationTests {
 	}
 
 	@TestTemplate
-	public void metaInfResourceFromDependencyIsAvailableViaServletContext(RestTemplate rest) {
+	void metaInfResourceFromDependencyIsAvailableViaServletContext(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/servletContext?/nested-meta-inf-resource.txt",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
-	public void webappResourcesAreAvailableViaHttp(RestTemplate rest) {
+	void webappResourcesAreAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/webapp-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
-	public void loaderClassesAreNotAvailableViaResourcePaths(RestTemplate rest) {
+	void loaderClassesAreNotAvailableViaResourcePaths(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/resourcePaths", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(readLines(entity.getBody()))

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerWarPackagingIntegrationTests.java

@@ -41,17 +41,17 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @EmbeddedServletContainerTest(packaging = "war",
 		launchers = { PackagedApplicationLauncher.class, ExplodedApplicationLauncher.class })
-public class EmbeddedServletContainerWarPackagingIntegrationTests {
+class EmbeddedServletContainerWarPackagingIntegrationTests {
 
 	@TestTemplate
-	public void nestedMetaInfResourceIsAvailableViaHttp(RestTemplate rest) {
+	void nestedMetaInfResourceIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/nested-meta-inf-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
 	@DisabledOnOs(OS.WINDOWS)
-	public void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
+	void nestedMetaInfResourceWithNameThatContainsReservedCharactersIsAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity(
 				"/nested-reserved-%21%23%24%25%26%28%29%2A%2B%2C%3A%3D%3F%40%5B%5D-meta-inf-resource.txt",
 				String.class);
@@ -60,33 +60,33 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests {
 	}
 
 	@TestTemplate
-	public void nestedMetaInfResourceIsAvailableViaServletContext(RestTemplate rest) {
+	void nestedMetaInfResourceIsAvailableViaServletContext(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/servletContext?/nested-meta-inf-resource.txt",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
-	public void nestedJarIsNotAvailableViaHttp(RestTemplate rest) {
+	void nestedJarIsNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/WEB-INF/lib/resources-1.0.jar", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
 	@TestTemplate
-	public void applicationClassesAreNotAvailableViaHttp(RestTemplate rest) {
+	void applicationClassesAreNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest
 				.getForEntity("/WEB-INF/classes/com/example/ResourceHandlingApplication.class", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
 	@TestTemplate
-	public void webappResourcesAreAvailableViaHttp(RestTemplate rest) {
+	void webappResourcesAreAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/webapp-resource.txt", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 	}
 
 	@TestTemplate
-	public void loaderClassesAreNotAvailableViaHttp(RestTemplate rest) {
+	void loaderClassesAreNotAvailableViaHttp(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/org/springframework/boot/loader/Launcher.class",
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
@@ -95,7 +95,7 @@ public class EmbeddedServletContainerWarPackagingIntegrationTests {
 	}
 
 	@TestTemplate
-	public void loaderClassesAreNotAvailableViaResourcePaths(RestTemplate rest) {
+	void loaderClassesAreNotAvailableViaResourcePaths(RestTemplate rest) {
 		ResponseEntity<String> entity = rest.getForEntity("/resourcePaths", String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(readLines(entity.getBody()))