From f5781bfff83c4f0a57edb3a3a49364949b560fe0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 18 Dec 2015 18:31:09 -0500 Subject: [PATCH] INT-3918: Use MockMvc instead of Sun HttpServer JIRA: https://jira.spring.io/browse/INT-3918 --- ...tpOutboundGatewayWithMethodExpression.java | 130 ------------------ ...ewayWithMethodExpressionTests-context.xml} | 7 +- ...boundGatewayWithMethodExpressionTests.java | 107 ++++++++++++++ ...OutboundResponseTypeTests-context-fail.xml | 12 +- .../OutboundResponseTypeTests-context.xml | 37 +++-- .../config/OutboundResponseTypeTests.java | 126 ++++++++--------- 6 files changed, 196 insertions(+), 223 deletions(-) delete mode 100644 spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java rename spring-integration-http/src/test/java/org/springframework/integration/http/config/{http-outbound-gateway-with-httpmethod-expression.xml => HttpOutboundGatewayWithMethodExpressionTests-context.xml} (80%) create mode 100644 spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java deleted file mode 100644 index 6131a88594..0000000000 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2002-2012 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 - * - * http://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 org.springframework.integration.http.config; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetSocketAddress; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.messaging.support.GenericMessage; -import org.springframework.integration.test.util.SocketUtils; - -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - -/** - * @author Oleg Zhurakousky - * - * see https://jira.springsource.org/browse/INT-2397 - */ -public class HttpOutboundGatewayWithMethodExpression { - - private HttpServer server; - private MyHandler httpHandler; - - @Before - public void createServer() throws Exception { - int httpPort = SocketUtils.findAvailableServerSocket(); - System.setProperty("httpPort", String.valueOf(httpPort)); - - httpHandler = new MyHandler(); - server = HttpServer.create(new InetSocketAddress(httpPort), 0); - server.createContext("/testApps/httpMethod", httpHandler); - server.start(); - } - @After - public void stopServer() throws Exception { - server.stop(0); - } - - @Test - public void testDefaultMethod() throws Exception{ - - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "http-outbound-gateway-with-httpmethod-expression.xml", this.getClass()); - - MessageChannel channel = context.getBean("defaultChannel", MessageChannel.class); - QueueChannel replyChannel = context.getBean("replyChannel", QueueChannel.class); - - httpHandler.setHttpMethod("POST"); - channel.send(new GenericMessage("Hello")); - Message message = replyChannel.receive(5000); - assertNotNull(message); - assertEquals("POST", message.getPayload()); - } - - @Test - public void testExplicitlySetMethod() throws Exception{ - - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "http-outbound-gateway-with-httpmethod-expression.xml", this.getClass()); - - MessageChannel channel = context.getBean("requestChannel", MessageChannel.class); - QueueChannel replyChannel = context.getBean("replyChannel", QueueChannel.class); - - httpHandler.setHttpMethod("GET"); - channel.send(new GenericMessage("GET")); - Message message = replyChannel.receive(5000); - assertNotNull(message); - assertEquals("GET", message.getPayload()); - } - - @Test(expected=BeanDefinitionParsingException.class) - public void testMutuallyExclusivityInMethodAndMethodExpression() throws Exception{ - - new ClassPathXmlApplicationContext( - "http-outbound-gateway-with-httpmethod-expression-fail.xml", this.getClass()); - } - - class MyHandler implements HttpHandler { - private String httpMethod; - - public void setHttpMethod(String httpMethod){ - this.httpMethod = httpMethod; - } - - public void handle(HttpExchange t) throws IOException { - String requestMethod = t.getRequestMethod(); - String response = null; - if (requestMethod.equalsIgnoreCase(this.httpMethod)){ - response = httpMethod; - t.getResponseHeaders().add("Content-Type", "text/plain"); //Required for Spring 3.0.x - t.sendResponseHeaders(200, response.length()); - - } - else { - response = "Request is NOT valid"; - t.sendResponseHeaders(404, 0); - } - - OutputStream os = t.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } - } -} diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/http-outbound-gateway-with-httpmethod-expression.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests-context.xml similarity index 80% rename from spring-integration-http/src/test/java/org/springframework/integration/http/config/http-outbound-gateway-with-httpmethod-expression.xml rename to spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests-context.xml index 394cc52fee..77ae1336b2 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/http-outbound-gateway-with-httpmethod-expression.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests-context.xml @@ -7,16 +7,19 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd"> + - - diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java new file mode 100644 index 0000000000..571d6feeac --- /dev/null +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java @@ -0,0 +1,107 @@ +/* + * Copyright 2002-2015 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 + * + * http://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 org.springframework.integration.http.config; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.web.client.MockRestServiceServer; +import org.springframework.web.client.RestTemplate; + +/** + * @author Oleg Zhurakousky + * @author Artem Bilan + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +@DirtiesContext +public class HttpOutboundGatewayWithMethodExpressionTests { + + @Autowired + private MessageChannel defaultChannel; + + @Autowired + private MessageChannel requestChannel; + + @Autowired + private PollableChannel replyChannel; + + @Autowired + private RestTemplate restTemplate; + + private MockRestServiceServer mockServer; + + @Before + public void setup() { + this.mockServer = MockRestServiceServer.createServer(this.restTemplate); + } + + @Test + public void testDefaultMethod() throws Exception { + this.mockServer.expect(requestTo("/testApps/httpMethod")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + + this.defaultChannel.send(new GenericMessage("Hello")); + Message message = this.replyChannel.receive(5000); + assertNotNull(message); + assertEquals("POST", message.getPayload()); + + this.mockServer.verify(); + } + + @Test + public void testExplicitlySetMethod() throws Exception { + this.mockServer.expect(requestTo("/testApps/httpMethod")) + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess(HttpMethod.GET.name(), MediaType.TEXT_PLAIN)); + + this.requestChannel.send(new GenericMessage("GET")); + Message message = replyChannel.receive(5000); + assertNotNull(message); + assertEquals("GET", message.getPayload()); + + this.mockServer.verify(); + } + + @Test(expected = BeanDefinitionParsingException.class) + public void testMutuallyExclusivityInMethodAndMethodExpression() throws Exception { + new ClassPathXmlApplicationContext( + "http-outbound-gateway-with-httpmethod-expression-fail.xml", getClass()) + .close(); + } + +} diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context-fail.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context-fail.xml index dbf25ccfe7..e6dcf68325 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context-fail.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context-fail.xml @@ -1,23 +1,13 @@ - - - - - - - - diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context.xml index a850228635..707409781b 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests-context.xml @@ -13,48 +13,55 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> - + - - - - - - + + + + + + + + + - + - - - - - - diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java index 1ff5d8862a..3d6409b913 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java @@ -16,43 +16,41 @@ package org.springframework.integration.http.config; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetSocketAddress; import java.util.Collections; import java.util.Map; import org.hamcrest.Matchers; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import com.sun.net.httpserver.Headers; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.test.util.SocketUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.web.client.MockRestServiceServer; +import org.springframework.web.client.RestTemplate; /** * @author Oleg Zhurakousky @@ -67,9 +65,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class OutboundResponseTypeTests { - private static HttpServer server; + @Autowired + private RestTemplate restTemplate; - private static MyHandler httpHandler; + @Autowired + private RestTemplate restTemplateWithConverters; @Autowired private QueueChannel replyChannel; @@ -95,67 +95,96 @@ public class OutboundResponseTypeTests { @Autowired private MessageChannel contentTypePropagationChannel; - private static int port = SocketUtils.findAvailableServerSocket(); + private MockRestServiceServer mockServer; - @BeforeClass - public static void createServer() throws Exception { - httpHandler = new MyHandler(); - server = HttpServer.create(new InetSocketAddress(port), 0); - server.createContext("/testApps/outboundResponse", httpHandler); - server.start(); - } - - @AfterClass - public static void stopServer() throws Exception { - server.stop(0); + @Before + public void setup() { + this.mockServer = MockRestServiceServer.createServer(this.restTemplate); } @Test public void testDefaultResponseType() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.requestChannel.send(new GenericMessage("Hello")); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof ResponseEntity); + + this.mockServer.verify(); } @Test public void testWithResponseTypeSet() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.resTypeSetChannel.send(new GenericMessage("Hello")); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof String); + + this.mockServer.verify(); } @Test public void testWithResponseTypeExpressionSet() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.resTypeExpressionSetChannel.send(new GenericMessage("java.lang.String")); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof String); + + this.mockServer.verify(); } @Test public void testWithResponseTypeExpressionSetAsClass() throws Exception { + this.mockServer = MockRestServiceServer.createServer(this.restTemplateWithConverters); + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.resTypeExpressionSetSerializationChannel.send(new GenericMessage>(String.class)); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof String); + + this.mockServer.verify(); } @Test public void testInt2706ResponseTypeExpressionAsPrimitive() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.resTypeExpressionSetChannel.send(new GenericMessage("byte[]")); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof byte[]); + + this.mockServer.verify(); } @Test public void testInt2706ResponseTypePrimitiveArrayClassAsString() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.resPrimitiveStringPresentationChannel.send(new GenericMessage("hello".getBytes())); Message message = this.replyChannel.receive(5000); assertNotNull(message); assertTrue(message.getPayload() instanceof byte[]); + + this.mockServer.verify(); } @Test @@ -188,48 +217,15 @@ public class OutboundResponseTypeTests { @Test public void testContentTypePropagation() throws Exception { + this.mockServer.expect(requestTo("/testApps/outboundResponse")) + .andExpect(method(HttpMethod.POST)) + .andExpect(header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON.toString())) + .andRespond(withSuccess(HttpMethod.POST.name(), MediaType.TEXT_PLAIN)); + this.contentTypePropagationChannel .send(new GenericMessage>(Collections.singletonMap("foo", "bar"))); - assertEquals(MediaType.APPLICATION_JSON.toString(), httpHandler.requestHeaders.getFirst("Content-Type")); - } - - static class MyHandler implements HttpHandler { - - private String httpMethod = "POST"; - - private volatile Headers requestHeaders; - - public void setHttpMethod(String httpMethod) { - this.httpMethod = httpMethod; - } - - public void handle(HttpExchange t) throws IOException { - String requestMethod = t.getRequestMethod(); - requestHeaders = t.getRequestHeaders(); - String response = null; - if (requestMethod.equalsIgnoreCase(this.httpMethod)) { - response = httpMethod; - t.getResponseHeaders().add("Content-Type", MediaType.TEXT_PLAIN.toString()); //Required for Spring 3.0.x - t.sendResponseHeaders(200, response.length()); - } - else { - response = "Request is NOT valid"; - t.sendResponseHeaders(404, 0); - } - - OutputStream os = t.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } - - } - - public static class Port { - - public String getPort() { - return Integer.toString(port); - } + this.mockServer.verify(); } }