You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/19 09:30:02 UTC
svn commit: r786399 - in /camel/trunk/components/camel-xmpp: ./
src/test/java/org/apache/camel/component/xmpp/
Author: ningjiang
Date: Fri Jun 19 07:30:02 2009
New Revision: 786399
URL: http://svn.apache.org/viewvc?rev=786399&view=rev
Log:
Upgrade the camel-xmpp to JUnit4
Modified:
camel/trunk/components/camel-xmpp/pom.xml
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
Modified: camel/trunk/components/camel-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/pom.xml?rev=786399&r1=786398&r2=786399&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/pom.xml (original)
+++ camel/trunk/components/camel-xmpp/pom.xml Fri Jun 19 07:30:02 2009
@@ -51,8 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java?rev=786399&r1=786398&r2=786399&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkTest.java Fri Jun 19 07:30:02 2009
@@ -16,11 +16,12 @@
*/
package org.apache.camel.component.xmpp;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
-public class GoogleTalkTest extends ContextTestSupport {
+public class GoogleTalkTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
public void xtestSendToGTalk() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
@@ -35,6 +36,7 @@
}
// get around junit warning
+ @Test
public void testNothing() throws Exception {
}
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java?rev=786399&r1=786398&r2=786399&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java Fri Jun 19 07:30:02 2009
@@ -16,18 +16,19 @@
*/
package org.apache.camel.component.xmpp;
-import junit.framework.TestCase;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class UriConfigurationTest extends TestCase {
+public class UriConfigurationTest extends Assert {
protected CamelContext context = new DefaultCamelContext();
+ @Test
public void testPrivateChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@localhost:123/test-user@localhost?password=secret&serviceName=someCoolChat");
assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
@@ -42,6 +43,7 @@
assertEquals("someCoolChat", xmppEndpoint.getServiceName());
}
+ @Test
public void testGroupChatConfiguration() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com:123?room=cheese&password=secret&nickname=incognito");
assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
@@ -59,6 +61,7 @@
// Changes in default resource name may break
// clients program assuming the default "Camel" resource name
// so it is better to avoid changing it.
+ @Test
public void testDefaultResource() throws Exception {
Endpoint endpoint = context.getEndpoint("xmpp://camel-user@im.google.com?password=secret");
assertTrue("Endpoint not an XmppEndpoint: " + endpoint, endpoint instanceof XmppEndpoint);
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java?rev=786399&r1=786398&r2=786399&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java Fri Jun 19 07:30:02 2009
@@ -20,13 +20,14 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class XmppProducerConcurrentTest extends ContextTestSupport {
+public class XmppProducerConcurrentTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in your own gmail credentials in the route below
public void xtestNoConcurrentProducers() throws Exception {
@@ -39,6 +40,7 @@
}
// get around junit warning
+ @Test
public void testNothing() throws Exception {
}