camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1437164 - in /camel/branches/camel-2.10.x: ./ camel-core/src/test/java/org/apache/camel/builder/xml/ camel-core/src/test/java/org/apache/camel/component/bean/ components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/ componen...
Date Tue, 22 Jan 2013 21:00:32 GMT
Author: bvahdat
Date: Tue Jan 22 21:00:31 2013
New Revision: 1437164

URL: http://svn.apache.org/viewvc?rev=1437164&view=rev
Log:
Merged revisions 1437158 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1437158 | bvahdat | 2013-01-22 21:52:20 +0100 (Di, 22 Jan 2013) | 1 line
  
  Get rid of the deprecated junit.framework.Assert API.
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
    camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java
    camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
    camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
    camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
    camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java
    camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceSendReceiveTest.java
    camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceTransportSendReceiveTest.java
    camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
    camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
    camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
    camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
    camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
    camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
    camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
    camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java
    camel/branches/camel-2.10.x/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
    camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
    camel/branches/camel-2.10.x/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
    camel/branches/camel-2.10.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
    camel/branches/camel-2.10.x/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
    camel/branches/camel-2.10.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
    camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
    camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1437158

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/builder/xml/ExtractXPathWithNamespaceTest.java Tue Jan 22 21:00:31 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.builder.xml;
 
-import junit.framework.Assert;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -54,7 +52,7 @@ public class ExtractXPathWithNamespaceTe
         template.sendBody("direct:in", "<number xmlns=\"http://acme.com/cake\">55</number>");
 
         mock.assertIsSatisfied();
-        Assert.assertNull(mock.getExchanges().get(0).getIn().getHeader("foo"));
+        assertNull(mock.getExchanges().get(0).getIn().getHeader("foo"));
     }
 
     protected RouteBuilder createRouteBuilder() throws Exception {

Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanImplicitMethodTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.bean;
 
 import javax.naming.Context;
 
-import junit.framework.Assert;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.util.jndi.JndiContext;
@@ -29,11 +28,11 @@ public class BeanImplicitMethodTest exte
 
         String stringBody = "stringBody";
         String stringResponse = (String)template.requestBody("direct:in", stringBody);
-        Assert.assertEquals(stringBody, stringResponse);
+        assertEquals(stringBody, stringResponse);
 
         Integer intBody = 1;
         Integer intResponse = (Integer)template.requestBody("direct:in", intBody); 
-        Assert.assertEquals(1, intResponse.intValue());
+        assertEquals(1, intResponse.intValue());
     }
 
     protected RouteBuilder createRouteBuilder() {

Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoInheritanceTest.java Tue Jan 22 21:00:31 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.bean;
 
-import junit.framework.Assert;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.impl.DefaultExchange;
 
@@ -38,7 +36,7 @@ public class BeanInfoInheritanceTest ext
             assertEquals("process", mi.getMethod().getName());
             assertEquals("Y", mi.getMethod().getDeclaringClass().getSimpleName());
         } catch (AmbiguousMethodCallException e) {
-            Assert.fail("This should not be ambiguous!");
+            fail("This should not be ambiguous!");
         }
     }
 
@@ -54,7 +52,7 @@ public class BeanInfoInheritanceTest ext
             assertEquals("process", mi.getMethod().getName());
             assertEquals("A", mi.getMethod().getDeclaringClass().getSimpleName());
         } catch (AmbiguousMethodCallException e) {
-            Assert.fail("This should not be ambiguous!");
+            fail("This should not be ambiguous!");
         }
     }
 
@@ -66,7 +64,7 @@ public class BeanInfoInheritanceTest ext
 
         try {
             beanInfo.createInvocation(null, exchange);
-            Assert.fail("This should be ambiguous!");
+            fail("This should be ambiguous!");
         } catch (AmbiguousMethodCallException e) {
             // expected (currently not supported in camel)
         }

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java Tue Jan 22 21:00:31 2013
@@ -30,8 +30,6 @@ import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Element;
 
-import junit.framework.Assert;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -98,7 +96,7 @@ public class CxfMtomConsumerPayloadModeT
             CxfPayload<SoapHeader> in = exchange.getIn().getBody(CxfPayload.class);
             
             // verify request
