svn commit: r785888 - in /camel/trunk/components/camel-saxon: ./ src/test/java/org/apache/camel/builder/saxon/ src/test/java/org/apache/camel/component/xquery/

[ni...@apache.org]

Author: ningjiang
Date: Thu Jun 18 03:39:19 2009
New Revision: 785888

URL: http://svn.apache.org/viewvc?rev=785888&view=rev
Log:
CAMEL-1712 Upgraded the camel-saxon to JUnit4

Modified:
    camel/trunk/components/camel-saxon/pom.xml
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java

Modified: camel/trunk/components/camel-saxon/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/pom.xml?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/pom.xml (original)
+++ camel/trunk/components/camel-saxon/pom.xml Thu Jun 18 03:39:19 2009
@@ -66,6 +66,11 @@
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>      
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java Thu Jun 18 03:39:19 2009
@@ -18,21 +18,23 @@
 
 import javax.naming.Context;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.xquery.XQuery;
 import org.apache.camel.processor.BeanRouteTest;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.jndi.JndiContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class BeanWithXQueryInjectionTest extends ContextTestSupport {
-    private static final transient Log LOG = LogFactory.getLog(BeanRouteTest.class);
+public class BeanWithXQueryInjectionTest extends CamelTestSupport {
+    private static final transient Log LOG = LogFactory.getLog(BeanWithXQueryInjectionTest.class);
     protected MyBean myBean = new MyBean();
 
+    @Test
     public void testSendMessage() throws Exception {
         String expectedBody = "<foo id='bar'>hellow</foo>";
 

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java Thu Jun 18 03:39:19 2009
@@ -16,19 +16,22 @@
  */
 package org.apache.camel.builder.saxon;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XQueryFilterTest extends ContextTestSupport {
+public class XQueryFilterTest extends CamelTestSupport {
 
     protected Endpoint startEndpoint;
     protected MockEndpoint resultEndpoint;
 
+    @Test
     public void testSendMatchingMessage() throws Exception {
         resultEndpoint.expectedMessageCount(1);
 
@@ -37,6 +40,7 @@
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Test
     public void testSendNotMatchingMessage() throws Exception {
         resultEndpoint.expectedMessageCount(0);
 
@@ -47,7 +51,8 @@
     }
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
 
         startEndpoint = resolveMandatoryEndpoint("direct:start");

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java Thu Jun 18 03:39:19 2009
@@ -16,18 +16,21 @@
  */
 package org.apache.camel.builder.saxon;
 
-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.Before;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XQueryRecipientListTest extends ContextTestSupport {
+public class XQueryRecipientListTest extends CamelTestSupport {
 
     protected MockEndpoint londonEndpoint;
     protected MockEndpoint tampaEndpoint;
 
+    @Test
     public void testSendLondonMessage() throws Exception {
         londonEndpoint.expectedMessageCount(1);
         tampaEndpoint.expectedMessageCount(0);
@@ -37,6 +40,7 @@
         assertMockEndpointsSatisfied();
     }
 
+    @Test
     public void testSendTampaMessage() throws Exception {
         londonEndpoint.expectedMessageCount(0);
         tampaEndpoint.expectedMessageCount(1);
@@ -47,7 +51,8 @@
     }
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
 
         londonEndpoint = getMockEndpoint("mock:foo.London");

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java Thu Jun 18 03:39:19 2009
@@ -23,6 +23,8 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
+import org.junit.Assert;
+import org.junit.Test;
 
 import static org.apache.camel.component.xquery.XQueryBuilder.xquery;
 import static org.apache.camel.util.ObjectHelper.className;
@@ -30,7 +32,8 @@
 /**
  * @version $Revision$
  */
-public class XQueryTest extends TestCase {
+public class XQueryTest extends Assert {
+    @Test
     public void testXQuery() throws Exception {
         Exchange exchange = new DefaultExchange(new DefaultCamelContext());
         exchange.getIn().setBody("<products><product type='food'><pizza/></product><product type='beer'><stella/></product></products>");

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java Thu Jun 18 03:39:19 2009
@@ -16,19 +16,22 @@
  */
 package org.apache.camel.builder.saxon;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XQueryTransformTest extends ContextTestSupport {
+public class XQueryTransformTest extends CamelTestSupport {
 
     protected Endpoint startEndpoint;
     protected MockEndpoint resultEndpoint;
 
+    @Test
     public void testSendMatchingMessage() throws Exception {
         // saxon converts all quotes to "
         resultEndpoint.expectedBodiesReceived("<person name=\"Jonathan\"/>");
@@ -39,7 +42,8 @@
     }
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
 
         startEndpoint = resolveMandatoryEndpoint("direct:start");

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java Thu Jun 18 03:39:19 2009
@@ -16,19 +16,22 @@
  */
 package org.apache.camel.builder.saxon;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.builder.xml.Namespaces;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class XQueryWithNamespacesFilterTest extends ContextTestSupport {
+public class XQueryWithNamespacesFilterTest extends CamelTestSupport {
     protected Endpoint startEndpoint;
     protected MockEndpoint resultEndpoint;
 
+    @Test
     public void testSendMatchingMessage() throws Exception {
         resultEndpoint.expectedMessageCount(1);
 
@@ -37,6 +40,7 @@
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Test
     public void testSendNotMatchingMessage() throws Exception {
         resultEndpoint.expectedMessageCount(0);
 
@@ -46,7 +50,8 @@
     }
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
 
         startEndpoint = resolveMandatoryEndpoint("direct:start");

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java Thu Jun 18 03:39:19 2009
@@ -18,18 +18,20 @@
 
 import java.util.Random;
 
-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;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 /**
  * Concurrency test of XQuery using transform.xquery DSL.
  */
-public class XQueryConcurrencyTest extends ContextTestSupport {
+public class XQueryConcurrencyTest extends CamelTestSupport {
 
     private String uri = "seda:in?concurrentConsumers=5";
 
+    @Test
     public void testConcurrency() throws Exception {
         int total = 1000;
 

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java Thu Jun 18 03:39:19 2009
@@ -20,14 +20,16 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$
  */
-public class XQueryEndpointTest extends SpringTestSupport {
+public class XQueryEndpointTest extends CamelSpringTestSupport {
 
+    @Test
     public void testSendMessageAndHaveItTransformed() throws Exception {
         MockEndpoint endpoint = getMockEndpoint("mock:result");
         endpoint.expectedMessageCount(1);

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java Thu Jun 18 03:39:19 2009
@@ -17,14 +17,16 @@
 package org.apache.camel.component.xquery;
 
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$
  */
-public class XQueryExampleTest extends SpringTestSupport {
+public class XQueryExampleTest extends CamelSpringTestSupport {
 
+    @Test
     public void testExample() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("<employee id=\"James\"><name><firstName>James</firstName>"

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java Thu Jun 18 03:39:19 2009
@@ -16,15 +16,17 @@
  */
 package org.apache.camel.component.xquery;
 
-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;
 
 /**
  * Unit test to verify that headers can be propogated through this component.
  */
-public class XQueryPropogateHeadersTest extends ContextTestSupport {
+public class XQueryPropogateHeadersTest extends CamelTestSupport {
 
+    @Test
     public void testPropogateHeadersTest() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
@@ -38,6 +40,7 @@
         assertMockEndpointsSatisfied();
     }
 
+    @Test
     public void testPropogateHeadersUsingTransform() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
@@ -50,6 +53,7 @@
         assertMockEndpointsSatisfied();
     }
 
+    @Test
     public void testPropogateHeadersUsingSetBody() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java Thu Jun 18 03:39:19 2009
@@ -18,18 +18,20 @@
 
 import java.util.Random;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.DeadLetterChannelBuilder;
 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.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 /**
  * Concurrency test of XQuery using classpath resources (to).
  */
-public class XQueryURLBasedConcurrencyTest extends ContextTestSupport {
+public class XQueryURLBasedConcurrencyTest extends CamelTestSupport {
 
+    @Test
     public void testConcurrency() throws Exception {
         int total = 1000;
 

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java?rev=785888&r1=785887&r2=785888&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java Thu Jun 18 03:39:19 2009
@@ -17,16 +17,19 @@
 package org.apache.camel.component.xquery;
 
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$
  */
-public class XQueryWithExplicitTypeTest extends SpringTestSupport {
+public class XQueryWithExplicitTypeTest extends CamelSpringTestSupport {
     protected MockEndpoint raleighEndpoint;
     protected MockEndpoint tampaEndpoint;
 
+    @Test
     public void testFunctions() throws Exception {
         raleighEndpoint.expectedMessageCount(1);
         tampaEndpoint.expectedMessageCount(0);
@@ -37,7 +40,8 @@
     }
 
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
 
         raleighEndpoint = getMockEndpoint("mock:foo.Raleigh");