From 669860e78e471198fb9f449c7e4aac689937817a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 15 Nov 2010 16:17:07 -0500 Subject: [PATCH] INT-1617 renaming test classes and confif files --- ...oundChannelAdapterParserTests-context.xml} | 2 -- ...sageInboundChannelAdapterParserTests.java} | 24 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) rename spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/{InboundXmppEndpointParserTests-context.xml => ChatMessageInboundChannelAdapterParserTests-context.xml} (99%) rename spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/{InboundXmppEndpointParserTests.java => ChatMessageInboundChannelAdapterParserTests.java} (68%) diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests-context.xml similarity index 99% rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests-context.xml rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests-context.xml index 89bf3bd04a..9422e8b5e6 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests-context.xml @@ -27,6 +27,4 @@ - - diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java similarity index 68% rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java index 16be29001b..71a77b550e 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/InboundXmppEndpointParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java @@ -21,26 +21,34 @@ import static junit.framework.Assert.assertFalse; import org.jivesoftware.smack.XMPPConnection; import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xmpp.inbound.ChatMessageListeningEndpoint; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Oleg Zhurakousky + * @author Mark Fisher */ -public class InboundXmppEndpointParserTests { +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class ChatMessageInboundChannelAdapterParserTests { + + @Autowired + private ApplicationContext context; @Test public void testInboundAdapter(){ - ApplicationContext context = new ClassPathXmlApplicationContext( - "InboundXmppEndpointParserTests-context.xml", this.getClass()); - ChatMessageListeningEndpoint xmde = context.getBean("xmppInboundAdapter", ChatMessageListeningEndpoint.class); - assertFalse(xmde.isAutoStartup()); - DirectChannel channel = (DirectChannel) TestUtils.getPropertyValue(xmde, "messagingTemplate.defaultChannel"); + ChatMessageListeningEndpoint adapter = context.getBean("xmppInboundAdapter", ChatMessageListeningEndpoint.class); + assertFalse(adapter.isAutoStartup()); + DirectChannel channel = (DirectChannel) TestUtils.getPropertyValue(adapter, "messagingTemplate.defaultChannel"); assertEquals("xmppInbound", channel.getComponentName()); - XMPPConnection connection = (XMPPConnection)TestUtils.getPropertyValue(xmde, "xmppConnection"); + XMPPConnection connection = (XMPPConnection)TestUtils.getPropertyValue(adapter, "xmppConnection"); assertEquals(connection, context.getBean("testConnection")); }