You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/07/07 10:53:10 UTC

git commit: Polished.

Updated Branches:
  refs/heads/master ad710f1fc -> ba5d6d324


Polished.

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba5d6d32
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba5d6d32
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba5d6d32

Branch: refs/heads/master
Commit: ba5d6d324351d4078b5d57410597038b6294c6c6
Parents: ad710f1
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Jul 7 10:53:03 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Jul 7 10:53:03 2013 +0200

----------------------------------------------------------------------
 .../pojomessage/PojoProxyHelperOneWayTest.java    |  5 ++---
 .../PojoProxyHelperRequestReplyTest.java          |  3 +--
 .../component/avro/AvroConsumerTestSupport.java   |  3 +--
 .../component/avro/AvroProducerTestSupport.java   |  3 +--
 .../BindyComplexKeyValuePairStandaloneTest.java   | 18 ------------------
 .../BindyFixedLengthDelimitedFieldTest.java       |  7 +++----
 .../dynamic/BindyFixedLengthDynamicFieldTest.java |  9 ++++-----
 .../BindySimpleIgnoreTrailingCharsTest.java       |  9 ++++-----
 .../BindySimpleFixedLengthOrdinalPosTest.java     |  9 ++++-----
 .../skipfields/BindySimpleSkipFieldsTest.java     |  9 ++++-----
 ...indyFixedLengthHeaderFooterSkipHeaderTest.java |  7 +++----
 .../cxf/transport/CamelDestinationTest.java       |  5 ++---
 .../CxfMtomDisabledProducerPayloadModeTest.java   |  3 +--
 .../disruptor/BasicDisruptorComponentTest.java    |  7 +++----
 .../MulticastDisruptorComponentTest.java          |  6 +++---
 .../hdfs/integration/HdfsAppendTest.java          |  3 +--
 .../component/jms/temp/JmsReconnectTest.java      |  3 +--
 .../component/mqtt/MQTTConfigurationTest.java     |  9 ++++-----
 .../component/quickfixj/QuickfixjSpringTest.java  |  7 +++----
 .../xpath/XPathLanguageDefaultSettingsTest.java   |  3 +--
 .../camel/language/xpath/XPathLanguageTest.java   |  3 +--
 .../component/snmp/UriConfigurationTest.java      | 18 +++++++++---------
 .../soap/name/ServiceInterfaceStrategyTest.java   |  4 ++--
 ...uageWithSprinPropertyPlaceholderRouteTest.java |  5 ++---
 .../test/blueprint/CamelBlueprintTestSupport.java |  2 +-
 .../camel/test/patterns/AsyncSendMockTest.java    |  3 +--
 .../component/twitter/UriConfigurationTest.java   | 12 ++++++------
 27 files changed, 68 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
