You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/01/25 12:10:34 UTC
svn commit: r372195 - in
/incubator/servicemix/trunk/servicemix-components/src/test:
java/org/apache/servicemix/components/net/
resources/org/apache/servicemix/components/jabber/
Author: gnodet
Date: Wed Jan 25 03:10:08 2006
New Revision: 372195
URL: http://svn.apache.org/viewcvs?rev=372195&view=rev
Log:
Fix jabber and ftp tests so that they do not hang forever.
Jabber tests fail due to missing transport in AMQ4
Added:
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
Modified:
incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java?rev=372195&r1=372194&r2=372195&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java Wed Jan 25 03:10:08 2006
@@ -29,7 +29,8 @@
public void testSendMessagesToFTPThenPollThemAgain() throws Exception {
QName service = new QName("http://servicemix.org/cheese/", "ftpSender");
- assertSendAndReceiveMessages(service);
+ sendMessages(service, messageCount, false);
+ assertMessagesReceived(messageCount);
}
protected AbstractXmlApplicationContext createBeanFactory() {
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml?rev=372195&r1=372194&r2=372195&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml Wed Jan 25 03:10:08 2006
@@ -4,7 +4,7 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:broker.xml"/>
+ <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
</bean>
<!-- the JBI container -->
@@ -13,7 +13,7 @@
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="61626"/>
+ <property name="port" value="6222"/>
<property name="login" value="false"/>
<property name="participant" value="test2@servicemix.org"/>
</bean></sm:component>
Added: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml?rev=372195&view=auto
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml (added)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml Wed Jan 25 03:10:08 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <broker persistent="false">
+
+ <transportConnectors>
+ <transportConnector uri="jabber://localhost:6222" />
+ </transportConnectors>
+
+ </broker>
+
+</beans>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml?rev=372195&r1=372194&r2=372195&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml Wed Jan 25 03:10:08 2006
@@ -4,7 +4,7 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:broker.xml"/>
+ <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
</bean>
<!-- the JBI container -->
@@ -15,7 +15,7 @@
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender" endpoint="myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="61626"/>
+ <property name="port" value="6222"/>
<property name="user" value="test1@servicemix.org"/>
<property name="password" value="rocks"/>
<property name="participant" value="test2@servicemix.org"/>
@@ -27,7 +27,7 @@
<sm:activationSpec componentName="myJabberReceiver" service="foo:myJabberReceiver" endpoint="myJabberReceiver" destinationService="foo:receiver">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberReceiver">
<property name="host" value="localhost"/>
- <property name="port" value="61626"/>
+ <property name="port" value="6222"/>
<property name="user" value="test2@servicemix.org"/>
<property name="password" value="rocks"/>
</bean></sm:component>
Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml?rev=372195&r1=372194&r2=372195&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml Wed Jan 25 03:10:08 2006
@@ -4,7 +4,7 @@
<!-- lets run an embedded broker -->
<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
- <property name="config" value="classpath:broker.xml"/>
+ <property name="config" value="classpath:org/apache/servicemix/components/jabber/broker.xml"/>
</bean>
<!-- the JBI container -->
@@ -15,7 +15,7 @@
<sm:activationSpec componentName="myJabberSender" service="foo:myJabberSender" endpoint="myJabberSender">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberGroupChatSender">
<property name="host" value="localhost"/>
- <property name="port" value="61626"/>
+ <property name="port" value="6222"/>
<property name="user" value="test1@servicemix.org"/>
<property name="password" value="rocks"/>
<property name="room" value="servicemixroom"/>
@@ -27,7 +27,7 @@
<sm:activationSpec componentName="myJabberReceiver" service="foo:myJabberReceiver" endpoint="myJabberReceiver" destinationService="foo:receiver">
<sm:component><bean class="org.apache.servicemix.components.jabber.JabberReceiver">
<property name="host" value="localhost"/>
- <property name="port" value="61626"/>
+ <property name="port" value="6222"/>
<property name="user" value="test2@servicemix.org"/>
<property name="password" value="rocks"/>
</bean></sm:component>