Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1617 renaming test classes and confif files

Browse Source
This commit is contained in:
Mark Fisher
2010-11-15 16:47:21 -05:00
parent 9550fcf87b
commit bd6fdaa239
9 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/ConsoleChatTests-context.xml
View File

@@ -14,7 +14,6 @@
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<beans:bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<beans:property name="location" value="classpath:test.properties"/>
</beans:bean>
@@ -36,10 +35,10 @@
<xmpp:message-to value="${user.2.login}"/>
</xmpp:header-enricher>
<xmpp:message-inbound-channel-adapter channel="stdout" xmpp-connection="testConnection"/>
<xmpp:inbound-channel-adapter channel="stdout" xmpp-connection="testConnection"/>
<channel id="messagesToSend"/>
<xmpp:message-outbound-channel-adapter channel="messagesToSend" xmpp-connection="testConnection"/>
<xmpp:outbound-channel-adapter channel="messagesToSend" xmpp-connection="testConnection"/>
</beans:beans>

12
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests-context.xml → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests-context.xml
View File

@@ -18,11 +18,8 @@
http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
<context:property-placeholder location="classpath:test.properties"/>
<channel id="xmppInbound"/>
<xmpp:xmpp-connection
id="testConnection"
user="${user.1.login}"
@@ -30,11 +27,12 @@
host="${user.1.host}"
service-name="${user.1.service}"/>
<xmpp:message-inbound-channel-adapter channel="xmppInbound" xmpp-connection="testConnection"
extract-payload="false"/>
<xmpp:inbound-channel-adapter channel="inboundChatChannel" xmpp-connection="testConnection" extract-payload="false"/>
<channel id="inboundChatChannel"/>
<service-activator input-channel="inboundChatChannel" ref="xmppMessageConsumer"/>
<service-activator input-channel="xmppInbound" ref="xmppMessageConsumer"/>
<beans:bean id="xmppMessageConsumer" class="org.springframework.integration.xmpp.ignore.XmppMessageConsumer"/>
</beans:beans>

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppEndpointTests.java → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundChatTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class InboundXmppEndpointTests {
public class InboundChatTests {
@Test
@Ignore

13
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests-context.xml → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests-context.xml
View File

@@ -19,23 +19,18 @@
<beans:property name="location" value="classpath:test.properties"/>
</beans:bean>
<xmpp:xmpp-connection
id="testConnection"
user="${user.1.login}"
password="${user.1.password}"
host="${user.1.host}"
service-name="${user.1.service}"
/>
service-name="${user.1.service}"/>
<xmpp:presence-inbound-channel-adapter channel="inboundPresenceChannel" xmpp-connection="testConnection"/>
<channel id="inboundPresenceChannel"/>
<xmpp:presence-inbound-channel-adapter channel="inboundRosterEventChannel" xmpp-connection="testConnection"/>
<channel id="inboundRosterEventChannel"/>
<service-activator input-channel="inboundRosterEventChannel" output-channel="stdOutChannel"
<service-activator input-channel="inboundPresenceChannel" output-channel="stdOutChannel"
expression="'Presence event from: ' + payload.getFrom() + ' - ' + payload.getMode()"/>
<channel id="stdOutChannel"/>

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundXmppRosterEventsEndpointTests.java → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/InboundPresenceTests.java
View File

@@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class InboundXmppRosterEventsEndpointTests {
public class InboundPresenceTests {
@Test
@Ignore

6
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests-context.xml → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests-context.xml
View File

@@ -24,12 +24,12 @@
host="${user.1.host}"
service-name="${user.1.service}"/>
<inbound-channel-adapter ref="xmppProducer" channel="outboundChannel">
<inbound-channel-adapter ref="xmppProducer" channel="outboundChatChannel">
<poller fixed-rate="1000"/>
</inbound-channel-adapter>
<channel id="outboundChannel"/>
<channel id="outboundChatChannel"/>
<xmpp:message-outbound-channel-adapter channel="outboundChannel" xmpp-connection="testConnection"/>
<xmpp:outbound-channel-adapter channel="outboundChatChannel" xmpp-connection="testConnection"/>
</beans:beans>

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppEndpointTests.java → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundChatTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class OutboundXmppEndpointTests {
public class OutboundChatTests {
@Test
@Ignore

6
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests-context.xml → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests-context.xml
View File

@@ -27,12 +27,12 @@
<beans:bean id="eventProducer" class="org.springframework.integration.xmpp.presence.XmppRosterEventProducer"/>
<inbound-channel-adapter ref="eventProducer" channel="rosterPresenceUpdatingProducerChannel">
<inbound-channel-adapter ref="eventProducer" channel="outboundPresenceChannel">
<poller fixed-rate="1000">
</inbound-channel-adapter>
<channel id="rosterPresenceUpdatingProducerChannel"/>
<channel id="outboundPresenceChannel"/>
<xmpp:roster-event-outbound-channel-adapter xmpp-connection="testConnection" channel="rosterPresenceUpdatingProducerChannel"/>
<xmpp:presence-outbound-channel-adapter xmpp-connection="testConnection" channel="outboundPresenceChannel"/>
</beans:beans>

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundXmppRosterEventsEndpointTests.java → spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/OutboundPresenceTests.java
View File

@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class OutboundXmppRosterEventsEndpointTests {
public class OutboundPresenceTests {
@Test
@Ignore