index 0ff5614..c62c3fd 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.PojoProxyHelper;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class PojoProxyHelperOneWayTest extends ContextTestSupport {
@@ -42,8 +41,8 @@ public class PojoProxyHelperOneWayTest extends ContextTestSupport {
         sender.onPerson(person);
         
         result.assertIsSatisfied();
-        Assert.assertEquals(1, receiver.receivedPersons.size());
-        Assert.assertEquals(person.getName(), receiver.receivedPersons.get(0).getName());
+        assertEquals(1, receiver.receivedPersons.size());
+        assertEquals(person.getName(), receiver.receivedPersons.get(0).getName());
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
index 94d49e6..9851bce 100644
--- a/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java
@@ -20,7 +20,6 @@ import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.bean.PojoProxyHelper;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class PojoProxyHelperRequestReplyTest extends ContextTestSupport {
@@ -34,7 +33,7 @@ public class PojoProxyHelperRequestReplyTest extends ContextTestSupport {
         PersonHandler sender = PojoProxyHelper.createProxy(personEndpoint, PersonHandler.class);
         
         Person resultPerson = sender.onPerson(person);
-        Assert.assertEquals(person.getName() + "1", resultPerson.getName());
+        assertEquals(person.getName() + "1", resultPerson.getName());
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
index 51216f4..094da2e 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
@@ -29,7 +29,6 @@ import org.apache.camel.avro.generated.Value;
 import org.apache.camel.avro.impl.KeyValueProtocolImpl;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Test;
 
 public abstract class AvroConsumerTestSupport extends AvroTestSupport {
@@ -68,7 +67,7 @@ public abstract class AvroConsumerTestSupport extends AvroTestSupport {
         keyValue.getStore().put(key, value);
         Object[] request = {key};
         Object response = requestor.request("get", request);
-        Assert.assertEquals(value, response);
+        assertEquals(value, response);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
index 03113c6..c029a56 100644
--- a/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
+++ b/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
@@ -28,7 +28,6 @@ import org.apache.camel.avro.generated.Value;
 import org.apache.camel.avro.impl.KeyValueProtocolImpl;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Test;
 
 public abstract class AvroProducerTestSupport extends AvroTestSupport {
@@ -61,7 +60,7 @@ public abstract class AvroProducerTestSupport extends AvroTestSupport {
         Value value = Value.newBuilder().setValue("test value").build();
         Object[] request = {key, value};
         template.sendBodyAndHeader("direct:in", request, AvroConstants.AVRO_MESSAGE_NAME, "put");
-        Assert.assertEquals(value, keyValue.getStore().get(key));
+        assertEquals(value, keyValue.getStore().get(key));
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
index 821ae1a..a5a123e 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
@@ -112,22 +112,4 @@ public class BindyComplexKeyValuePairStandaloneTest {
 
     }
 
-    /*
-     * public List<Map<String, Object>> generateModel() { Map<String, Object>
-     * model = new HashMap<String, Object>(); List<Map<String, Object>> models =
-     * new ArrayList<Map<String, Object>>(); Header header = new Header();
-     * header.setBeginString("FIX 4.1"); header.setBodyLength(20);
-     * header.setMsgSeqNum(1); header.setMsgType("0");
-     * header.setSendCompId("INVMGR"); header.setTargetCompId("BRKR"); Trailer
-     * trailer = new Trailer(); trailer.setCheckSum(220); Order order = new
-     * Order(); order.setAccount("BE.CHM.001"); order.setClOrdId("CHM0001-01");
-     * order.setText("this is a camel - bindy test"); order.setIDSource("4");
-     * order.setSecurityId("BE0001245678"); order.setSide("1");
-     * order.setHeader(header); order.setTrailer(trailer);
-     * model.put(order.getClass().getName(), order);
-     * model.put(header.getClass().getName(), header);
-     * model.put(trailer.getClass().getName(), trailer); models.add(model);
-     * return models; }
-     */
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java
index 442f579..60fbb82 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -69,9 +68,9 @@ public class BindyFixedLengthDelimitedFieldTest extends CamelTestSupport {
         // check the model
         BindyFixedLengthDelimitedFieldTest.Order order = 
             (BindyFixedLengthDelimitedFieldTest.Order) unmarshallResult.getReceivedExchanges().get(0).getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
-        Assert.assertEquals("Pauline", order.getFirstName());
-        Assert.assertEquals("M", order.getLastName());
+        assertEquals(10, order.getOrderNr());
+        assertEquals("Pauline", order.getFirstName());
+        assertEquals("M", order.getLastName());
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
index 57a440f..6fea020 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 
@@ -70,11 +69,11 @@ public class BindyFixedLengthDynamicFieldTest extends CamelTestSupport {
         // check the model
         BindyFixedLengthDynamicFieldTest.Order order = 
             (BindyFixedLengthDynamicFieldTest.Order) unmarshallResult.getReceivedExchanges().get(0).getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
+        assertEquals(10, order.getOrderNr());
         // the field is not trimmed
-        Assert.assertEquals("Pauline", order.getFirstName());
-        Assert.assertEquals("M", order.getLastName());
-        Assert.assertEquals("XD12345678", order.getInstrumentNumber());
+        assertEquals("Pauline", order.getFirstName());
+        assertEquals("M", order.getLastName());
+        assertEquals("XD12345678", order.getInstrumentNumber());
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java
index a062ca0..c817312 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ignoretrailing/BindySimpleIgnoreTrailingCharsTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -64,11 +63,11 @@ public class BindySimpleIgnoreTrailingCharsTest extends CamelTestSupport {
         // check the model
         BindySimpleIgnoreTrailingCharsTest.Order order =
             (BindySimpleIgnoreTrailingCharsTest.Order) unmarshallResult.getReceivedExchanges().get(0).getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
+        assertEquals(10, order.getOrderNr());
         // the field is not trimmed
-        Assert.assertEquals(null, order.getFirstName());
-        Assert.assertEquals("M    ", order.getLastName());
-        Assert.assertEquals("Hello     ", order.getComment());
+        assertEquals(null, order.getFirstName());
+        assertEquals("M    ", order.getLastName());
+        assertEquals("Hello     ", order.getComment());
     }
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
index 099db12..bdff4c6 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 
@@ -70,11 +69,11 @@ public class BindySimpleFixedLengthOrdinalPosTest extends CamelTestSupport {
         // check the model
         BindySimpleFixedLengthOrdinalPosTest.Order order = 
             (BindySimpleFixedLengthOrdinalPosTest.Order) unmarshallResult.getReceivedExchanges().get(0).getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
+        assertEquals(10, order.getOrderNr());
         // the field is not trimmed
-        Assert.assertEquals("  Pauline", order.getFirstName());
-        Assert.assertEquals("M    ", order.getLastName());
-        Assert.assertEquals("Hello     ", order.getComment());
+        assertEquals("  Pauline", order.getFirstName());
+        assertEquals("M    ", order.getLastName());
+        assertEquals("Hello     ", order.getComment());
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
index 6e43a9e..c62e4e0 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipfields/BindySimpleSkipFieldsTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 
@@ -67,11 +66,11 @@ public class BindySimpleSkipFieldsTest extends CamelTestSupport {
         // check the model
         BindySimpleSkipFieldsTest.Order order = 
             (BindySimpleSkipFieldsTest.Order) unmarshallResult.getReceivedExchanges().get(0).getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
+        assertEquals(10, order.getOrderNr());
         // the field is not trimmed
-        Assert.assertEquals(null, order.getFirstName());
-        Assert.assertEquals("M    ", order.getLastName());
-        Assert.assertEquals("Hello     ", order.getComment());
+        assertEquals(null, order.getFirstName());
+        assertEquals("M    ", order.getLastName());
+        assertEquals("Hello     ", order.getComment());
     }
     
     

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
index 5a36946..868718c 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
@@ -34,7 +34,6 @@ import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
 import org.apache.camel.model.dataformat.BindyDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -78,10 +77,10 @@ public class BindyFixedLengthHeaderFooterSkipHeaderTest extends CamelTestSupport
         // check the model
         Exchange exchange = unmarshallResult.getReceivedExchanges().get(0);
         Order order = (Order) exchange.getIn().getBody();
-        Assert.assertEquals(10, order.getOrderNr());
+        assertEquals(10, order.getOrderNr());
         // the field is not trimmed
-        Assert.assertEquals("  Pauline", order.getFirstName());
-        Assert.assertEquals("M    ", order.getLastName());
+        assertEquals("  Pauline", order.getFirstName());
+        assertEquals("M    ", order.getLastName());
         
         Map<String, Object> receivedHeaderMap = 
             (Map<String, Object>) exchange.getIn().getHeader(BindyFixedLengthDataFormat.CAMEL_BINDY_FIXED_LENGTH_HEADER);

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
index c72d546..fa16524 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
@@ -48,7 +48,6 @@ import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.MessageObserver;
 import org.easymock.EasyMock;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class CamelDestinationTest extends CamelTransportTestSupport {
@@ -265,8 +264,8 @@ public class CamelDestinationTest extends CamelTransportTestSupport {
         DefaultExchange exchange = new DefaultExchange(camelContext);
         consumerProcessor.process(exchange);
         Exception exc = exchange.getException();
-        Assert.assertNotNull(exc);
-        Assert.assertEquals(expectedException, exc);
+        assertNotNull(exc);
+        assertEquals(expectedException, exc);
         EasyMock.verify(dest);
     }
     

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
index a7494f0..754c434 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
@@ -70,7 +70,6 @@ public class CxfMtomDisabledProducerPayloadModeTest extends CxfMtomProducerPaylo
         return new MyHelloImpl();
     }
     
-    @SuppressWarnings("unchecked")
     @Override
     public void testProducer() throws Exception {
         if (MtomTestHelper.isAwtHeadless(logger, null)) {
@@ -98,7 +97,7 @@ public class CxfMtomDisabledProducerPayloadModeTest extends CxfMtomProducerPaylo
         
         // process response - verify response attachments
         
-        CxfPayload<SoapHeader> out = exchange.getOut().getBody(CxfPayload.class);
+        CxfPayload<?> out = exchange.getOut().getBody(CxfPayload.class);
         Assert.assertEquals(1, out.getBody().size());
         
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
index eed8241..6f5aa8d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -78,8 +77,8 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
         resultEndpoint.await(20, TimeUnit.SECONDS);
         resultEndpoint.assertIsSatisfied();
 
-        Assert.assertTrue(threadCounter.getThreadIdCount() > 0);
-        Assert.assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
+        assertTrue(threadCounter.getThreadIdCount() > 0);
+        assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
     }
 
     @Test
@@ -101,7 +100,7 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
 
         resultEndpoint.assertIsSatisfied();
 
-        Assert.assertEquals(4, threadCounter.getThreadIdCount());
+        assertEquals(4, threadCounter.getThreadIdCount());
     }
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
index c264244..e9b11ca 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/MulticastDisruptorComponentTest.java
@@ -80,8 +80,8 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
 //        resultEndpoint.await(20, TimeUnit.SECONDS);
 //        resultEndpoint.assertIsSatisfied();
 //
-//        Assert.assertTrue(threadCounter.getThreadIdCount() > 0);
-//        Assert.assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
+//        assertTrue(threadCounter.getThreadIdCount() > 0);
+//        assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
 //    }
 //
 //    @Test
@@ -104,7 +104,7 @@ public class MulticastDisruptorComponentTest extends CamelTestSupport {
 //        System.out.println("count = " + resultEndpoint.getReceivedCounter());
 //        resultEndpoint.assertIsSatisfied();
 //
-//        Assert.assertEquals(4, threadCounter.getThreadIdCount());
+//        assertEquals(4, threadCounter.getThreadIdCount());
 //    }
 //
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
index 57fac15..ab13a66 100644
--- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
+++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsAppendTest.java
@@ -23,7 +23,6 @@ import org.apache.hadoop.fs.FSDataInputStream;
 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;
 
@@ -74,7 +73,7 @@ public class HdfsAppendTest extends CamelTestSupport {
             ret = in.read(buffer);
         }
         ret = in.read(buffer);
-        Assert.assertEquals(-1, ret);
+        assertEquals(-1, ret);
         in.close();
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
index 105c9a9..e7b072c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
@@ -76,8 +76,7 @@ public class JmsReconnectTest {
          * When using Tibco EMS the problem can be recreated. As the broker is
          * external it has to be stopped and started by hand.
          */
-        // TibjmsConnectionFactory connectionFactory = new
-        // TibjmsConnectionFactory();
+        // TibjmsConnectionFactory connectionFactory = new TibjmsConnectionFactory();
         // connectionFactory.setReconnAttemptCount(1);
 
         jmsComponent.setConnectionFactory(connectionFactory);

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
index 2f19e18..6cc0f69 100644
--- a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
+++ b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTConfigurationTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.mqtt;
 
 import org.apache.camel.Endpoint;
 import org.fusesource.mqtt.client.QoS;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class MQTTConfigurationTest extends MQTTBaseTest {
@@ -29,9 +28,9 @@ public class MQTTConfigurationTest extends MQTTBaseTest {
         assertTrue("Endpoint not a MQTTEndpoint: " + endpoint, endpoint instanceof MQTTEndpoint);
         MQTTEndpoint mqttEndpoint = (MQTTEndpoint) endpoint;
 
-        Assert.assertEquals(mqttEndpoint.getConfiguration().getQoS(), QoS.EXACTLY_ONCE);
-        Assert.assertEquals(mqttEndpoint.getConfiguration().getPublishTopicName(), TEST_TOPIC);
-        Assert.assertEquals(mqttEndpoint.getConfiguration().getSubscribeTopicName(), TEST_TOPIC);
-        Assert.assertTrue(mqttEndpoint.getConfiguration().isByDefaultRetain());
+        assertEquals(mqttEndpoint.getConfiguration().getQoS(), QoS.EXACTLY_ONCE);
+        assertEquals(mqttEndpoint.getConfiguration().getPublishTopicName(), TEST_TOPIC);
+        assertEquals(mqttEndpoint.getConfiguration().getSubscribeTopicName(), TEST_TOPIC);
+        assertTrue(mqttEndpoint.getConfiguration().isByDefaultRetain());
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
index 0820a2c..90728b1 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
@@ -20,7 +20,6 @@ import java.util.Properties;
 
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -50,13 +49,13 @@ public class QuickfixjSpringTest extends CamelSpringTestSupport {
         SessionSettings springSessionSettings = configuration.createSessionSettings();
         Properties sessionProperties = springSessionSettings.getSessionProperties(sessionID, true);
 
-        Assert.assertThat(sessionProperties.get("ConnectionType").toString(), CoreMatchers.is("initiator"));
-        Assert.assertThat(sessionProperties.get("SocketConnectProtocol").toString(), CoreMatchers.is("VM_PIPE"));
+        assertThat(sessionProperties.get("ConnectionType").toString(), CoreMatchers.is("initiator"));
+        assertThat(sessionProperties.get("SocketConnectProtocol").toString(), CoreMatchers.is("VM_PIPE"));
 
         QuickfixjComponent component = context.getComponent("quickfix", QuickfixjComponent.class);
         QuickfixjEngine engine = component.getEngines().values().iterator().next();
 
-        Assert.assertThat(engine.getMessageFactory(), is(instanceOf(CustomMessageFactory.class)));
+        assertThat(engine.getMessageFactory(), is(instanceOf(CustomMessageFactory.class)));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
index b7d0f43..46b670b 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.language.xpath;
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.TestSupport;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -36,7 +35,7 @@ public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport {
 
     @Override
     public void setUp() throws Exception {
-        if (!TestSupport.isJavaVendor("ibm")) {
+        if (!isJavaVendor("ibm")) {
             // Force using the JAXP default implementation, because having Saxon in the classpath will automatically make JAXP use it
             // because of Service Provider discovery (this does not happen in OSGi because the META-INF/services package is not exported
             oldPropertyValue = System.setProperty(KEY, "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
index 17a55fc..a433124 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
@@ -20,7 +20,6 @@ import javax.xml.xpath.XPathFactory;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.TestSupport;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
 import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -37,7 +36,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport {
 
     @Override
     public void setUp() throws Exception {
-        if (!TestSupport.isJavaVendor("ibm")) {
+        if (!isJavaVendor("ibm")) {
             // Force using the JAXP default implementation, because having Saxon in the classpath will automatically make JAXP use it
             // because of Service Provider discovery (this does not happen in OSGi because the META-INF/services package is not exported
             oldPropertyValue = System.setProperty(KEY, "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
index 50326fb..e13893c 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
@@ -31,9 +31,9 @@ public class UriConfigurationTest extends Assert {
         assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
         SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
 
-        Assert.assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
-        Assert.assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
-        Assert.assertEquals("udp:0.0.0.0/1662", snmpEndpoint.getAddress());
+        assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
+        assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
+        assertEquals("udp:0.0.0.0/1662", snmpEndpoint.getAddress());
     }
 
     @Test
@@ -42,9 +42,9 @@ public class UriConfigurationTest extends Assert {
         assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
         SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
 
-        Assert.assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
-        Assert.assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
-        Assert.assertEquals("udp:0.0.0.0/162", snmpEndpoint.getAddress());
+        assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
+        assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
+        assertEquals("udp:0.0.0.0/162", snmpEndpoint.getAddress());
     }
 
     @Test
@@ -53,8 +53,8 @@ public class UriConfigurationTest extends Assert {
         assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
         SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
 
-        Assert.assertEquals(SnmpActionType.POLL, snmpEndpoint.getType());
-        Assert.assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
-        Assert.assertEquals("udp:127.0.0.1/1662", snmpEndpoint.getAddress());
+        assertEquals(SnmpActionType.POLL, snmpEndpoint.getType());
+        assertEquals("1.3.6.1.2.1.7.5.1", snmpEndpoint.getOids().get(0).toString());
+        assertEquals("udp:127.0.0.1/1662", snmpEndpoint.getAddress());
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
index ad9ccb3..8c19a99 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
@@ -89,8 +89,8 @@ public class ServiceInterfaceStrategyTest extends Assert {
         ServiceInterfaceStrategy strategy = new ServiceInterfaceStrategy(
                 com.example.customerservice2.CustomerService.class, true);
         QName elName = strategy.findQNameForSoapActionOrType("", com.example.customerservice2.GetCustomersByName.class);
-        Assert.assertEquals("http://customerservice2.example.com/", elName.getNamespaceURI());
-        Assert.assertEquals("getCustomersByName", elName.getLocalPart());
+        assertEquals("http://customerservice2.example.com/", elName.getNamespaceURI());
+        assertEquals("getCustomersByName", elName.getLocalPart());
 
         try {
             elName = strategy.findQNameForSoapActionOrType("test", Class.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
index bb2f904..0f12600 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/placeholder/SimpleLanguageWithSprinPropertyPlaceholderRouteTest.java
@@ -21,7 +21,6 @@ import java.util.Date;
 
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.TestSupport;
 import org.apache.camel.spring.SpringRunWithTestSupport;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -37,8 +36,8 @@ public class SimpleLanguageWithSprinPropertyPlaceholderRouteTest extends SpringR
 
     @Before
     public void setUp() throws Exception {
-        TestSupport.deleteDirectory("target/outBox");
-        TestSupport.deleteDirectory("target/outBoxSimple");
+        deleteDirectory("target/outBox");
+        deleteDirectory("target/outBoxSimple");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index eb970f5..a5ec967 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -135,7 +135,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
             CamelBlueprintHelper.disposeBundleContext(threadLocalBundleContext.get());
             threadLocalBundleContext.remove();
         }
-        CamelTestSupport.tearDownAfterClass();
+        tearDownAfterClass();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
index d200a6f..26df185 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.test.patterns;
 
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class AsyncSendMockTest extends CamelTestSupport {
@@ -40,7 +39,7 @@ public class AsyncSendMockTest extends CamelTestSupport {
             assertMockEndpointsSatisfied();
         } catch (Exception e) {
             e.printStackTrace();
-            Assert.assertTrue("Failed to make async call to api", false);
+            assertTrue("Failed to make async call to api", false);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ba5d6d32/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index 59a8300..9c6d124 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -33,10 +33,10 @@ public class UriConfigurationTest extends Assert {
         assertTrue("Endpoint not a TwitterEndpoint: " + endpoint, endpoint instanceof TwitterEndpoint);
         TwitterEndpoint twitterEndpoint = (TwitterEndpoint) endpoint;
 
-        Assert.assertTrue(!twitterEndpoint.getProperties().getConsumerKey().isEmpty());
-        Assert.assertTrue(!twitterEndpoint.getProperties().getConsumerSecret().isEmpty());
-        Assert.assertTrue(!twitterEndpoint.getProperties().getAccessToken().isEmpty());
-        Assert.assertTrue(!twitterEndpoint.getProperties().getAccessTokenSecret().isEmpty());
+        assertTrue(!twitterEndpoint.getProperties().getConsumerKey().isEmpty());
+        assertTrue(!twitterEndpoint.getProperties().getConsumerSecret().isEmpty());
+        assertTrue(!twitterEndpoint.getProperties().getAccessToken().isEmpty());
+        assertTrue(!twitterEndpoint.getProperties().getAccessTokenSecret().isEmpty());
     }
     
     @Test
@@ -45,7 +45,7 @@ public class UriConfigurationTest extends Assert {
         assertTrue("Endpoint not a TwitterEndpoint: " + endpoint, endpoint instanceof TwitterEndpoint);
         TwitterEndpoint twitterEndpoint = (TwitterEndpoint) endpoint;
 
-        Assert.assertEquals(new Integer(50), twitterEndpoint.getProperties().getCount());
-        Assert.assertEquals(new Integer(2), twitterEndpoint.getProperties().getNumberOfPages());
+        assertEquals(new Integer(50), twitterEndpoint.getProperties().getCount());
+        assertEquals(new Integer(2), twitterEndpoint.getProperties().getNumberOfPages());
     }
 }