Polish "Provide links / when using a separate management port"

See gh-17418

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/ManagementDifferentPortSampleActuatorApplicationTests.java

@@ -1,36 +1,53 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package smoketest.actuator;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+/**
+ * Integration tests for separate management and main service ports with empty endpoint
+ * base path.
+ *
+ * @author HaiTao Zhang
+ */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "management.endpoints.web.base-path=/","management.server.port=0"})
-public class ManagementDifferentPortSampleActuatorApplicationTests {
-
-	@LocalServerPort
-	private int port;
+		properties = { "management.endpoints.web.base-path=/", "management.server.port=0" })
+class ManagementDifferentPortSampleActuatorApplicationTests {
 
 	@LocalManagementPort
 	private int managementPort;
 
 	@Test
-	void testDifferentServerPort(){
-		if(this.managementPort != this.port) {
-			ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
-					.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
-			assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-			assertThat(entity.getBody()).contains("\"_links\"");
-		}
+	void linksEndpointShouldBeAvailable() {
+		ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
+				.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).contains("\"_links\"");
 	}
 
-	private String getPassword(){
+	private String getPassword() {
 		return "password";
 	}
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyDifferentPortSampleActuatorApplicationTests.java

@@ -1,35 +1,54 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package smoketest.jersey;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {"management.server.port=0","management.endpoints.web.base-path=/"})
-public class JerseyDifferentPortSampleActuatorApplicationTests {
+/**
+ * Integration tests for separate management and main service ports with empty base path
+ * for endpoints.
+ *
+ * @author HaiTao Zhang
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = { "management.server.port=0", "management.endpoints.web.base-path=/" })
+class JerseyDifferentPortSampleActuatorApplicationTests {
 
 	@LocalManagementPort
 	private int managementPort;
 
-	@LocalServerPort
-	private int port;
-
 	@Test
-	void testDifferentServerPort(){
-		if(this.managementPort != this.port) {
-			ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
-					.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
-			assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-			assertThat(entity.getBody()).contains("\"_links\"");
-		}
+	void linksEndpointShouldBeAvailable() {
+		ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
+				.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).contains("\"_links\"");
 	}
 
-	private String getPassword(){
+	private String getPassword() {
 		return "password";
 	}
+
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux/src/test/java/smoketest/webflux/WebFluxDifferentPortSampleActuatorApplicationTests.java

@@ -1,35 +1,54 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package smoketest.webflux;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {"management.server.port=0","management.endpoints.web.base-path=/"})
-public class WebFluxDifferentPortSampleActuatorApplicationTests {
+/**
+ * Integration tests for separate management and main service ports with empty endpoint
+ * base path.
+ *
+ * @author HaiTao Zhang
+ */
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = { "management.server.port=0", "management.endpoints.web.base-path=/" })
+class WebFluxDifferentPortSampleActuatorApplicationTests {
 
 	@LocalManagementPort
 	private int managementPort;
 
-	@LocalServerPort
-	private int port;
-
 	@Test
-	void testDifferentServerPort(){
-		if(this.managementPort != this.port) {
-			ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
-					.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
-			assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
-			assertThat(entity.getBody()).contains("\"_links\"");
-		}
+	void linksEndpointShouldBeAvailable() {
+		ResponseEntity<String> entity = new TestRestTemplate("user", getPassword())
+				.getForEntity("http://localhost:" + this.managementPort + "/", String.class);
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		assertThat(entity.getBody()).contains("\"_links\"");
 	}
 
-	private String getPassword(){
+	private String getPassword() {
 		return "password";
 	}
+
 }