-            Assert.assertEquals(1, in.getBody().size());
+            assertEquals(1, in.getBody().size());
             
             Map<String, String> ns = new HashMap<String, String>();
             ns.put("ns", MtomTestHelper.SERVICE_TYPES_NS);
@@ -109,19 +107,19 @@ public class CxfMtomConsumerPayloadModeT
             Element ele = (Element)xu.getValue("//ns:Detail/ns:photo/xop:Include", body,
                                                XPathConstants.NODE);
             String photoId = ele.getAttribute("href").substring(4); // skip "cid:"
-            Assert.assertEquals(MtomTestHelper.REQ_PHOTO_CID, photoId);
+            assertEquals(MtomTestHelper.REQ_PHOTO_CID, photoId);
 
             ele = (Element)xu.getValue("//ns:Detail/ns:image/xop:Include", body,
                                                XPathConstants.NODE);
             String imageId = ele.getAttribute("href").substring(4); // skip "cid:"
-            Assert.assertEquals(MtomTestHelper.REQ_IMAGE_CID, imageId);
+            assertEquals(MtomTestHelper.REQ_IMAGE_CID, imageId);
 
             DataHandler dr = exchange.getIn().getAttachment(photoId);
-            Assert.assertEquals("application/octet-stream", dr.getContentType());
+            assertEquals("application/octet-stream", dr.getContentType());
             MtomTestHelper.assertEquals(MtomTestHelper.REQ_PHOTO_DATA, IOUtils.readBytesFromStream(dr.getInputStream()));
        
             dr = exchange.getIn().getAttachment(imageId);
-            Assert.assertEquals("image/jpeg", dr.getContentType());
+            assertEquals("image/jpeg", dr.getContentType());
             MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, IOUtils.readBytesFromStream(dr.getInputStream()));
 
             // create response

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java Tue Jan 22 21:00:31 2013
@@ -25,8 +25,6 @@ import javax.mail.util.ByteArrayDataSour
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
-import junit.framework.Assert;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.cxf.CXFTestSupport;
@@ -34,8 +32,10 @@ import org.apache.camel.component.cxf.Cx
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
-import org.springframework.test.context.ContextConfiguration;
 
