Author: dkulp
Date: Wed Jul 27 16:01:42 2011
New Revision: 1151518
URL: http://svn.apache.org/viewvc?rev=1151518&view=rev
Log:
Move some tests to the JUnit 4 version for CamelTestSupport
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/JaxWsWebFaultAnnotationToFaultTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/JaxWsWebFaultAnnotationToFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/JaxWsWebFaultAnnotationToFaultTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/JaxWsWebFaultAnnotationToFaultTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/JaxWsWebFaultAnnotationToFaultTest.java
Wed Jul 27 16:01:42 2011
@@ -20,7 +20,7 @@ package org.apache.camel.component.cxf;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.PingMeFault;
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
Wed Jul 27 16:01:42 2011
@@ -22,7 +22,9 @@ import org.apache.activemq.ActiveMQConne
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -33,6 +35,7 @@ import static org.apache.camel.component
*/
public class JmsBatchResequencerJMSPriorityTest extends CamelTestSupport {
+ @Test
public void testBatchResequencerJMSPriority() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("G", "A", "B", "E", "H", "C", "D", "F");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
Wed Jul 27 16:01:42 2011
@@ -24,7 +24,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* Tests filtering using Camel Test
@@ -39,6 +41,7 @@ public class JmsFilterTest extends Camel
@Produce(uri = "direct:start")
protected ProducerTemplate template;
+ @Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
@@ -49,6 +52,7 @@ public class JmsFilterTest extends Camel
resultEndpoint.assertIsSatisfied();
}
+ @Test
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
Wed Jul 27 16:01:42 2011
@@ -22,7 +22,9 @@ import org.apache.activemq.ActiveMQConne
import org.apache.camel.CamelContext;
import org.apache.camel.FailedToStartRouteException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -31,6 +33,7 @@ import static org.apache.camel.component
*/
public class JmsMultipleConsumersTest extends CamelTestSupport {
+ @Test
public void testMultipleConsumersAllowed() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -56,6 +59,7 @@ public class JmsMultipleConsumersTest ex
assertMockEndpointsSatisfied();
}
+ @Test
public void testMultipleConsumersNotAllowed() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
Wed Jul 27 16:01:42 2011
@@ -28,7 +28,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
Wed Jul 27 16:01:42 2011
@@ -23,7 +23,9 @@ import javax.jms.DeliveryMode;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -32,6 +34,7 @@ import static org.apache.camel.component
*/
public class JmsRouteDeliveryModePreserveQoSTest extends CamelTestSupport {
+ @Test
public void testSendDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedBodiesReceived("Hello World");
@@ -46,6 +49,7 @@ public class JmsRouteDeliveryModePreserv
assertEquals(DeliveryMode.PERSISTENT, map.get("JMSDeliveryMode"));
}
+ @Test
public void testSendNonPersistent() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedBodiesReceived("Hello World");
@@ -60,6 +64,7 @@ public class JmsRouteDeliveryModePreserv
assertEquals(DeliveryMode.NON_PERSISTENT, map.get("JMSDeliveryMode"));
}
+ @Test
public void testSendNonPersistentAsString() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedBodiesReceived("Hello World");
@@ -74,6 +79,7 @@ public class JmsRouteDeliveryModePreserv
assertEquals(DeliveryMode.NON_PERSISTENT, map.get("JMSDeliveryMode"));
}
+ @Test
public void testSendPersistent() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedBodiesReceived("Hello World");
@@ -88,6 +94,7 @@ public class JmsRouteDeliveryModePreserv
assertEquals(DeliveryMode.PERSISTENT, map.get("JMSDeliveryMode"));
}
+ @Test
public void testSendPersistentAsString() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
mock.expectedBodiesReceived("Hello World");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
Wed Jul 27 16:01:42 2011
@@ -37,7 +37,10 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Before;
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -310,32 +313,38 @@ public class JmsRouteRequestReplyTest ex
}
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
init();
super.setUp();
}
+ @Test
public void testUseMessageIDAsCorrelationID() throws Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseCorrelationID() throws Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseMessageIDAsCorrelationIDMultiNode() throws Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseCorrelationIDMultiNode() throws Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseMessageIDAsCorrelationIDPersistReplyToMultiNode()
throws Exception {
runRequestReplyThreaded(endpointReplyToUriA);
}
+ @Test
public void testUseCorrelationIDPersistReplyToMultiNode() throws Exception
{
runRequestReplyThreaded(endpointUriA);
}
@@ -348,6 +357,7 @@ public class JmsRouteRequestReplyTest ex
// for a faster way to do this. Note however that in this case the message
copy has to occur
// between consumer -> producer as the selector value needs to be
propagated to the ultimate
// destination, which in turn will copy this value back into the reply
message
+ @Test
public void testUseMessageIDAsCorrelationIDPersistMultiReplyToMultiNode()
throws Exception {
int oldMaxTasks = maxTasks;
int oldMaxServerTasks = maxServerTasks;
@@ -367,6 +377,7 @@ public class JmsRouteRequestReplyTest ex
}
// see (1)
+ @Test
public void testUseCorrelationIDPersistMultiReplyToMultiNode() throws
Exception {
int oldMaxTasks = maxTasks;
int oldMaxServerTasks = maxServerTasks;
@@ -385,14 +396,17 @@ public class JmsRouteRequestReplyTest ex
}
}
+ @Test
public void
testUseMessageIDAsCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode()
throws Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void
testUseCorrelationIDPersistMultiReplyToWithNamedSelectorMultiNode() throws
Exception {
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseCorrelationIDTimeout() throws Exception {
JmsComponent c = (JmsComponent)context.getComponent(componentName);
c.getConfiguration().setRequestTimeout(1000);
@@ -407,6 +421,7 @@ public class JmsRouteRequestReplyTest ex
assertEquals("", reply);
}
+ @Test
public void testUseMessageIDAsCorrelationIDTimeout() throws Exception {
JmsComponent c = (JmsComponent)context.getComponent(componentName);
c.getConfiguration().setRequestTimeout(1000);
@@ -421,10 +436,12 @@ public class JmsRouteRequestReplyTest ex
assertEquals("", reply);
}
+ @Test
public void testUseCorrelationIDMultiNodeDiffComponents() throws Exception
{
runRequestReplyThreaded(endpointUriA);
}
+ @Test
public void testUseMessageIDAsCorrelationIDMultiNodeDiffComponents()
throws Exception {
runRequestReplyThreaded(endpointUriA);
}
@@ -455,10 +472,10 @@ public class JmsRouteRequestReplyTest ex
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- return contextBuilders.get(getName()).buildContext(camelContext);
+ return
contextBuilders.get(testName.getMethodName()).buildContext(camelContext);
}
protected RouteBuilder createRouteBuilder() throws Exception {
- return routeBuilders.get(getName());
+ return routeBuilders.get(testName.getMethodName());
}
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -36,6 +38,7 @@ public class JmsGetHeaderKeyFormatIssueT
private String uri = "activemq:queue:hello?jmsKeyFormatStrategy=default";
+ @Test
public void testSendWithHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -40,6 +42,7 @@ public class JmsGetHeaderKeyFormatIssueW
private String uri = "activemq:queue:hello?jmsKeyFormatStrategy=default";
+ @Test
public void testSendWithHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateMessageTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -36,6 +38,7 @@ public class JmsMutateMessageTest extend
private String uri = "activemq:queue:hello";
+ @Test
public void testMutateMessage() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMutateRemoveHeaderMessageTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -36,6 +38,7 @@ public class JmsMutateRemoveHeaderMessag
private String uri = "activemq:queue:hello";
+ @Test
public void testMutateMessage() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -36,6 +38,7 @@ public class JmsPassThroughtJmsKeyFormat
private String uri =
"activemq:queue:hello?jmsKeyFormatStrategy=passthrough";
+ @Test
public void testSendWithHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
Wed Jul 27 16:01:42 2011
@@ -25,7 +25,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -36,6 +38,7 @@ public class JmsPassThroughtJmsKeyFormat
private String uri =
"activemq:queue:hello?jmsKeyFormatStrategy=passthrough";
+ @Test
public void testSendWithHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
Wed Jul 27 16:01:42 2011
@@ -27,7 +27,9 @@ import org.apache.camel.component.jms.Ca
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.PassThroughJmsKeyFormatStrategy;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -38,6 +40,7 @@ public class JmsPassThroughtJmsKeyFormat
private String uri = "activemq:queue:hello";
+ @Test
public void testSendWithHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tuning/PerformanceRoutePojoTest.java
Wed Jul 27 16:01:42 2011
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jms.tuning;
-import org.apache.camel.test.CamelSpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.Ignore;
import org.junit.Test;
@@ -62,10 +62,4 @@ public class PerformanceRoutePojoTest ex
System.out.println("RoutePerformancePojoTest: Sent: " + size + " Took:
" + delta + " ms");
}
- @Override
- protected boolean canRunOnThisPlatform() {
- String os = System.getProperty("os.name");
- // HP-UX is just to slow to run this test
- return !os.toLowerCase().contains("hp-ux");
- }
}
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
Wed Jul 27 16:01:42 2011
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* @version
@@ -42,6 +44,7 @@ public class DebugNoLazyTypeConverterTes
}
// END SNIPPET: e1
+ @Test
public void testDebugger() throws Exception {
// set mock expectations
getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -54,6 +57,7 @@ public class DebugNoLazyTypeConverterTes
assertMockEndpointsSatisfied();
}
+ @Test
public void testTwo() throws Exception {
// set mock expectations
getMockEndpoint("mock:a").expectedMessageCount(2);
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
Wed Jul 27 16:01:42 2011
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* @version
@@ -37,6 +39,7 @@ public class DebugTest extends CamelTest
}
// END SNIPPET: e1
+ @Test
public void testDebugger() throws Exception {
// set mock expectations
getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -49,6 +52,7 @@ public class DebugTest extends CamelTest
assertMockEndpointsSatisfied();
}
+ @Test
public void testTwo() throws Exception {
// set mock expectations
getMockEndpoint("mock:a").expectedMessageCount(2);
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Wed Jul 27 16:01:42 2011
@@ -21,7 +21,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* Tests filtering using Camel Test
@@ -37,6 +39,7 @@ public class FilterTest extends CamelTes
@Produce(uri = "direct:start")
protected ProducerTemplate template;
+ @Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
@@ -47,6 +50,7 @@ public class FilterTest extends CamelTes
resultEndpoint.assertIsSatisfied();
}
+ @Test
public void testSendNotMatchingMessage() throws Exception {
resultEndpoint.expectedMessageCount(0);
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java?rev=1151518&r1=1151517&r2=1151518&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
Wed Jul 27 16:01:42 2011
@@ -17,7 +17,9 @@
package org.apache.camel.test.patterns;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* @version
@@ -28,7 +30,8 @@ public class IsMockEndpointsTest extends
public String isMockEndpoints() {
return "*";
}
-
+
+ @Test
public void testMockAllEndpoints() throws Exception {
getMockEndpoint("mock:direct:start").expectedBodiesReceived("Hello
World");
getMockEndpoint("mock:direct:foo").expectedBodiesReceived("Hello
World");
