undo

Author: pinguin3245678

spring-test/src/test/java/org/springframework/test/web/client/samples/SampleTests.java

@@ -24,6 +24,7 @@
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequestExecution;
@@ -36,8 +37,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.springframework.http.HttpMethod.GET;
-import static org.springframework.http.MediaType.TEXT_PLAIN;
 import static org.springframework.test.web.client.ExpectedCount.manyTimes;
 import static org.springframework.test.web.client.ExpectedCount.never;
 import static org.springframework.test.web.client.ExpectedCount.once;
@@ -70,8 +69,8 @@ public void performGet() {
 
 		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
 
-		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET))
-			.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
+		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
 
 		this.restTemplate.getForObject("/composers/{id}", Person.class, 42);
 
@@ -87,7 +86,7 @@ public void performGetManyTimes() {
 
 		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
 
-		this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(GET))
+		this.mockServer.expect(manyTimes(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
 
 		this.restTemplate.getForObject("/composers/{id}", Person.class, 42);
@@ -108,9 +107,9 @@ public void expectNever() {
 
 		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
 
-		this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET))
+		this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
-		this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET))
+		this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
 
 		this.restTemplate.getForObject("/composers/{id}", Person.class, 42);
@@ -123,9 +122,9 @@ public void expectNeverViolated() {
 
 		String responseBody = "{\"name\" : \"Ludwig van Beethoven\", \"someDouble\" : \"1.6035\"}";
 
-		this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(GET))
+		this.mockServer.expect(once(), requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
-		this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(GET))
+		this.mockServer.expect(never(), requestTo("/composers/43")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
 
 		this.restTemplate.getForObject("/composers/{id}", Person.class, 42);
@@ -138,8 +137,8 @@ public void performGetWithResponseBodyFromFile() {
 
 		Resource responseBody = new ClassPathResource("ludwig.json", this.getClass());
 
-		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(GET))
-			.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
+		this.mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess(responseBody, MediaType.APPLICATION_JSON));
 
 		this.restTemplate.getForObject("/composers/{id}", Person.class, 42);
 
@@ -152,19 +151,25 @@ public void performGetWithResponseBodyFromFile() {
 	@Test
 	public void verify() {
 
-		this.mockServer.expect(requestTo("/number")).andExpect(method(GET))
-				.andRespond(withSuccess("1", TEXT_PLAIN));
+		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess("1", MediaType.TEXT_PLAIN));
+
+		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess("2", MediaType.TEXT_PLAIN));
 
-		this.mockServer.expect(requestTo("/number")).andExpect(method(GET))
-				.andRespond(withSuccess("2", TEXT_PLAIN));
+		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess("4", MediaType.TEXT_PLAIN));
 
-		this.mockServer.expect(requestTo("/number")).andExpect(method(GET))
-				.andRespond(withSuccess("4", TEXT_PLAIN));
+		this.mockServer.expect(requestTo("/number")).andExpect(method(HttpMethod.GET))
+				.andRespond(withSuccess("8", MediaType.TEXT_PLAIN));
 
-		this.mockServer.expect(requestTo("/number")).andExpect(method(GET)).andRespond(withSuccess("8", TEXT_PLAIN));
+		@SuppressWarnings("unused")
+		String result1 = this.restTemplate.getForObject("/number", String.class);
+		// result1 == "1"
 
-		assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("1");
-		assertThat(this.restTemplate.getForObject("/number", String.class)).isEqualTo("2");
+		@SuppressWarnings("unused")
+		String result2 = this.restTemplate.getForObject("/number", String.class);
+		// result == "2"
 
 		try {
 			this.mockServer.verify();
@@ -187,7 +192,7 @@ public void repeatedAccessToResponseViaResource() {
 				.bufferContent()  // enable repeated reads of response body
 				.build();
 
-		mockServer.expect(requestTo("/composers/42")).andExpect(method(GET))
+		mockServer.expect(requestTo("/composers/42")).andExpect(method(HttpMethod.GET))
 				.andRespond(withSuccess(resource, MediaType.APPLICATION_JSON));
 
 		restTemplate.getForObject("/composers/{id}", Person.class, 42);
@@ -207,7 +212,7 @@ private ContentInterceptor(Resource resource) {
 
 		@Override
 		public ClientHttpResponse intercept(HttpRequest request, byte[] body,
-				ClientHttpRequestExecution execution) throws IOException {
+											ClientHttpRequestExecution execution) throws IOException {
 
 			ClientHttpResponse response = execution.execute(request, body);
 			byte[] expected = FileCopyUtils.copyToByteArray(this.resource.getInputStream());