+import org.junit.Assert;
+
+import org.springframework.test.context.ContextConfiguration;
 
 /**
 * Unit test for exercising SOAP with Attachment (SwA) feature of a CxfConsumer in PAYLOAD mode.  

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java Tue Jan 22 21:00:31 2013
@@ -24,8 +24,6 @@ import javax.xml.ws.Endpoint;
 import javax.xml.ws.Holder;
 import javax.xml.ws.soap.SOAPBinding;
 
-import junit.framework.Assert;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -33,6 +31,7 @@ import org.apache.camel.component.cxf.CX
 
 import org.apache.camel.component.cxf.TestHelper;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java Tue Jan 22 21:00:31 2013
@@ -26,14 +26,13 @@ import javax.xml.ws.Endpoint;
 import javax.xml.ws.Holder;
 import javax.xml.ws.soap.SOAPBinding;
 
-import junit.framework.Assert;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.TestHelper;
 import org.apache.camel.cxf.mtom_feature.Hello;
 import org.apache.camel.cxf.mtom_feature.HelloService;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java Tue Jan 22 21:00:31 2013
@@ -23,10 +23,10 @@ import java.io.IOException;
 import javax.imageio.ImageIO;
 import javax.xml.ws.Holder;
 
-import junit.framework.Assert;
-
 import org.apache.camel.cxf.mtom_feature.Hello;
 
+import org.junit.Assert;
+
 /**
  * Hello Test Impl class
  * @version 

Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java (original)
+++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/MtomTestHelper.java Tue Jan 22 21:00:31 2013
@@ -18,10 +18,9 @@ package org.apache.camel.component.cxf.m
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
 import org.apache.cxf.helpers.IOUtils;
 
+import org.junit.Assert;
 
 /**
  * Package local test helper

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java Tue Jan 22 21:00:31 2013
@@ -19,7 +19,6 @@ package org.apache.camel.component.hdfs;
 import java.io.File;
 import java.util.List;
 
-import junit.framework.Assert;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerFileWriteTest.java Tue Jan 22 21:00:31 2013
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.net.URL;
 import java.nio.ByteBuffer;
 
-import junit.framework.Assert;
 import org.apache.camel.builder.NotifyBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerSplitTest.java Tue Jan 22 21:00:31 2013
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 
-import junit.framework.Assert;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.hadoop.conf.Configuration;
@@ -75,7 +74,7 @@ public class HdfsProducerSplitTest exten
                 in = new URL("file:///" + BASE_FILE.toUri() + "3/" + HdfsConstants.DEFAULT_SEGMENT_PREFIX + i).openStream();
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 IOUtils.copyBytes(in, bos, 4096, false);
-                Assert.assertEquals("CIAO" + i, new String(bos.toByteArray()));
+                assertEquals("CIAO" + i, new String(bos.toByteArray()));
             } finally {
                 IOUtils.closeStream(in);
             }
@@ -108,7 +107,7 @@ public class HdfsProducerSplitTest exten
                 in = new URL("file:///" + BASE_FILE.toUri() + routeNr + '/' + HdfsConstants.DEFAULT_SEGMENT_PREFIX + i).openStream();
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
                 IOUtils.copyBytes(in, bos, 4096, false);
-                Assert.assertEquals("CIAO" + i, new String(bos.toByteArray()));
+                assertEquals("CIAO" + i, new String(bos.toByteArray()));
             } finally {
                 IOUtils.closeStream(in);
             }

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.hdfs;
 
 import java.io.File;
 
-import junit.framework.Assert;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.hadoop.conf.Configuration;
@@ -72,7 +71,7 @@ public class HdfsProducerTest extends Ca
         int i = 0;
         while (reader.next(key, value)) {
             Text txt = (Text) value;
-            Assert.assertTrue(("PAPPO" + i).equals(txt.toString()));
+            assertTrue(("PAPPO" + i).equals(txt.toString()));
             ++i;
         }
     }
@@ -93,7 +92,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         Boolean rBoolean = ((BooleanWritable) value).get();
-        Assert.assertEquals(rBoolean, aBoolean);
+        assertEquals(rBoolean, aBoolean);
     }
 
     @Test
@@ -112,7 +111,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         byte rByte = ((ByteWritable) value).get();
-        Assert.assertEquals(rByte, aByte);
+        assertEquals(rByte, aByte);
     }
 
     @Test
@@ -131,7 +130,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         int rInt = ((IntWritable) value).get();
-        Assert.assertEquals(rInt, anInt);
+        assertEquals(rInt, anInt);
     }
 
     @Test
@@ -150,7 +149,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         float rFloat = ((FloatWritable) value).get();
-        Assert.assertEquals(rFloat, aFloat);
+        assertEquals(rFloat, aFloat, 0.0F);
     }
 
     @Test
@@ -158,7 +157,7 @@ public class HdfsProducerTest extends Ca
         if (SKIP) {
             return;
         }
-        double aDouble = 12.34d;
+        Double aDouble = 12.34D;
         template.sendBody("direct:write_double", aDouble);
         stopCamelContext();
         Configuration conf = new Configuration();
@@ -169,7 +168,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         Double rDouble = ((DoubleWritable) value).get();
-        Assert.assertEquals(rDouble, aDouble);
+        assertEquals(rDouble, aDouble);
     }
 
     @Test
@@ -188,7 +187,7 @@ public class HdfsProducerTest extends Ca
         Writable value = (Writable) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         long rLong = ((LongWritable) value).get();
-        Assert.assertEquals(rLong, aLong);
+        assertEquals(rLong, aLong);
     }
 
     @Test
@@ -207,7 +206,7 @@ public class HdfsProducerTest extends Ca
         Text value = (Text) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
         String rTxt = value.toString();
-        Assert.assertEquals(rTxt, txt);
+        assertEquals(rTxt, txt);
     }
 
     @Test
@@ -226,8 +225,8 @@ public class HdfsProducerTest extends Ca
         Text key = (Text) ReflectionUtils.newInstance(reader.getKeyClass(), conf);
         Text value = (Text) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
-        Assert.assertEquals(key.toString(), txtKey);
-        Assert.assertEquals(value.toString(), txtValue);
+        assertEquals(key.toString(), txtKey);
+        assertEquals(value.toString(), txtValue);
     }
 
     @Test
@@ -246,8 +245,8 @@ public class HdfsProducerTest extends Ca
         Text key = (Text) ReflectionUtils.newInstance(reader.getKeyClass(), conf);
         Text value = (Text) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
-        Assert.assertEquals(key.toString(), txtKey);
-        Assert.assertEquals(value.toString(), txtValue);
+        assertEquals(key.toString(), txtKey);
+        assertEquals(value.toString(), txtValue);
     }
 
     @Test
@@ -264,7 +263,7 @@ public class HdfsProducerTest extends Ca
         ArrayFile.Reader reader = new ArrayFile.Reader(fs1, "file:///" + TEMP_DIR.toUri() + "test-camel-text4", conf);
         Text value = (Text) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(value);
-        Assert.assertEquals(value.toString(), txtValue);
+        assertEquals(value.toString(), txtValue);
     }
 
     @Test
@@ -283,8 +282,8 @@ public class HdfsProducerTest extends Ca
         Text key = (Text) ReflectionUtils.newInstance(reader.getKeyClass(), conf);
         Text value = (Text) ReflectionUtils.newInstance(reader.getValueClass(), conf);
         reader.next(key, value);
-        Assert.assertEquals(key.toString(), txtKey);
-        Assert.assertEquals(value.toString(), txtValue);
+        assertEquals(key.toString(), txtKey);
+        assertEquals(value.toString(), txtValue);
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java Tue Jan 22 21:00:31 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.hdfs.integration;
 
-import junit.framework.Assert;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.hadoop.conf.Configuration;
@@ -24,6 +23,7 @@ import org.apache.hadoop.fs.FSDataInputS
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

Modified: camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.hdfs.
 
 import java.util.List;
 
-import junit.framework.Assert;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -62,7 +61,7 @@ public class HdfsProducerConsumerIntegra
         int i = 0;
         List<Exchange> exchanges = resultEndpoint.getExchanges();
         for (Exchange exchange : exchanges) {
-            Assert.assertEquals("CIAO" + i++, exchange.getIn().getBody(String.class));
+            assertEquals("CIAO" + i++, exchange.getIn().getBody(String.class));
         }
     }
 

Modified: camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java Tue Jan 22 21:00:31 2013
@@ -22,7 +22,6 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
 
-import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
@@ -48,7 +47,7 @@ public class JavaSpaceRequestReplyTest e
         for (int i = 0; i < 100; ++i) {
             req.setPayload("REQUEST " + i);
             Reply reply = proxy.method(req);
-            Assert.assertTrue(reply.getPayload().equals("REPLY for REQUEST " + i));
+            assertTrue(reply.getPayload().equals("REPLY for REQUEST " + i));
         }
         long stop = System.currentTimeMillis();
         System.out.println(stop - start);
@@ -70,7 +69,7 @@ public class JavaSpaceRequestReplyTest e
         }
         int i = 0;
         for (FutureTask<Reply> futureTask : tasks) {
-            Assert.assertTrue(futureTask.get().getPayload().equals("REPLY for REQUEST " + i++));
+            assertTrue(futureTask.get().getPayload().equals("REPLY for REQUEST " + i++));
         }
         long stop = System.currentTimeMillis();
         System.out.println(stop - start);

Modified: camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceSendReceiveTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceSendReceiveTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceSendReceiveTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceSendReceiveTest.java Tue Jan 22 21:00:31 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.javaspace;
 
-import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -78,7 +77,7 @@ public class JavaSpaceSendReceiveTest ex
                         .process(new Processor() {
                             public void process(Exchange exc) throws Exception {
                                 TestEntry msg = exc.getIn().getBody(TestEntry.class);
-                                Assert.assertTrue(msg.id == 1);
+                                assertTrue(msg.id == 1);
                             }
                         }).to("mock:mymock");
             }

Modified: camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceTransportSendReceiveTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceTransportSendReceiveTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceTransportSendReceiveTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceTransportSendReceiveTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.javas
 
 import java.util.concurrent.CountDownLatch;
 
-import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -76,7 +75,7 @@ public class JavaSpaceTransportSendRecei
                         .process(new Processor() {
                             public void process(Exchange exc) throws Exception {
                                 byte[] body = exc.getIn().getBody(byte[].class);
-                                Assert.assertTrue(new String(body).equals("DAVID"));
+                                assertTrue(new String(body).equals("DAVID"));
                                 countLatch.countDown();
                             }
                         });

Modified: camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpGetWithParamTest.java Tue Jan 22 21:00:31 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.jetty;
 
-import junit.framework.Assert;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -67,9 +66,9 @@ public class JettyHttpGetWithParamTest e
     private static class MyParamsProcessor implements Processor {
         public void process(Exchange exchange) throws Exception {
             HttpMessage message = (HttpMessage)exchange.getIn();
-            Assert.assertNotNull(message.getRequest());
-            Assert.assertEquals("uno", message.getRequest().getParameter("one"));
-            Assert.assertEquals("dos", message.getRequest().getParameter("two"));
+            assertNotNull(message.getRequest());
+            assertEquals("uno", message.getRequest().getParameter("one"));
+            assertEquals("dos", message.getRequest().getParameter("two"));
 
             exchange.getOut().setBody("Bye World");
             exchange.getOut().setHeader("one", "eins");

Modified: camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java Tue Jan 22 21:00:31 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.jetty.jettyproducer;
 
-import junit.framework.Assert;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -84,9 +83,9 @@ public class JettyHttpProducerGetWithPar
     private static class MyParamsProcessor implements Processor {
         public void process(Exchange exchange) throws Exception {
             HttpMessage message = (HttpMessage)exchange.getIn();
-            Assert.assertNotNull(message.getRequest());
-            Assert.assertEquals("uno", message.getRequest().getParameter("one"));
-            Assert.assertEquals("dos", message.getRequest().getParameter("two"));
+            assertNotNull(message.getRequest());
+            assertEquals("uno", message.getRequest().getParameter("one"));
+            assertEquals("dos", message.getRequest().getParameter("two"));
 
             exchange.getOut().setBody("Bye World");
             exchange.getOut().setHeader("one", "eins");

Modified: camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java Tue Jan 22 21:00:31 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.jms.temp;
 
-import junit.framework.Assert;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.camel.Produce;
@@ -25,6 +23,7 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.spring.CamelBeanPostProcessor;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

Modified: camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.mina;
 
 import java.nio.charset.Charset;
 
-import junit.framework.Assert;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -96,13 +95,13 @@ public class MinaTransferExchangeOptionT
             public void configure() {
                 from("mina:tcp://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true").process(new Processor() {
                     public void process(Exchange e) throws InterruptedException {
-                        Assert.assertNotNull(e.getIn().getBody());
-                        Assert.assertNotNull(e.getIn().getHeaders());
-                        Assert.assertNotNull(e.getProperties());
-                        Assert.assertEquals("Hello!", e.getIn().getBody());
-                        Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
-                        Assert.assertEquals("old", e.getProperty("ham"));
-                        Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+                        assertNotNull(e.getIn().getBody());
+                        assertNotNull(e.getIn().getHeaders());
+                        assertNotNull(e.getProperties());
+                        assertEquals("Hello!", e.getIn().getBody());
+                        assertEquals("feta", e.getIn().getHeader("cheese"));
+                        assertEquals("old", e.getProperty("ham"));
+                        assertEquals(ExchangePattern.InOut, e.getPattern());
                         Boolean setException = (Boolean) e.getProperty("setException");
 
                         if (setException) {

Modified: camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.mina;
 
 import java.nio.charset.Charset;
 
-import junit.framework.Assert;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -96,13 +95,13 @@ public class MinaVMTransferExchangeOptio
             public void configure() {
                 from("mina:vm://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true").process(new Processor() {
                     public void process(Exchange e) throws InterruptedException {
-                        Assert.assertNotNull(e.getIn().getBody());
-                        Assert.assertNotNull(e.getIn().getHeaders());
-                        Assert.assertNotNull(e.getProperties());
-                        Assert.assertEquals("Hello!", e.getIn().getBody());
-                        Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
-                        Assert.assertEquals("old", e.getProperty("ham"));
-                        Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+                        assertNotNull(e.getIn().getBody());
+                        assertNotNull(e.getIn().getHeaders());
+                        assertNotNull(e.getProperties());
+                        assertEquals("Hello!", e.getIn().getBody());
+                        assertEquals("feta", e.getIn().getHeader("cheese"));
+                        assertEquals("old", e.getProperty("ham"));
+                        assertEquals(ExchangePattern.InOut, e.getPattern());
                         Boolean setException = (Boolean) e.getProperty("setException");
 
                         if (setException) {

Modified: camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.mina2
 
 import java.nio.charset.Charset;
 
-import junit.framework.Assert;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -104,19 +103,19 @@ public class Mina2TransferExchangeOption
 
                     public void process(Exchange e) throws InterruptedException {
                         LOG.debug("Enter Processor...");
-                        Assert.assertNotNull(e.getIn().getBody());
+                        assertNotNull(e.getIn().getBody());
                         LOG.debug("Enter Processor...1");
-                        Assert.assertNotNull(e.getIn().getHeaders());
+                        assertNotNull(e.getIn().getHeaders());
                         LOG.debug("Enter Processor...2");
-                        Assert.assertNotNull(e.getProperties());
+                        assertNotNull(e.getProperties());
                         LOG.debug("Enter Processor...3");
-                        Assert.assertEquals("Hello!", e.getIn().getBody());
+                        assertEquals("Hello!", e.getIn().getBody());
                         LOG.debug("Enter Processor...4");
-                        Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
+                        assertEquals("feta", e.getIn().getHeader("cheese"));
                         LOG.debug("Enter Processor...5");
-                        Assert.assertEquals("old", e.getProperty("ham"));
+                        assertEquals("old", e.getProperty("ham"));
                         LOG.debug("Enter Processor...6");
-                        Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+                        assertEquals(ExchangePattern.InOut, e.getPattern());
                         LOG.debug("Enter Processor...7");
                         Boolean setException = (Boolean) e.getProperty("setException");
 

Modified: camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.mina2
 
 import java.nio.charset.Charset;
 
-import junit.framework.Assert;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -98,13 +97,13 @@ public class Mina2VMTransferExchangeOpti
                 from(String.format("mina2:vm://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort())).process(new Processor() {
 
                     public void process(Exchange e) throws InterruptedException {
-                        Assert.assertNotNull(e.getIn().getBody());
-                        Assert.assertNotNull(e.getIn().getHeaders());
-                        Assert.assertNotNull(e.getProperties());
-                        Assert.assertEquals("Hello!", e.getIn().getBody());
-                        Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
-                        Assert.assertEquals("old", e.getProperty("ham"));
-                        Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+                        assertNotNull(e.getIn().getBody());
+                        assertNotNull(e.getIn().getHeaders());
+                        assertNotNull(e.getProperties());
+                        assertEquals("Hello!", e.getIn().getBody());
+                        assertEquals("feta", e.getIn().getHeader("cheese"));
+                        assertEquals("old", e.getProperty("ham"));
+                        assertEquals(ExchangePattern.InOut, e.getPattern());
                         Boolean setException = (Boolean) e.getProperty("setException");
 
                         if (setException) {

Modified: camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,6 @@ package org.apache.camel.component.netty
 
 import java.nio.charset.Charset;
 
-import junit.framework.Assert;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -94,13 +93,13 @@ public class NettyTransferExchangeOption
             public void configure() {
                 from("netty:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
                     public void process(Exchange e) throws InterruptedException {
-                        Assert.assertNotNull(e.getIn().getBody());
-                        Assert.assertNotNull(e.getIn().getHeaders());
-                        Assert.assertNotNull(e.getProperties());
-                        Assert.assertEquals("Hello!", e.getIn().getBody());
-                        Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
-                        Assert.assertEquals("old", e.getProperty("ham"));
-                        Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+                        assertNotNull(e.getIn().getBody());
+                        assertNotNull(e.getIn().getHeaders());
+                        assertNotNull(e.getProperties());
+                        assertEquals("Hello!", e.getIn().getBody());
+                        assertEquals("feta", e.getIn().getHeader("cheese"));
+                        assertEquals("old", e.getProperty("ham"));
+                        assertEquals(ExchangePattern.InOut, e.getPattern());
                         Boolean setException = (Boolean) e.getProperty("setException");
 
                         if (setException) {

Modified: camel/branches/camel-2.10.x/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java Tue Jan 22 21:00:31 2013
@@ -23,8 +23,6 @@ import java.util.TimeZone;
 
 import javax.naming.Context;
 
-import junit.framework.Assert;
-
 import com.sun.syndication.feed.synd.SyndEntry;
 import com.sun.syndication.feed.synd.SyndFeed;
 
@@ -76,7 +74,7 @@ public class RssEntryPollingConsumerWith
 
         public boolean isAfterDate(Exchange ex) {
             SyndFeed feed = ex.getIn().getBody(SyndFeed.class);
-            Assert.assertTrue(feed.getEntries().size() == 1);
+            assertTrue(feed.getEntries().size() == 1);
             SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
             return entry.getPublishedDate().after(time);     
         }

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java Tue Jan 22 21:00:31 2013
@@ -18,11 +18,10 @@ package org.apache.camel.converter.soap.
 
 import javax.xml.namespace.QName;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.dataformat.soap.name.QNameStrategy;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java Tue Jan 22 21:00:31 2013
@@ -18,11 +18,10 @@ package org.apache.camel.converter.soap.
 
 import javax.xml.namespace.QName;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TypeNameStrategyTest {

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java Tue Jan 22 21:00:31 2013
@@ -18,8 +18,6 @@ package org.apache.camel.dataformat.soap
 
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.Customer;
 import com.example.customerservice.CustomerService;
 import com.example.customerservice.GetCustomersByName;
@@ -45,9 +43,9 @@ public class SoapClientTest extends Came
     public void testRoundTripGetCustomersByName() throws Exception {
         GetCustomersByNameResponse response = customerService.getCustomersByName(new GetCustomersByName());
 
-        Assert.assertEquals(1, response.getReturn().size());
+        assertEquals(1, response.getReturn().size());
         Customer firstCustomer = response.getReturn().get(0);
-        Assert.assertEquals(100000.0, firstCustomer.getRevenue());
+        assertEquals(100000.0, firstCustomer.getRevenue(), 0.0D);
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java Tue Jan 22 21:00:31 2013
@@ -18,8 +18,6 @@ package org.apache.camel.dataformat.soap
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.EndpointInject;
@@ -50,8 +48,8 @@ public class SoapRoundtripTest extends C
         Exchange exchange = resultEndpoint.getExchanges().get(0);
         GetCustomersByName received = exchange.getIn().getBody(
                 GetCustomersByName.class);
-        Assert.assertNotNull(received);
-        Assert.assertEquals("Mueller", received.getName());
+        assertNotNull(received);
+        assertEquals("Mueller", received.getName());
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java Tue Jan 22 21:00:31 2013
@@ -19,8 +19,6 @@ package org.apache.camel.dataformat.soap
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.Produce;
@@ -56,7 +54,7 @@ public class SoapServerTest extends Came
         InputStream responseIs = this.getClass().getResourceAsStream(responseResource);
         Object reply = producer.requestBody(requestIs);
         String replySt = context.getTypeConverter().convertTo(String.class, reply);
-        Assert.assertEquals(TestUtil.readStream(responseIs), replySt);
+        assertEquals(TestUtil.readStream(responseIs), replySt);
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java Tue Jan 22 21:00:31 2013
@@ -18,8 +18,6 @@ package org.apache.camel.dataformat.soap
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.EndpointInject;
@@ -27,6 +25,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java Tue Jan 22 21:00:31 2013
@@ -19,8 +19,6 @@ package org.apache.camel.dataformat.soap
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 
 import org.apache.camel.EndpointInject;
@@ -55,9 +53,9 @@ public class SoapUnMarshalTest extends C
         resultEndpoint.assertIsSatisfied();
         Exchange exchange = resultEndpoint.getExchanges().get(0);
         Object body = exchange.getIn().getBody();
-        Assert.assertEquals(GetCustomersByName.class, body.getClass());
+        assertEquals(GetCustomersByName.class, body.getClass());
         GetCustomersByName request = (GetCustomersByName) body;
-        Assert.assertEquals("Smith", request.getName());
+        assertEquals("Smith", request.getName());
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java Tue Jan 22 21:00:31 2013
@@ -18,14 +18,13 @@ package org.apache.camel.dataformat.soap
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;

Modified: camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java Tue Jan 22 21:00:31 2013
@@ -19,8 +19,6 @@ package org.apache.camel.dataformat.soap
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import com.example.customerservice.GetCustomersByName;
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
@@ -53,9 +51,9 @@ public class Soap12UnMarshalTest extends
         resultEndpoint.assertIsSatisfied();
         Exchange exchange = resultEndpoint.getExchanges().get(0);
         Object body = exchange.getIn().getBody();
-        Assert.assertEquals(GetCustomersByName.class, body.getClass());
+        assertEquals(GetCustomersByName.class, body.getClass());
         GetCustomersByName request = (GetCustomersByName) body;
-        Assert.assertEquals("Smith", request.getName());
+        assertEquals("Smith", request.getName());
     }
 
     @Override

Modified: camel/branches/camel-2.10.x/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java Tue Jan 22 21:00:31 2013
@@ -18,7 +18,7 @@ package org.apache.camel.component.solr;
 
 import java.io.File;
 import java.util.Arrays;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.solr.client.solrj.SolrQuery;

Modified: camel/branches/camel-2.10.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Tue Jan 22 21:00:31 2013
@@ -19,7 +19,6 @@ package org.apache.camel.component.xmpp;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import junit.textui.TestRunner;
 import org.apache.camel.CamelContext;
@@ -95,7 +94,7 @@ public class XmppRouteTest extends TestC
         assertNotNull(receivedExchange);
         XmppMessage receivedMessage = (XmppMessage)receivedExchange.getIn();
 
-        Assert.assertEquals("cheese header", 123, receivedMessage.getHeader("cheese"));
+        assertEquals("cheese header", 123, receivedMessage.getHeader("cheese"));
         Object body = receivedMessage.getBody();
         XmppRouteTest.LOG.debug("Received body: " + body);
         Message xmppMessage = receivedMessage.getXmppMessage();

Modified: camel/branches/camel-2.10.x/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java (original)
+++ camel/branches/camel-2.10.x/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java Tue Jan 22 21:00:31 2013
@@ -19,11 +19,10 @@ package org.apache.camel.example.reporti
 import java.io.File;
 import java.io.FileOutputStream;
 
-import junit.framework.Assert;
-
 import org.apache.camel.spring.Main;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

Modified: camel/branches/camel-2.10.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java (original)
+++ camel/branches/camel-2.10.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java Tue Jan 22 21:00:31 2013
@@ -23,12 +23,11 @@ import javax.servlet.ServletOutputStream
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.Assert;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultMessage;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -38,7 +37,7 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 import static org.ops4j.pax.exam.OptionUtils.combine;
 
 @RunWith(JUnit4TestRunner.class)
-public class HttpTypeConverterTest  extends OSGiIntegrationTestSupport {
+public class HttpTypeConverterTest extends OSGiIntegrationTestSupport {
 
     static HttpServletResponse servletResponse = new HttpServletResponse() {
         public void addCookie(Cookie cookie) {

Modified: camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java (original)
+++ camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java Tue Jan 22 21:00:31 2013
@@ -20,11 +20,11 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.http.HttpOperationFailedException;
 import org.apache.camel.test.AvailablePortFinder;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;

Modified: camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java?rev=1437164&r1=1437163&r2=1437164&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java (original)
+++ camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java Tue Jan 22 21:00:31 2013
@@ -19,10 +19,10 @@ package org.apache.camel.itest.jetty;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.test.AvailablePortFinder;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;



Mime
View raw message