Update the samples to make use of auto-configured TestRestTemplate

Closes gh-6730

spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java

@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -33,6 +34,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.support.BasicAuthorizationInterceptor;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
@@ -53,12 +55,14 @@ public class SampleMethodSecurityApplicationTests {
 	@LocalServerPort
 	private int port;
 
+	@Autowired
+	private TestRestTemplate restTemplate;
+
 	@Test
 	public void testHome() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		ResponseEntity<String> entity = new TestRestTemplate().exchange(
-				"http://localhost:" + this.port, HttpMethod.GET,
+		ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET,
 				new HttpEntity<Void>(headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 		assertThat(entity.getBody()).contains("<title>Login");
@@ -72,8 +76,8 @@ public class SampleMethodSecurityApplicationTests {
 		form.set("username", "admin");
 		form.set("password", "admin");
 		getCsrf(form, headers);
-		ResponseEntity<String> entity = new TestRestTemplate().exchange(
-				"http://localhost:" + this.port + "/login", HttpMethod.POST,
+		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
+				HttpMethod.POST,
 				new HttpEntity<MultiValueMap<String, String>>(form, headers),
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
@@ -89,14 +93,14 @@ public class SampleMethodSecurityApplicationTests {
 		form.set("username", "user");
 		form.set("password", "user");
 		getCsrf(form, headers);
-		ResponseEntity<String> entity = new TestRestTemplate().exchange(
-				"http://localhost:" + this.port + "/login", HttpMethod.POST,
+		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
+				HttpMethod.POST,
 				new HttpEntity<MultiValueMap<String, String>>(form, headers),
 				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		String cookie = entity.getHeaders().getFirst("Set-Cookie");
 		headers.set("Cookie", cookie);
-		ResponseEntity<String> page = new TestRestTemplate().exchange(
+		ResponseEntity<String> page = this.restTemplate.exchange(
 				entity.getHeaders().getLocation(), HttpMethod.GET,
 				new HttpEntity<Void>(headers), String.class);
 		assertThat(page.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
@@ -105,28 +109,46 @@ public class SampleMethodSecurityApplicationTests {
 
 	@Test
 	public void testManagementProtected() throws Exception {
-		ResponseEntity<String> entity = new TestRestTemplate()
-				.getForEntity("http://localhost:" + this.port + "/beans", String.class);
+		ResponseEntity<String> entity = this.restTemplate.getForEntity("/beans",
+				String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
 	}
 
 	@Test
 	public void testManagementAuthorizedAccess() throws Exception {
-		ResponseEntity<String> entity = new TestRestTemplate("admin", "admin")
-				.getForEntity("http://localhost:" + this.port + "/beans", String.class);
-		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		BasicAuthorizationInterceptor basicAuthInterceptor = new BasicAuthorizationInterceptor(
+				"admin", "admin");
+		this.restTemplate.getRestTemplate().getInterceptors().add(basicAuthInterceptor);
+		try {
+			ResponseEntity<String> entity = this.restTemplate.getForEntity("/beans",
+					String.class);
+			assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
+		}
+		finally {
+			this.restTemplate.getRestTemplate().getInterceptors()
+					.remove(basicAuthInterceptor);
+		}
 	}
 
 	@Test
 	public void testManagementUnauthorizedAccess() throws Exception {
-		ResponseEntity<String> entity = new TestRestTemplate("user", "user")
-				.getForEntity("http://localhost:" + this.port + "/beans", String.class);
-		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
+		BasicAuthorizationInterceptor basicAuthInterceptor = new BasicAuthorizationInterceptor(
+				"user", "user");
+		this.restTemplate.getRestTemplate().getInterceptors().add(basicAuthInterceptor);
+		try {
+			ResponseEntity<String> entity = this.restTemplate.getForEntity("/beans",
+					String.class);
+			assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
+		}
+		finally {
+			this.restTemplate.getRestTemplate().getInterceptors()
+					.remove(basicAuthInterceptor);
+		}
 	}
 
 	private void getCsrf(MultiValueMap<String, String> form, HttpHeaders headers) {
-		ResponseEntity<String> page = new TestRestTemplate()
-				.getForEntity("http://localhost:" + this.port + "/login", String.class);
+		ResponseEntity<String> page = this.restTemplate.getForEntity("/login",
+				String.class);
 		String cookie = page.getHeaders().getFirst("Set-Cookie");
 		headers.set("Cookie", cookie);
 		String body = page.getBody();