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 2011/01/17 15:28:53 UTC
svn commit: r1059933 - in /camel/trunk/components/camel-jms/src/test:
java/org/apache/camel/component/jms/
java/org/apache/camel/component/jms/issues/
java/org/apache/camel/component/jms/tx/
resources/org/apache/camel/component/jms/issues/
Author: davsclaus
Date: Mon Jan 17 14:28:52 2011
New Revision: 1059933
URL: http://svn.apache.org/viewvc?rev=1059933&view=rev
Log:
Cut down test times.
Removed:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MyBeanConsumer.java
camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/BeanConsumerIssue.xml
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java Mon Jan 17 14:28:52 2011
@@ -23,6 +23,7 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -39,6 +40,7 @@ public class FileRouteToJmsToFileTest ex
@Test
public void testRouteFileToFile() throws Exception {
deleteDirectory("target/file2file");
+ NotifyBuilder notify = new NotifyBuilder(context).from("activemq:queue:hello").whenDone(1).create();
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -47,8 +49,7 @@ public class FileRouteToJmsToFileTest ex
assertMockEndpointsSatisfied();
- // sleep a little to let the file be written
- Thread.sleep(1000);
+ notify.matchesMockWaitTime();
File file = new File("./target/file2file/out/hello.txt");
file = file.getAbsoluteFile();
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java Mon Jan 17 14:28:52 2011
@@ -47,7 +47,7 @@ public class JmsAutoStartupTest extends
template.sendBody("activemq:queue:foo", "Hello World");
- Thread.sleep(3000);
+ Thread.sleep(2000);
assertMockEndpointsSatisfied();
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java Mon Jan 17 14:28:52 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.jms.t
import org.apache.camel.Channel;
import org.apache.camel.Processor;
import org.apache.camel.Route;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.impl.EventDrivenConsumerRoute;
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.camel.processor.DefaultErrorHandler;
@@ -39,7 +40,6 @@ import org.springframework.context.suppo
*/
public abstract class AbstractTransactionTest extends CamelSpringTestSupport {
-
@After
public void tearDown() throws Exception {
super.tearDown();
@@ -53,15 +53,18 @@ public abstract class AbstractTransactio
}
protected void assertResult() throws InterruptedException {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
template.sendBody("activemq:queue:foo", "blah");
- Thread.sleep(3000L);
+
+ notify.matchesMockWaitTime();
+
assertTrue("Expected only 2 calls to process() (1 failure, 1 success) but encountered "
+ getConditionalExceptionProcessor().getCount() + "."
, getConditionalExceptionProcessor().getCount() == 2);
}
protected ConditionalExceptionProcessor getConditionalExceptionProcessor() {
-
Route route = context.getRoutes().get(0);
assertNotNull(route);
return getConditionalExceptionProcessor(route);
@@ -72,14 +75,10 @@ public abstract class AbstractTransactio
* lets unwrap that and return the actual processor
*/
protected ConditionalExceptionProcessor getConditionalExceptionProcessor(Route route) {
-
- //
// the following is very specific (and brittle) and is not generally
// useful outside these transaction tests (nor intended to be).
- //
EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
- Processor processor = findProcessorByClass(consumerRoute.getProcessor(),
- ConditionalExceptionProcessor.class);
+ Processor processor = findProcessorByClass(consumerRoute.getProcessor(), ConditionalExceptionProcessor.class);
return assertIsInstanceOf(ConditionalExceptionProcessor.class, processor);
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java Mon Jan 17 14:28:52 2011
@@ -43,7 +43,6 @@ public class QueueToProcessorTransaction
@Override
public void configure() throws Exception {
-
Policy required = lookup("PROPAGATION_REQUIRED_POLICY", SpringTransactionPolicy.class);
from("activemq:queue:foo").policy(required).process(new ConditionalExceptionProcessor());
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java Mon Jan 17 14:28:52 2011
@@ -31,8 +31,7 @@ import org.junit.Test;
* Transaction classes can be joined into one.
*/
public class QueueToQueueTransactionTest extends AbstractTransactionTest {
-
-
+
protected int getExpectedRouteCount() {
return 0;
}
@@ -45,7 +44,6 @@ public class QueueToQueueTransactionTest
@Override
public void configure() throws Exception {
-
Policy required = lookup("PROPAGATION_REQUIRED_POLICY", SpringTransactionPolicy.class);
from("activemq:queue:foo?transacted=true").policy(required).process(new ConditionalExceptionProcessor())
.to("activemq:queue:bar?transacted=true");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java?rev=1059933&r1=1059932&r2=1059933&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java Mon Jan 17 14:28:52 2011
@@ -16,16 +16,14 @@
*/
package org.apache.camel.component.jms.tx;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class QueueToQueueTransactionWithoutDefineTransactionManagerTest extends AbstractTransactionTest {
-
-
+
protected int getExpectedRouteCount() {
return 0;
}
@@ -34,28 +32,6 @@ public class QueueToQueueTransactionWith
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml");
}
- @Ignore
- public void xtestRollbackUsingXmlQueueToQueue() throws Exception {
-
- // configure routes and add to camel context
- context.addRoutes(new SpringRouteBuilder() {
-
- @Override
- public void configure() throws Exception {
- errorHandler(noErrorHandler());
- from("activemq:queue:foo?transacted=true").process(new ConditionalExceptionProcessor())
- .to("activemq:queue:bar?transacted=true");
- from("activemq:queue:bar?transacted=true").to("mock:endpoint");
-
- }
- });
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:endpoint");
- endpoint.expectedMessageCount(1);
- endpoint.expectedBodiesReceived("blah");
- assertResult();
- endpoint.assertIsSatisfied();
- }
-
@Test
public void testNoTransactionRollbackUsingXmlQueueToQueue() throws Exception {
@@ -66,18 +42,21 @@ public class QueueToQueueTransactionWith
public void configure() throws Exception {
errorHandler(noErrorHandler());
from("activemq:queue:foo?transacted=false").process(new ConditionalExceptionProcessor())
- .to("activemq:queue:bar?transacted=false");
-
-
+ .to("activemq:queue:bar?transacted=false");
+
+
}
});
-
+
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
template.sendBody("activemq:queue:foo", "blah");
- Thread.sleep(3000L);
+
+ notify.matchesMockWaitTime();
+
assertTrue("Expected only 1 calls to process() (1 failure) but encountered "
+ getConditionalExceptionProcessor().getCount() + "."
, getConditionalExceptionProcessor().getCount() == 1);
-
- }
+ }
}