clean up more tests (#4480)

Co-authored-by: Andrey Strukov <[email protected]>

Author: mirogaudi

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiReactiveApplicationTest.java

@@ -31,14 +31,14 @@
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
-public class AdminUiReactiveApplicationTest extends AbstractAdminUiApplicationTest {
+class AdminUiReactiveApplicationTest extends AbstractAdminUiApplicationTest {
 
 	private static ConfigurableApplicationContext instance;
 
 	private static Integer port;
 
 	@BeforeAll
-	public static void setUp() {
+	static void setUp() {
 		instance = new SpringApplicationBuilder().sources(TestAdminApplication.class)
 			.web(WebApplicationType.REACTIVE)
 			.run("--server.port=0",
@@ -49,12 +49,12 @@ public static void setUp() {
 	}
 
 	@AfterAll
-	public static void shutdown() {
+	static void shutdown() {
 		instance.close();
 	}
 
 	@BeforeEach
-	public void setupEach() {
+	void setupEach() {
 		super.setUp(port);
 	}
 

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiServletApplicationTest.java

@@ -32,12 +32,12 @@
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
-public class AdminUiServletApplicationTest extends AbstractAdminUiApplicationTest {
+class AdminUiServletApplicationTest extends AbstractAdminUiApplicationTest {
 
 	private ConfigurableApplicationContext instance;
 
 	@BeforeEach
-	public void setUp() {
+	void setUp() {
 		this.instance = new SpringApplicationBuilder().sources(TestAdminApplication.class)
 			.web(WebApplicationType.SERVLET)
 			.run("--server.port=0",
@@ -48,7 +48,7 @@ public void setUp() {
 	}
 
 	@AfterEach
-	public void shutdown() {
+	void shutdown() {
 		this.instance.close();
 	}
 

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiAutoConfigurationTest.java

@@ -52,15 +52,15 @@
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
-public class AdminServerUiAutoConfigurationTest implements WithAssertions {
+class AdminServerUiAutoConfigurationTest implements WithAssertions {
 
 	@Test
 	void testNormalizeHomepageUrl() {
 		assertThat(AdminServerUiAutoConfiguration.normalizeHomepageUrl("/test/")).isEqualTo("/test");
 	}
 
 	@Nested
-	public class ReactiveUiConfigurationTest {
+	class ReactiveUiConfigurationTest {
 
 		private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
 			.withPropertyValues("--spring.boot.admin.ui.available-languages=de", "--spring.webflux.base-path=test")
@@ -74,7 +74,7 @@ public class ReactiveUiConfigurationTest {
 		@ParameterizedTest
 		@CsvSource({ "/test/extensions/myextension", "/test/instances/1/actuator/heapdump",
 				"/test/instances/1/actuator/logfile" })
-		public void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
+		void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
 			MockServerHttpRequest serverHttpRequest = MockServerHttpRequest.get(routeExcludes)
 				.header(HttpHeaders.ACCEPT, MediaType.TEXT_HTML_VALUE)
 				.build();
@@ -95,7 +95,7 @@ public void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
 		@ParameterizedTest
 		@CsvSource({ "/test/about", "/test/applications", "/test/instances", "/test/journal", "/test/wallboard",
 				"/test/external" })
-		public void contextPathIsRespectedInIncludedRoutes(String routeIncludes) {
+		void contextPathIsRespectedInIncludedRoutes(String routeIncludes) {
 			MockServerHttpRequest serverHttpRequest = MockServerHttpRequest.get(routeIncludes)
 				.header(HttpHeaders.ACCEPT, MediaType.TEXT_HTML_VALUE)
 				.build();
@@ -116,7 +116,7 @@ public void contextPathIsRespectedInIncludedRoutes(String routeIncludes) {
 	}
 
 	@Nested
-	public class ServletUiConfiguration {
+	class ServletUiConfiguration {
 
 		private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withPropertyValues("--spring.boot.admin.ui.available-languages=de", "--spring.boot.admin.contextPath=test")
@@ -126,7 +126,7 @@ public class ServletUiConfiguration {
 		@ParameterizedTest
 		@CsvSource({ "/test/extensions/myextension", "/test/instances/1/actuator/heapdump",
 				"/test/instances/1/actuator/logfile" })
-		public void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
+		void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
 			MockHttpServletRequest httpServletRequest = spy(new MockHttpServletRequest("GET", routeExcludes));
 			httpServletRequest.addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_HTML_VALUE);
 
@@ -145,7 +145,7 @@ public void contextPathIsRespectedInExcludedRoutes(String routeExcludes) {
 		@ParameterizedTest
 		@CsvSource({ "/test/about", "/test/applications", "/test/instances", "/test/journal", "/test/wallboard",
 				"/test/external" })
-		public void contextPathIsRespectedInIncludedRoutes(String routeIncludes) {
+		void contextPathIsRespectedInIncludedRoutes(String routeIncludes) {
 			MockHttpServletRequest httpServletRequest = spy(new MockHttpServletRequest("GET", routeIncludes));
 			httpServletRequest.addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_HTML_VALUE);
 

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/extensions/UiExtensionsScannerTest.java

@@ -23,12 +23,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class UiExtensionsScannerTest {
+class UiExtensionsScannerTest {
 
 	private final UiExtensionsScanner scanner = new UiExtensionsScanner(new PathMatchingResourcePatternResolver());
 
 	@Test
-	public void should_find_extensions() throws IOException {
+	void should_find_extensions() throws IOException {
 		UiExtensions extensions = this.scanner.scan("classpath:/META-INF/test-extensions/");
 		assertThat(extensions.getCssExtensions()).contains(new UiExtension("custom/custom.abcdef.css",
 				"classpath:/META-INF/test-extensions/custom/custom.abcdef.css"));
@@ -38,7 +38,7 @@ public void should_find_extensions() throws IOException {
 	}
 
 	@Test
-	public void should_not_find_extensions() throws IOException {
+	void should_not_find_extensions() throws IOException {
 		UiExtensions extensions = this.scanner.scan("classpath:/META-INF/NO-test-extensions/");
 		assertThat(extensions.getCssExtensions()).isEmpty();
 		assertThat(extensions.getJsExtensions()).isEmpty();

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/extensions/UiRoutesScannerTest.java

@@ -24,12 +24,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class UiRoutesScannerTest {
+class UiRoutesScannerTest {
 
 	private final UiRoutesScanner scanner = new UiRoutesScanner(new PathMatchingResourcePatternResolver());
 
 	@Test
-	public void should_find_route() throws IOException {
+	void should_find_route() throws IOException {
 		List<String> routes = this.scanner.scan("classpath:/META-INF/test-extensions/");
 		assertThat(routes).containsExactlyInAnyOrder("/custom/**");
 	}

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/web/HomepageForwardingMatcherTest.java

@@ -18,57 +18,48 @@
 
 import java.util.List;
 
-import lombok.Data;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class HomepageForwardingMatcherTest {
+class HomepageForwardingMatcherTest {
 
 	private final HomepageForwardingMatcher<MockRequest> matcher = new HomepageForwardingMatcher<>(
-			singletonList("/viewRoute/**"), singletonList("/viewRoute/*/exclude"), MockRequest::getMethod,
-			MockRequest::getPath, MockRequest::getAccepts);
+			singletonList("/viewRoute/**"), singletonList("/viewRoute/*/exclude"), MockRequest::method,
+			MockRequest::path, MockRequest::accepts);
 
 	@Test
-	public void should_return_false_when_method_is_not_get() {
+	void should_return_false_when_method_is_not_get() {
 		assertThat(this.matcher.test(new MockRequest("POST", "/viewRoute", singletonList(MediaType.TEXT_HTML))))
 			.isFalse();
 	}
 
 	@Test
-	public void should_return_false_when_path_does_not_match() {
+	void should_return_false_when_path_does_not_match() {
 		assertThat(this.matcher.test(new MockRequest("GET", "/api", singletonList(MediaType.TEXT_HTML)))).isFalse();
 	}
 
 	@Test
-	public void should_return_false_when_accepts_does_not_match() {
+	void should_return_false_when_accepts_does_not_match() {
 		assertThat(this.matcher.test(new MockRequest("GET", "/viewRoute", singletonList(MediaType.APPLICATION_XML))))
 			.isFalse();
 	}
 
 	@Test
-	public void should_return_false_when_path_is_excluded() {
+	void should_return_false_when_path_is_excluded() {
 		assertThat(this.matcher
 			.test(new MockRequest("GET", "/viewRoute/12345/exclude", singletonList(MediaType.TEXT_HTML)))).isFalse();
 	}
 
 	@Test
-	public void should_return_true() {
+	void should_return_true() {
 		assertThat(this.matcher
 			.test(new MockRequest("GET", "/viewRoute/detail?query", singletonList(MediaType.TEXT_HTML)))).isTrue();
 	}
 
-	@Data
-	private static final class MockRequest {
-
-		private final String method;
-
-		private final String path;
-
-		private final List<MediaType> accepts;
-
+	private record MockRequest(String method, String path, List<MediaType> accepts) {
 	}
 
 }

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/web/UiControllerTest.java

@@ -34,10 +34,10 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 import static org.springframework.util.CollectionUtils.isEmpty;
 
-public class UiControllerTest {
+class UiControllerTest {
 
 	@Test
-	public void should_use_default_url() throws Exception {
+	void should_use_default_url() throws Exception {
 		MockMvc mockMvc = setupController("", List.of());
 
 		mockMvc.perform(get("http://example/"))
@@ -47,7 +47,7 @@ public void should_use_default_url() throws Exception {
 	}
 
 	@Test
-	public void should_use_path_from_public_url() throws Exception {
+	void should_use_path_from_public_url() throws Exception {
 		MockMvc mockMvc = setupController("/public", List.of());
 
 		mockMvc.perform(get("http://example/"))
@@ -57,7 +57,7 @@ public void should_use_path_from_public_url() throws Exception {
 	}
 
 	@Test
-	public void should_use_host_and_path_from_public_url() throws Exception {
+	void should_use_host_and_path_from_public_url() throws Exception {
 		MockMvc mockMvc = setupController("http://public/public", List.of());
 
 		mockMvc.perform(get("http://example/"))
@@ -67,7 +67,7 @@ public void should_use_host_and_path_from_public_url() throws Exception {
 	}
 
 	@Test
-	public void should_use_scheme_host_and_path_from_public_url() throws Exception {
+	void should_use_scheme_host_and_path_from_public_url() throws Exception {
 		MockMvc mockMvc = setupController("https://public/public", List.of());
 
 		mockMvc.perform(get("http://example/"))
@@ -82,14 +82,14 @@ public void should_use_scheme_host_and_path_from_public_url() throws Exception {
 			"link without children without url, null, false, true", //
 			"link with children, null, true, false" }, //
 			nullValues = { "null" })
-	public void should_validate_external_views(String label, String url, boolean hasChildren, boolean shouldFail) {
+	void should_validate_external_views(String label, String url, boolean hasChildren, boolean shouldFail) {
 		try {
 			UiController.ExternalView externalView = new UiController.ExternalView(label, url, 1, false,
 					hasChildren
 							? List.of(new UiController.ExternalView("child", "https://urli.com", 1, false, List.of()))
 							: List.of());
 
-			setupController("http://mysba.com", List.of(externalView));
+			setupController("https://mysba.com", List.of(externalView));
 		}
 		catch (Exception ex) {
 			if (!shouldFail) {