From 90e54572601a4d5f3c6ff9035596986398cd7bd7 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 4 Jun 2016 12:50:39 -0400 Subject: [PATCH] File Cleanup - ws to xmpp --- ...llingWebServiceIntegrationTests-context.xml | 2 +- .../SimpleWebServiceOutboundGatewayTests.java | 5 +++-- .../WebServiceHeaderEnricherTests-context.xml | 2 +- .../WebServiceOutboundGatewayParserTests.java | 1 + ...ceOutboundGatewayWithHeaderMapperTests.java | 18 ++++++++++++------ ...atewayWithBothUriAndDestinationProvider.xml | 4 ++-- ...wayWithNeitherUriNorDestinationProvider.xml | 4 ++-- ...pleWebServiceOutboundGatewayParserTests.xml | 2 +- .../ws-outbound-gateway-with-headermappers.xml | 12 ++++++------ .../xml/DefaultXmlPayloadConverterTests.java | 2 +- .../config/chain-elements-config.properties | 2 +- .../integration/xml/config/test.xsl | 2 +- .../xml/transformer/transform-tostring.xsl | 2 +- .../xml/transformer/transformer.xslt | 8 ++++---- .../xmpp/ignore/ConsoleChatTests.java | 5 +++-- .../xmpp/ignore/OutboundChatTests-context.xml | 14 +++++++------- .../xmpp/ignore/SmackMessageSampleTests.java | 9 ++++++--- .../src/test/java/test.properties | 2 +- 18 files changed, 54 insertions(+), 42 deletions(-) diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml index a3c0b00c6e..7b9555ef54 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests-context.xml @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java index 081fe0fa51..b33b1aceb6 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java @@ -35,7 +35,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanFactory; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.support.MessageBuilder; @@ -103,12 +102,14 @@ public class SimpleWebServiceOutboundGatewayTests { @Test //INT-1029 public void testWsOutboundGatewayInsideChain() { - ApplicationContext context = new ClassPathXmlApplicationContext("WebServiceOutboundGatewayInsideChainTests-context.xml", this.getClass()); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "WebServiceOutboundGatewayInsideChainTests-context.xml", this.getClass()); MessageChannel channel = context.getBean("wsOutboundGatewayInsideChain", MessageChannel.class); channel.send(MessageBuilder.withPayload("foo").build()); PollableChannel replyChannel = context.getBean("replyChannel", PollableChannel.class); Message replyMessage = replyChannel.receive(); assertThat(replyMessage.getPayload().toString(), Matchers.endsWith(response)); + context.close(); } @Test(expected = ReplyRequiredException.class) diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests-context.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests-context.xml index 2e30d44bc9..823b96d6a0 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests-context.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests-context.xml @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java index 70afa570f0..ad681fd23e 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java @@ -309,6 +309,7 @@ public class WebServiceOutboundGatewayParserTests { "simpleWebServiceOutboundGatewayParserTests.xml", this.getClass()); AbstractEndpoint endpoint = (AbstractEndpoint) context.getBean("gatewayWithOrderAndAutoStartupFalse"); assertEquals(Boolean.FALSE, new DirectFieldAccessor(endpoint).getPropertyValue("autoStartup")); + context.close(); } @Test diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java index d778d93ea8..8814c687c8 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java @@ -40,7 +40,6 @@ import org.mockito.stubbing.Answer; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.mapping.AbstractHeaderMapper; @@ -87,9 +86,12 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { @SuppressWarnings("unchecked") @Test public void headerMapperParserTest() throws Exception { - ApplicationContext context = new ClassPathXmlApplicationContext("ws-outbound-gateway-with-headermappers.xml", this.getClass()); - SimpleWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(context.getBean("withHeaderMapper"), "handler", SimpleWebServiceOutboundGateway.class); - DefaultSoapHeaderMapper headerMapper = TestUtils.getPropertyValue(gateway, "headerMapper", DefaultSoapHeaderMapper.class); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "ws-outbound-gateway-with-headermappers.xml", this.getClass()); + SimpleWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(context.getBean("withHeaderMapper"), + "handler", SimpleWebServiceOutboundGateway.class); + DefaultSoapHeaderMapper headerMapper = TestUtils.getPropertyValue(gateway, "headerMapper", + DefaultSoapHeaderMapper.class); assertNotNull(headerMapper); AbstractHeaderMapper.HeaderMatcher requestHeaderMatcher = TestUtils.getPropertyValue(headerMapper, @@ -109,6 +111,7 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { assertFalse(replyHeaderMatcher.matchHeader("123baz123")); assertTrue(replyHeaderMatcher.matchHeader("bar")); assertTrue(replyHeaderMatcher.matchHeader("bar123")); + context.close(); } @Test @@ -183,8 +186,10 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { @SuppressWarnings("rawtypes") public Message process(Object payload, String gatewayName, String channelName, final boolean soap) throws Exception { - ApplicationContext context = new ClassPathXmlApplicationContext("ws-outbound-gateway-with-headermappers.xml", this.getClass()); - AbstractWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(context.getBean(gatewayName), "handler", AbstractWebServiceOutboundGateway.class); + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "ws-outbound-gateway-with-headermappers.xml", this.getClass()); + AbstractWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(context.getBean(gatewayName), "handler", + AbstractWebServiceOutboundGateway.class); if (!soap) { WebServiceTemplate template = TestUtils.getPropertyValue(gateway, "webServiceTemplate", WebServiceTemplate.class); @@ -257,6 +262,7 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { inputChannel.send(message); QueueChannel outputChannel = context.getBean("outputChannel", QueueChannel.class); Message replyMessage = outputChannel.receive(0); + context.close(); return replyMessage; } diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml index 8d2ed8176a..0049e69096 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithBothUriAndDestinationProvider.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd - http://www.springframework.org/schema/util + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> @@ -24,6 +24,6 @@ uri="http://example.org" destination-provider="destinationProvider"/> - + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml index a9f55b7107..a7ef2f8aea 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/invalidGatewayWithNeitherUriNorDestinationProvider.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd - http://www.springframework.org/schema/util + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> @@ -22,6 +22,6 @@ - + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml index 4231b11ce1..5ea58ec3b6 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/simpleWebServiceOutboundGatewayParserTests.xml @@ -148,6 +148,6 @@ - + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml index f7caed5fda..5a2cac9bda 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml @@ -17,7 +17,7 @@ uri="http://example.org" mapped-request-headers="foo*, *baz*" mapped-reply-headers="bar*"/> - + - + - + - + - - + + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java index 065cca7bbc..adc950e5fe 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java @@ -136,7 +136,7 @@ public class DefaultXmlPayloadConverterTests { public void testConvertSourceToDocument() throws Exception { Node element = testDocument.getElementsByTagName("test").item(0); DOMSource domSource = new DOMSource(element); - Document doc = converter.convertToDocument(element); + Document doc = converter.convertToDocument(domSource); NodeList childNodes = doc.getChildNodes(); assertEquals(1, childNodes.getLength()); assertEquals("test", childNodes.item(0).getNodeName()); diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/chain-elements-config.properties b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/chain-elements-config.properties index 0b894faf95..7c1ca592f0 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/chain-elements-config.properties +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/chain-elements-config.properties @@ -27,4 +27,4 @@ xpath-transformer-poller=\ \ \ \ - \ No newline at end of file + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/test.xsl b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/test.xsl index e7856db28a..f1a0f726ba 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/test.xsl +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/test.xsl @@ -4,4 +4,4 @@ test - \ No newline at end of file + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl index a0b276d1ff..37311eb768 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transform-tostring.xsl @@ -3,4 +3,4 @@ hello world text - \ No newline at end of file + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transformer.xslt b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transformer.xslt index 0134f64fdd..419f8c1f96 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transformer.xslt +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/transformer.xslt @@ -6,14 +6,14 @@ test - + - + - + - \ No newline at end of file + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests.java index 5591892658..d8fe5586c8 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -27,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Mark Fisher * @author Artem Bilan + * @author Gary Russell * @since 2.0 */ @ContextConfiguration @@ -34,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class ConsoleChatTests { public static void main(String[] args) { - new ClassPathXmlApplicationContext("ConsoleChatTests-context.xml", ConsoleChatTests.class); + new ClassPathXmlApplicationContext("ConsoleChatTests-context.xml", ConsoleChatTests.class).close(); } @Test diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml index 58cfddd3e4..2cff7411c6 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml @@ -15,14 +15,14 @@ + class="org.springframework.integration.xmpp.ignore.XmppMessageProducer" + p:recipient="${user.2.login}"/> - + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java index 635a603f49..43c124543c 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java @@ -19,7 +19,6 @@ package org.springframework.integration.xmpp.ignore; import org.junit.Ignore; import org.junit.Test; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -27,22 +26,26 @@ import org.springframework.messaging.support.GenericMessage; /** * @author Oleg Zhurakousky + * @author Gary Russell */ public class SmackMessageSampleTests { @Test @Ignore public void validateSmackMessageSent() { - ApplicationContext ac = new ClassPathXmlApplicationContext("SmackMessageSampleTest-context.xml", this.getClass()); + ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext("SmackMessageSampleTest-context.xml", + this.getClass()); MessageChannel xmppInput = ac.getBean("xmppInput", MessageChannel.class); - org.jivesoftware.smack.packet.Message smackMessage = new org.jivesoftware.smack.packet.Message("springintegration@gmail.com"); + org.jivesoftware.smack.packet.Message smackMessage = new org.jivesoftware.smack.packet.Message( + "springintegration@gmail.com"); smackMessage.setBody("Message sent as Smack Message"); Message message = new GenericMessage(smackMessage); xmppInput.send(message); + ac.close(); } } diff --git a/spring-integration-xmpp/src/test/java/test.properties b/spring-integration-xmpp/src/test/java/test.properties index 9ca863d042..ce0c7d0334 100644 --- a/spring-integration-xmpp/src/test/java/test.properties +++ b/spring-integration-xmpp/src/test/java/test.properties @@ -3,4 +3,4 @@ user.2.login=user2@gmail.com user.1.login=user1@gmail.com user.1.password=password user.1.host=talk.google.com -user.1.service=gmail.com \ No newline at end of file +user.1.service=gmail.com