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 2012/01/24 07:05:24 UTC
svn commit: r1235134 - in /camel/trunk/components/camel-test/src:
main/java/org/apache/camel/test/junit4/
test/java/org/apache/camel/test/patterns/
Author: davsclaus
Date: Tue Jan 24 06:05:23 2012
New Revision: 1235134
URL: http://svn.apache.org/viewvc?rev=1235134&view=rev
Log:
CAMEL-4933: CamelTestSupport should not have Spring JAR dependency.
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.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/FilterCreateCamelContextPerClassTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1235134&r1=1235133&r2=1235134&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java Tue Jan 24 06:05:23 2012
@@ -26,6 +26,7 @@ import org.apache.camel.Route;
import org.apache.camel.impl.DefaultPackageScanClassResolver;
import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
import org.apache.camel.impl.scan.InvertingPackageScanFilter;
+import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
@@ -48,15 +49,22 @@ public abstract class CamelSpringTestSup
protected abstract AbstractApplicationContext createApplicationContext();
+ /**
+ * Lets post process this test instance to process any Camel annotations.
+ * Note that using Spring Test or Guice is a more powerful approach.
+ */
@Override
public void postProcessTest() throws Exception {
super.postProcessTest();
if (isCreateCamelContextPerClass()) {
applicationContext = threadAppContext.get();
}
+
+ CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
+ processor.setCamelContext(context);
+ processor.postProcessBeforeInitialization(this, "this");
}
-
@Override
public void doPreSetup() throws Exception {
if (!"true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"))) {
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=1235134&r1=1235133&r2=1235134&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java Tue Jan 24 06:05:23 2012
@@ -45,7 +45,6 @@ import org.apache.camel.management.JmxSy
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.Language;
-import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
import org.junit.After;
@@ -344,19 +343,11 @@ public abstract class CamelTestSupport e
return true;
}
- /**
- * Lets post process this test instance to process any Camel annotations.
- * Note that using Spring Test or Guice is a more powerful approach.
- */
protected void postProcessTest() throws Exception {
context = threadCamelContext.get();
template = threadTemplate.get();
consumer = threadConsumer.get();
camelContextService = threadService.get();
-
- CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
- processor.setCamelContext(context);
- processor.postProcessBeforeInitialization(this, "this");
}
protected void stopCamelContext() throws Exception {
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=1235134&r1=1235133&r2=1235134&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 Tue Jan 24 06:05:23 2012
@@ -20,9 +20,7 @@ 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.junit4.CamelTestSupport;
-
-import org.junit.Test;
+import org.apache.camel.test.CamelTestSupport;
/**
* @version
@@ -45,7 +43,6 @@ public class DebugTest extends CamelTest
}
// END SNIPPET: e1
- @Test
public void testDebugger() throws Exception {
// set mock expectations
getMockEndpoint("mock:a").expectedMessageCount(1);
@@ -58,7 +55,6 @@ 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/FilterCreateCamelContextPerClassTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java?rev=1235134&r1=1235133&r2=1235134&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java Tue Jan 24 06:05:23 2012
@@ -16,11 +16,7 @@
*/
package org.apache.camel.test.patterns;
-import org.apache.camel.EndpointInject;
-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.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,12 +28,6 @@ import org.junit.Test;
// START SNIPPET: example
public class FilterCreateCamelContextPerClassTest extends CamelTestSupport {
- @EndpointInject(uri = "mock:result")
- protected MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
-
@Override
public boolean isCreateCamelContextPerClass() {
// we override this method and return true, to tell Camel test-kit that
@@ -50,20 +40,20 @@ public class FilterCreateCamelContextPer
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
- resultEndpoint.expectedBodiesReceived(expectedBody);
+ getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody);
- template.sendBodyAndHeader(expectedBody, "foo", "bar");
+ template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
@Test
public void testSendNotMatchingMessage() throws Exception {
- resultEndpoint.expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
- template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue");
+ template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java?rev=1235134&r1=1235133&r2=1235134&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java Tue Jan 24 06:05:23 2012
@@ -16,11 +16,7 @@
*/
package org.apache.camel.test.patterns;
-import org.apache.camel.EndpointInject;
-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.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,30 +28,24 @@ import org.junit.Test;
// START SNIPPET: example
public class FilterJUnit4Test extends CamelTestSupport {
- @EndpointInject(uri = "mock:result")
- protected MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
-
@Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
- resultEndpoint.expectedBodiesReceived(expectedBody);
+ getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody);
- template.sendBodyAndHeader(expectedBody, "foo", "bar");
+ template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
@Test
public void testSendNotMatchingMessage() throws Exception {
- resultEndpoint.expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
- template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue");
+ template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
@Override
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=1235134&r1=1235133&r2=1235134&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 Tue Jan 24 06:05:23 2012
@@ -16,14 +16,8 @@
*/
package org.apache.camel.test.patterns;
-import org.apache.camel.EndpointInject;
-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.junit4.CamelTestSupport;
-
-import org.junit.Test;
+import org.apache.camel.test.CamelTestSupport;
/**
* Tests filtering using Camel Test
@@ -33,30 +27,22 @@ import org.junit.Test;
// START SNIPPET: example
public class FilterTest extends CamelTestSupport {
- @EndpointInject(uri = "mock:result")
- protected MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
-
- @Test
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
- resultEndpoint.expectedBodiesReceived(expectedBody);
+ getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody);
- template.sendBodyAndHeader(expectedBody, "foo", "bar");
+ template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
- @Test
public void testSendNotMatchingMessage() throws Exception {
- resultEndpoint.expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
- template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue");
+ template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- resultEndpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
}
@Override