svn commit: r784769 - in /camel/trunk/components/camel-amqp: pom.xml src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java

[ni...@apache.org]

Author: ningjiang
Date: Mon Jun 15 13:18:24 2009
New Revision: 784769

URL: http://svn.apache.org/viewvc?rev=784769&view=rev
Log:
CAMEL-1712 upgrade camel-amqp to JUnit 4

Modified:
    camel/trunk/components/camel-amqp/pom.xml
    camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java

Modified: camel/trunk/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/pom.xml?rev=784769&r1=784768&r2=784769&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/pom.xml (original)
+++ camel/trunk/components/camel-amqp/pom.xml Mon Jun 15 13:18:24 2009
@@ -77,8 +77,7 @@
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
+      <artifactId>camel-test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -112,6 +111,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=784769&r1=784768&r2=784769&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java (original)
+++ camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java Mon Jun 15 13:18:24 2009
@@ -17,20 +17,44 @@
 package org.apache.camel.component.amqp;
 
 import org.apache.camel.CamelContext;
-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.apache.commons.lang.SerializationUtils;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
 
 /**
  * @version $Revision$
  */
-public class AMQPRouteTest extends ContextTestSupport {
+public class AMQPRouteTest extends CamelTestSupport {
     protected MockEndpoint resultEndpoint;
+    
+    @BeforeClass
+    public static void startBroker() throws Exception {
+        // lets create an in JVM broker
+        try {
+            TransportConnection.createVMBroker(1);
+        } catch (Exception e) {
+            // fails the first time, so create it again
+            TransportConnection.createVMBroker(1);
+        }
+    }
+    
+    @AfterClass
+    public static void shutdownBroker() {
+        TransportConnection.killVMBroker(1);
+    }
+    
 
+    @Test
     public void testJmsRouteWithTextMessage() throws Exception {
         String expectedBody = "Hello there!";
 
@@ -43,6 +67,7 @@
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Test
     public void testJmsRouteWithObjectMessage() throws Exception {
         PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
 
@@ -54,6 +79,7 @@
         resultEndpoint.assertIsSatisfied();
     }
 
+    @Test
     public void testJmsRouteWithByteArrayMessage() throws Exception {
         PurchaseOrder aPO = new PurchaseOrder("Beer", 10);
         byte[] expectedBody = SerializationUtils.serialize(aPO);
@@ -71,26 +97,12 @@
     }
 
 
-    @Override
-    protected void setUp() throws Exception {
-        // lets create an in JVM broker
-        try {
-            TransportConnection.createVMBroker(1);
-        } catch (Exception e) {
-            // fails the first time, so create it again
-            TransportConnection.createVMBroker(1);
-        }
-
+    @Before
+    public void setUp() throws Exception {
         super.setUp();
         resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        TransportConnection.killVMBroker(1);
-    }
-
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();