You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/09/22 13:55:45 UTC
svn commit: r817619 - in
/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp:
GoogleTalkTest.java XmppProducerConcurrentTest.java XmppRouteChatTest.java
XmppRouteMultipleProducersSingleConsumerTest.java
Author: davsclaus
Date: Tue Sep 22 11:55:45 2009
New Revision: 817619
URL: http://svn.apache.org/viewvc?rev=817619&view=rev
Log:
Disabled unit tests that requires online and jabber accounts etc. These must be tested manually instead.
Modified:
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/XmppProducerConcurrentTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
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=817619&r1=817618&r2=817619&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 Tue Sep 22 11:55:45 2009
@@ -19,35 +19,39 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
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 {
+
+ @Ignore
+ @Test
+ public void testSendToGTalk() throws Exception {
+ // a disabled test... before enabling you must fill in your own gmail credentials in the route below
+
MockEndpoint result = getMockEndpoint("mock:result");
template.sendBody("direct:start", "Hi!");
result.assertIsSatisfied();
}
-
- public void xtestSendToGTalkWithSubject() throws Exception {
+
+ @Ignore
+ @Test
+ public void testSendToGTalkWithSubject() throws Exception {
+ // a disabled test... before enabling you must fill in your own gmail credentials in the route below
+
MockEndpoint result = getMockEndpoint("mock:result");
template.sendBodyAndHeader("direct:start", "Hi!", "Subject", "From Camel");
result.assertIsSatisfied();
}
- // get around junit warning
- @Test
- public void testNothing() throws Exception {
- }
-
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
// START SNIPPET: e1
// send a message from fromuser@gmail.com to touser@gmail.com
from("direct:start").
- to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
- to("mock:result");
+ to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
+ to("mock:result");
// END SNIPPET: e1
}
};
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=817619&r1=817618&r2=817619&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 Tue Sep 22 11:55:45 2009
@@ -22,6 +22,7 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -29,20 +30,22 @@
*/
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 {
+ @Ignore
+ @Test
+ public void testNoConcurrentProducers() throws Exception {
+ // a disabled test... before enabling you must fill in your own gmail credentials in the route below
+
doSendMessages(1, 1);
}
- // a disabled test... before enabling you must fill in your own gmail credentials in the route below
- public void xtestConcurrentProducers() throws Exception {
+ @Ignore
+ @Test
+ public void testConcurrentProducers() throws Exception {
+ // a disabled test... before enabling you must fill in your own gmail credentials in the route below
+
doSendMessages(10, 5);
}
- // get around junit warning
- @Test
- public void testNothing() throws Exception {
- }
private void doSendMessages(int files, int poolSize) throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(files);
@@ -68,8 +71,8 @@
@Override
public void configure() throws Exception {
from("direct:start").
- to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
- to("mock:result");
+ to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
+ to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java?rev=817619&r1=817618&r2=817619&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java Tue Sep 22 11:55:45 2009
@@ -16,15 +16,12 @@
*/
package org.apache.camel.component.xmpp;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.jivesoftware.smack.packet.Message;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -37,9 +34,10 @@
protected String body1 = "the first message";
protected String body2 = "the second message";
-
+ @Ignore
@Test
public void testXmppChat() throws Exception {
+ // TODO: requires online against jabber. Test this manually
consumerEndpoint = (MockEndpoint)context.getEndpoint("mock:out1");
producerEndpoint = (MockEndpoint)context.getEndpoint("mock:out2");
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java?rev=817619&r1=817618&r2=817619&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java Tue Sep 22 11:55:45 2009
@@ -16,15 +16,12 @@
*/
package org.apache.camel.component.xmpp;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.jivesoftware.smack.packet.Message;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -35,6 +32,7 @@
protected MockEndpoint goodEndpoint;
protected MockEndpoint badEndpoint;
+ @Ignore
@Test
public void testProducerGetsEverything() throws Exception {
Re: svn commit: r817619 - in /camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp:
GoogleTalkTest.java XmppProducerConcurrentTest.java XmppRouteChatTest.java
XmppRouteMultipleProducersSingleConsumerTest.java
Posted by Claus Ibsen <cl...@gmail.com>.
On Tue, Sep 22, 2009 at 3:01 PM, Willem Jiang <wi...@gmail.com> wrote:
> Hi Claus
>
> You can add some comments after the @Ignore annotation, such as
> @Ignore("bala bala ");
> It will be helpful when we revisit these tests.
Thanks now I learned something today as well.
>
> Willem
Re: svn commit: r817619 - in /camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp:
GoogleTalkTest.java XmppProducerConcurrentTest.java XmppRouteChatTest.java
XmppRouteMultipleProducersSingleConsumerTest.java
Posted by Willem Jiang <wi...@gmail.com>.
Hi Claus
You can add some comments after the @Ignore annotation, such as
@Ignore("bala bala ");
It will be helpful when we revisit these tests.
Willem
davsclaus@apache.org wrote:
> Author: davsclaus
> Date: Tue Sep 22 11:55:45 2009
> New Revision: 817619
>
> URL: http://svn.apache.org/viewvc?rev=817619&view=rev
> Log:
> Disabled unit tests that requires online and jabber accounts etc. These must be tested manually instead.
>
> Modified:
> 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/XmppProducerConcurrentTest.java
> camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
> camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
>
> 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=817619&r1=817618&r2=817619&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 Tue Sep 22 11:55:45 2009
> @@ -19,35 +19,39 @@
> import org.apache.camel.builder.RouteBuilder;
> import org.apache.camel.component.mock.MockEndpoint;
> import org.apache.camel.test.junit4.CamelTestSupport;
> +import org.junit.Ignore;
> import org.junit.Test;
>
> 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 {
> +
> + @Ignore
> + @Test
> + public void testSendToGTalk() throws Exception {
> + // a disabled test... before enabling you must fill in your own gmail credentials in the route below
> +
> MockEndpoint result = getMockEndpoint("mock:result");
> template.sendBody("direct:start", "Hi!");
> result.assertIsSatisfied();
> }
> -
> - public void xtestSendToGTalkWithSubject() throws Exception {
> +
> + @Ignore
> + @Test
> + public void testSendToGTalkWithSubject() throws Exception {
> + // a disabled test... before enabling you must fill in your own gmail credentials in the route below
> +
> MockEndpoint result = getMockEndpoint("mock:result");
> template.sendBodyAndHeader("direct:start", "Hi!", "Subject", "From Camel");
> result.assertIsSatisfied();
> }
>
> - // get around junit warning
> - @Test
> - public void testNothing() throws Exception {
> - }
> -
> protected RouteBuilder createRouteBuilder() {
> return new RouteBuilder() {
> public void configure() {
> // START SNIPPET: e1
> // send a message from fromuser@gmail.com to touser@gmail.com
> from("direct:start").
> - to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
> - to("mock:result");
> + to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
> + to("mock:result");
> // END SNIPPET: e1
> }
> };
>
> 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=817619&r1=817618&r2=817619&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 Tue Sep 22 11:55:45 2009
> @@ -22,6 +22,7 @@
>
> import org.apache.camel.builder.RouteBuilder;
> import org.apache.camel.test.junit4.CamelTestSupport;
> +import org.junit.Ignore;
> import org.junit.Test;
>
> /**
> @@ -29,20 +30,22 @@
> */
> 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 {
> + @Ignore
> + @Test
> + public void testNoConcurrentProducers() throws Exception {
> + // a disabled test... before enabling you must fill in your own gmail credentials in the route below
> +
> doSendMessages(1, 1);
> }
>
> - // a disabled test... before enabling you must fill in your own gmail credentials in the route below
> - public void xtestConcurrentProducers() throws Exception {
> + @Ignore
> + @Test
> + public void testConcurrentProducers() throws Exception {
> + // a disabled test... before enabling you must fill in your own gmail credentials in the route below
> +
> doSendMessages(10, 5);
> }
>
> - // get around junit warning
> - @Test
> - public void testNothing() throws Exception {
> - }
>
> private void doSendMessages(int files, int poolSize) throws Exception {
> getMockEndpoint("mock:result").expectedMessageCount(files);
> @@ -68,8 +71,8 @@
> @Override
> public void configure() throws Exception {
> from("direct:start").
> - to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
> - to("mock:result");
> + to("xmpp://talk.google.com:5222/touser@gmail.com?serviceName=gmail.com&user=fromuser&password=secret").
> + to("mock:result");
> }
> };
> }
>
> Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java?rev=817619&r1=817618&r2=817619&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java (original)
> +++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java Tue Sep 22 11:55:45 2009
> @@ -16,15 +16,12 @@
> */
> package org.apache.camel.component.xmpp;
>
> -import org.apache.camel.Exchange;
> -import org.apache.camel.Processor;
> import org.apache.camel.builder.RouteBuilder;
> import org.apache.camel.component.mock.MockEndpoint;
> import org.apache.camel.test.junit4.CamelTestSupport;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> -
> -import org.jivesoftware.smack.packet.Message;
> +import org.junit.Ignore;
> import org.junit.Test;
>
> /**
> @@ -37,9 +34,10 @@
> protected String body1 = "the first message";
> protected String body2 = "the second message";
>
> -
> + @Ignore
> @Test
> public void testXmppChat() throws Exception {
> + // TODO: requires online against jabber. Test this manually
> consumerEndpoint = (MockEndpoint)context.getEndpoint("mock:out1");
> producerEndpoint = (MockEndpoint)context.getEndpoint("mock:out2");
>
>
> Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java?rev=817619&r1=817618&r2=817619&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java (original)
> +++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java Tue Sep 22 11:55:45 2009
> @@ -16,15 +16,12 @@
> */
> package org.apache.camel.component.xmpp;
>
> -import org.apache.camel.Exchange;
> -import org.apache.camel.Processor;
> import org.apache.camel.builder.RouteBuilder;
> import org.apache.camel.component.mock.MockEndpoint;
> import org.apache.camel.test.junit4.CamelTestSupport;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> -
> -import org.jivesoftware.smack.packet.Message;
> +import org.junit.Ignore;
> import org.junit.Test;
>
> /**
> @@ -35,6 +32,7 @@
> protected MockEndpoint goodEndpoint;
> protected MockEndpoint badEndpoint;
>
> + @Ignore
> @Test
> public void testProducerGetsEverything() throws Exception {
>
>
>
>