This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit db7b2953f8477aa65628b9c3e7889960f2b1d17a Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Jun 2 12:48:47 2020 +0200 [CAMEL-11807] Fix doc related to unit tests --- .../java/org/apache/camel/spring/SpringConsumerTemplateTest.java | 6 ++++-- .../src/test/java/org/apache/camel/processor/TransformTest.java | 6 +++--- .../test/java/org/apache/camel/processor/TransformViaDSLTest.java | 6 +++--- .../camel/processor/interceptor/AdviceWithMockEndpointsTest.java | 5 ++++- .../interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java | 4 +++- .../src/test/java/org/apache/camel/spring/patterns/FilterTest.java | 2 +- .../src/test/java/org/apache/camel/processor/FilterTest.java | 2 +- .../org/apache/camel/management/ManagedCustomProcessorTest.java | 4 +++- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java b/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java index fa9a355..28a6444 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java +++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/components/camel-spring/src/test/java/org/apache/camel/spring/SpringConsumerTemplateTest.java @@ -20,10 +20,12 @@ import org.apache.camel.ConsumerTemplate; import org.apache.camel.EndpointInject; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test using the ConsumerTemplate */ @@ -50,7 +52,7 @@ public class SpringConsumerTemplateTest extends SpringRunWithTestSupport { // we consume the body from seda:start String body = consumer.receiveBody("seda:start", String.class); - assertEquals("Hello World", body); + assertEquals(body, "Hello World"); // and then we send the body again to seda:foo so it will be routed to the mock // endpoint so our unit test can complete diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java b/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java index 67d2ce2..3108378 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java +++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java @@ -22,8 +22,8 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TransformTest extends ContextTestSupport { protected MockEndpoint resultEndpoint; @@ -38,7 +38,7 @@ public class TransformTest extends ContextTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java b/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java index 9bfa08e..01d378c 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java +++ b/core/camel-core-engine/src/main/docs/modules/eips/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java @@ -19,8 +19,8 @@ package org.apache.camel.processor; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TransformViaDSLTest extends ContextTestSupport { protected MockEndpoint resultEndpoint; @@ -35,7 +35,7 @@ public class TransformViaDSLTest extends ContextTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java index ca8adbe..ab960d8 100644 --- a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java +++ b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java @@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.reifier.RouteReifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class AdviceWithMockEndpointsTest extends ContextTestSupport { diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java index 49d0934..965e2ba 100644 --- a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java +++ b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java @@ -21,7 +21,9 @@ import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.seda.SedaEndpoint; import org.apache.camel.reifier.RouteReifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class AdviceWithMockMultipleEndpointsWithSkipTest extends ContextTestSupport { diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java index 2ea204a..38e73952 100644 --- a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java +++ b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spring.SpringRunWithTestSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; diff --git a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java index 3b783a5..c0cc004 100644 --- a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java +++ b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java @@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; // START SNIPPET: example // tag::example[] diff --git a/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java b/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java index ee20734..c4533d1 100644 --- a/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java +++ b/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java @@ -26,7 +26,9 @@ import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.support.service.ServiceSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class ManagedCustomProcessorTest extends ManagementTestSupport {