Repository: camel Updated Branches: refs/heads/master 295ca64e3 -> 3288b3081
CAMEL-9708: Multiple tests not using equality predicate correctly Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3288b308 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3288b308 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3288b308 Branch: refs/heads/master Commit: 3288b308149b9857d2b2f1bb04390bb2b57b675d Parents: 295ca64 Author: Jaroslaw Strzelecki <jarek.strzele...@gmail.com> Authored: Tue Mar 15 12:55:23 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 15 13:49:13 2016 +0100 ---------------------------------------------------------------------- .../bean/BeanPrivateClassWithInterfaceMethodTest.java | 4 ++-- .../test/java/org/apache/camel/issues/DavidSiefertTest.java | 2 +- .../test/java/org/apache/camel/processor/ClaimCheckTest.java | 2 +- .../src/test/java/org/apache/camel/processor/DetourTest.java | 6 +++--- .../dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java | 2 +- .../camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java | 2 +- .../org/apache/camel/component/boon/BoonDataFormatTest.java | 8 ++++---- .../castor/MarshalWithMappingDomainObjectTest.java | 2 +- .../camel/component/gson/GsonMarshalExclusionTest.java | 4 ++-- .../org/apache/camel/component/gson/GsonMarshalListTest.java | 2 +- .../org/apache/camel/component/gson/GsonMarshalTest.java | 4 ++-- .../camel/component/gson/SpringGsonJsonDataFormatTest.java | 4 ++-- .../apache/camel/component/jackson/JacksonBindingTest.java | 2 +- .../camel/component/jackson/JacksonJAXBAnnotationTest.java | 2 +- .../apache/camel/component/jackson/JacksonMarshalTest.java | 6 +++--- .../camel/component/jackson/JacksonMarshalViewTest.java | 4 ++-- .../camel/component/jackson/JacksonNameBindingTest.java | 2 +- .../component/jackson/SpringJacksonJsonDataFormatTest.java | 8 ++++---- .../camel/component/jacksonxml/JacksonBindingTest.java | 2 +- .../component/jacksonxml/JacksonJAXBAnnotationTest.java | 2 +- .../camel/component/jacksonxml/JacksonMarshalTest.java | 6 +++--- .../camel/component/jacksonxml/JacksonMarshalViewTest.java | 4 ++-- .../camel/component/jacksonxml/JacksonNameBindingTest.java | 2 +- .../jacksonxml/SpringJacksonJsonDataFormatTest.java | 8 ++++---- .../mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java | 4 ++-- .../MyBatisSelectOneWithInputAndOutputHeaderTest.java | 4 ++-- .../component/netty4/NettyUDPByteArrayConsumerTest.java | 2 +- .../protobuf/ProtobufMarshalAndUnmarshallTest.java | 2 +- .../component/snakeyaml/SnakeYAMLMarshalTestHelper.java | 2 +- .../dataformat/xstream/MarshalDomainObjectJSONTest.java | 2 +- .../camel/dataformat/xstream/MarshalDomainObjectTest.java | 2 +- .../apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java | 2 +- .../src/test/java/__name__DataFormatTest.java | 2 +- 33 files changed, 56 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java index b51727d..b43e7df 100644 --- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanPrivateClassWithInterfaceMethodTest.java @@ -40,7 +40,7 @@ public final class BeanPrivateClassWithInterfaceMethodTest extends ContextTestSu public void testPackagePrivateClassBinding() throws InterruptedException { MockEndpoint mockResult = getMockEndpoint("mock:packagePrivateClassResult"); mockResult.setExpectedMessageCount(1); - mockResult.message(0).body().equals(EXPECTED_OUTPUT); + mockResult.message(0).body().isEqualTo(EXPECTED_OUTPUT); template.sendBody("direct:testPackagePrivateClass", INPUT_BODY); @@ -51,7 +51,7 @@ public final class BeanPrivateClassWithInterfaceMethodTest extends ContextTestSu public void testPrivateClassBinding() throws InterruptedException { MockEndpoint mockResult = getMockEndpoint("mock:privateClassResult"); mockResult.setExpectedMessageCount(1); - mockResult.message(0).body().equals(EXPECTED_OUTPUT); + mockResult.message(0).body().isEqualTo(EXPECTED_OUTPUT); template.sendBody("direct:testPrivateClass", INPUT_BODY); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java b/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java index 51a2edd..be65f7e 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java @@ -33,7 +33,7 @@ public class DavidSiefertTest extends ContextTestSupport { MockEndpoint result = getMockEndpoint("mock:result"); result.expectedMessageCount(1); result.expectedBodiesReceived(expectedBody); - result.message(0).header("sample.name").equals("myValue"); + result.message(0).header("sample.name").isEqualTo("myValue"); template.sendBody("direct:start", "<sample><name>value</name></sample>"); result.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java b/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java index ccaf35b..31931bd 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java @@ -39,7 +39,7 @@ public class ClaimCheckTest extends ContextTestSupport { // check to make sure the message body gets added back in properly MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); resultEndpoint.expectedMessageCount(1); - resultEndpoint.message(0).body().equals(body); + resultEndpoint.message(0).body().isEqualTo(body); // check to make sure the claim check is added to the message and // the body is removed http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java b/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java index e41bedf..e0c3fff 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DetourTest.java @@ -31,11 +31,11 @@ public class DetourTest extends ContextTestSupport { MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); resultEndpoint.expectedMessageCount(1); - resultEndpoint.message(0).body().equals(BODY); + resultEndpoint.message(0).body().isEqualTo(BODY); MockEndpoint detourEndpoint = getMockEndpoint("mock:detour"); detourEndpoint.expectedMessageCount(1); - detourEndpoint.message(0).body().equals(BODY); + detourEndpoint.message(0).body().isEqualTo(BODY); template.sendBody("direct:start", BODY); @@ -47,7 +47,7 @@ public class DetourTest extends ContextTestSupport { MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); resultEndpoint.expectedMessageCount(1); - resultEndpoint.message(0).body().equals(BODY); + resultEndpoint.message(0).body().isEqualTo(BODY); MockEndpoint detourEndpoint = getMockEndpoint("mock:detour"); detourEndpoint.expectedMessageCount(0); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java ---------------------------------------------------------------------- diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java index 8138b65..7ff9511 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroGenericMarshaAndUnmarshaTest.java @@ -51,7 +51,7 @@ public class AvroGenericMarshaAndUnmarshaTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(GenericRecord.class); - mock.message(0).body().equals(input); + mock.message(0).body().isEqualTo(input); Object marshalled = template.requestBody(inURI, input); template.sendBody(outURI, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java ---------------------------------------------------------------------- diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java index 8278384..6ca4deb 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java @@ -64,7 +64,7 @@ public class AvroMarshalAndUnmarshallTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Value.class); - mock.message(0).body().equals(input); + mock.message(0).body().isEqualTo(input); Object marshalled = template.requestBody(inURI, input); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java b/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java index cf58df0..8f4c6b5 100644 --- a/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java +++ b/components/camel-boon/src/test/java/org/apache/camel/component/boon/BoonDataFormatTest.java @@ -37,7 +37,7 @@ public class BoonDataFormatTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -56,7 +56,7 @@ public class BoonDataFormatTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -77,7 +77,7 @@ public class BoonDataFormatTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverseList"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(List.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inList", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -100,7 +100,7 @@ public class BoonDataFormatTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojosMap"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(HashMap.class); - mock.message(0).body().equals(map); + mock.message(0).body().isEqualTo(map); Object marshalled = template.requestBody("direct:inPojosMap", map); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java b/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java index f390734..f0e874a 100644 --- a/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java +++ b/components/camel-castor/src/test/java/org/apache/camel/dataformat/castor/MarshalWithMappingDomainObjectTest.java @@ -64,7 +64,7 @@ public class MarshalWithMappingDomainObjectTest extends CamelTestSupport { mock.assertIsSatisfied(); mock.message(0).body().isInstanceOf(Student.class); - mock.message(0).body().equals(student); + mock.message(0).body().isEqualTo(student); } protected RouteBuilder createRouteBuilder() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java index ccac51f..46bffc8 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java @@ -37,7 +37,7 @@ public class GsonMarshalExclusionTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoExcludeWeight"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoExclusion.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoExcludeWeight", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -56,7 +56,7 @@ public class GsonMarshalExclusionTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoExcludeAge"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoExclusion.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoExcludeAge", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java index aa17ca9..c3425ac 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalListTest.java @@ -48,7 +48,7 @@ public class GsonMarshalListTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(List.class); - mock.message(0).body().equals(inList); + mock.message(0).body().isEqualTo(inList); String marshalled = template.requestBody("direct:inPojo", inList, String.class); assertEquals("[{\"name\":\"Camel1\"},{\"name\":\"Camel2\"}]", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java index 2ea29eb..1404b1d 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalTest.java @@ -34,7 +34,7 @@ public class GsonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -53,7 +53,7 @@ public class GsonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java index 751f99b..8defd99 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java @@ -35,7 +35,7 @@ public class SpringGsonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -54,7 +54,7 @@ public class SpringGsonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java index 5e82d3d..2ac3e6d 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonBindingTest.java @@ -35,7 +35,7 @@ public class JacksonBindingTest extends CamelTestSupport { results.expectedMessageCount(1); results.message(0).body().isInstanceOf(TestPojo.class); - results.message(0).body().equals(in); + results.message(0).body().isEqualTo(in); template.sendBody("direct:start", in); results.assertIsSatisfied(); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java index 91afad8..45612cb 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java @@ -31,7 +31,7 @@ public class JacksonJAXBAnnotationTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestJAXBPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java index 31f40b0..16bbde6 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java @@ -34,7 +34,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -53,7 +53,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -73,7 +73,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java index 25a82b7..d92d075 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java @@ -32,7 +32,7 @@ public class JacksonMarshalViewTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoAgeView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -51,7 +51,7 @@ public class JacksonMarshalViewTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoWeightView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoWeightView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNameBindingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNameBindingTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNameBindingTest.java index 973dcb3..fd9ba75 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNameBindingTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonNameBindingTest.java @@ -36,7 +36,7 @@ public class JacksonNameBindingTest extends CamelTestSupport { results.expectedMessageCount(1); results.message(0).body().isInstanceOf(TestPojo.class); - results.message(0).body().equals(in); + results.message(0).body().isEqualTo(in); template.sendBody("direct:start", in); results.assertIsSatisfied(); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java index 45e789f..cd3a7cd 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/SpringJacksonJsonDataFormatTest.java @@ -38,7 +38,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -57,7 +57,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -77,7 +77,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -95,7 +95,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverseAgeView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonBindingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonBindingTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonBindingTest.java index 92d8ba0..97b049f 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonBindingTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonBindingTest.java @@ -35,7 +35,7 @@ public class JacksonBindingTest extends CamelTestSupport { results.expectedMessageCount(1); results.message(0).body().isInstanceOf(TestPojo.class); - results.message(0).body().equals(in); + results.message(0).body().isEqualTo(in); template.sendBody("direct:start", in); results.assertIsSatisfied(); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java index a94d895..0cf0a1b 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonJAXBAnnotationTest.java @@ -31,7 +31,7 @@ public class JacksonJAXBAnnotationTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestJAXBPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java index 6666b3a..c837762 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalTest.java @@ -34,7 +34,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -53,7 +53,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -73,7 +73,7 @@ public class JacksonMarshalTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java index 8485bcd..b11e0f6 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalViewTest.java @@ -31,7 +31,7 @@ public class JacksonMarshalViewTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoAgeView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -50,7 +50,7 @@ public class JacksonMarshalViewTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojoWeightView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojoWeightView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonNameBindingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonNameBindingTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonNameBindingTest.java index e5fefdc..de63911 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonNameBindingTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonNameBindingTest.java @@ -36,7 +36,7 @@ public class JacksonNameBindingTest extends CamelTestSupport { results.expectedMessageCount(1); results.message(0).body().isInstanceOf(TestPojo.class); - results.message(0).body().equals(in); + results.message(0).body().isEqualTo(in); template.sendBody("direct:start", in); results.assertIsSatisfied(); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java index af07d18..f2c0ea9 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/SpringJacksonJsonDataFormatTest.java @@ -38,7 +38,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -57,7 +57,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Map.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -77,7 +77,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reversePojo"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojo.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inPojo", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); @@ -95,7 +95,7 @@ public class SpringJacksonJsonDataFormatTest extends CamelSpringTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverseAgeView"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(TestPojoView.class); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:inAgeView", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java index b18bdc8..18ebbcc 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java @@ -30,8 +30,8 @@ public class MyBatisInsertWithInputAndOutputHeaderTest extends MyBatisTestSuppor public void testInsert() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).body().equals(RETAINED_BODY); - mock.message(0).header(TEST_CASE_OUTPUT_HEADER_NAME).equals(1); + mock.message(0).body().isEqualTo(RETAINED_BODY); + mock.message(0).header(TEST_CASE_OUTPUT_HEADER_NAME).isEqualTo(1); Account account = new Account(); account.setId(444); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java index 6f79293..84508ce 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java @@ -31,7 +31,7 @@ public class MyBatisSelectOneWithInputAndOutputHeaderTest extends MyBatisTestSup public void testSelectOne() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).body().equals(TEST_ACCOUNT_ID_BAD); + mock.message(0).body().isEqualTo(TEST_ACCOUNT_ID_BAD); mock.message(0).header(TEST_CASE_OUTPUT_HEADER_NAME).isInstanceOf(Account.class); template.sendBodyAndHeader("direct:start", TEST_ACCOUNT_ID_BAD, TEST_CASE_INPUT_HEADER_NAME, TEST_ACCOUNT_ID); @@ -46,7 +46,7 @@ public class MyBatisSelectOneWithInputAndOutputHeaderTest extends MyBatisTestSup public void tesSelectOneNotFound() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).body().equals(TEST_ACCOUNT_ID); + mock.message(0).body().isEqualTo(TEST_ACCOUNT_ID); mock.message(0).header(TEST_CASE_OUTPUT_HEADER_NAME).isNull(); template.sendBodyAndHeader("direct:start", TEST_ACCOUNT_ID, TEST_CASE_INPUT_HEADER_NAME, TEST_ACCOUNT_ID_BAD); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java index fc0844a..34fa141 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java @@ -29,7 +29,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest { public void testUDPInOnlyWithNettyConsumer() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).body().equals("***Camel rocks ?=)".getBytes()); + mock.message(0).body().isEqualTo("***Camel rocks ?=)".getBytes()); template.sendBody("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", "***Camel rocks ?=)".getBytes()); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshallTest.java ---------------------------------------------------------------------- diff --git a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshallTest.java b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshallTest.java index 655b6b6..302f74e 100755 --- a/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshallTest.java +++ b/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalAndUnmarshallTest.java @@ -67,7 +67,7 @@ public class ProtobufMarshalAndUnmarshallTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(Person.class); - mock.message(0).body().equals(input); + mock.message(0).body().isEqualTo(input); Object marshalled = template.requestBody(inURI, input); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLMarshalTestHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLMarshalTestHelper.java b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLMarshalTestHelper.java index e004103..e39d014 100644 --- a/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLMarshalTestHelper.java +++ b/components/camel-snakeyaml/src/test/java/org/apache/camel/component/snakeyaml/SnakeYAMLMarshalTestHelper.java @@ -70,7 +70,7 @@ public final class SnakeYAMLMarshalTestHelper { mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(body.getClass()); - mock.message(0).body().equals(body); + mock.message(0).body().isEqualTo(body); ProducerTemplate template = context.createProducerTemplate(); String result = template.requestBody(directIn, body, String.class); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java index e676c66..6b0dcf0 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java @@ -33,7 +33,7 @@ public class MarshalDomainObjectJSONTest extends MarshalDomainObjectTest { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(PurchaseOrder.class); - mock.message(0).body().equals(order); + mock.message(0).body().isEqualTo(order); Object marshalled = template.requestBody("direct:inPretty", order); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java index 53bebb6..62ffb91 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java @@ -71,7 +71,7 @@ public class MarshalDomainObjectTest extends CamelTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(PurchaseOrder.class); - mock.message(0).body().equals(order); + mock.message(0).body().isEqualTo(order); // we get it back as byte array so type convert it to string Object result = template.requestBody("direct:marshal", order); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java index d1cc40c..b2ac9eb 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java @@ -72,7 +72,7 @@ public class ProtobufRouteTest extends OSGiIntegrationTestSupport { MockEndpoint mock = getMockEndpoint("mock:reverse"); mock.expectedMessageCount(1); mock.message(0).body().isInstanceOf(org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person.class); - mock.message(0).body().equals(input); + mock.message(0).body().isEqualTo(input); Object marshalled = template.requestBody(inURI, input); http://git-wip-us.apache.org/repos/asf/camel/blob/3288b308/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java index 4483f72..132ef9f 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/java/__name__DataFormatTest.java @@ -31,7 +31,7 @@ public class ${name}DataFormatTest extends CamelTestSupport { public void testMarshalAndUnmarshalMap() throws Exception { String in = "Test String"; MockEndpoint mock = getMockEndpoint("mock:reverse"); - mock.message(0).body().equals(in); + mock.message(0).body().isEqualTo(in); Object marshalled = template.requestBody("direct:in", in); template.sendBody("direct:back", marshalled);
