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 2f80b965bd0f10ba489f8ea3348504dbb3ef8830 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 16:09:55 2020 +0200 [CAMEL-11807] Upgrade camel-main to junit5 --- core/camel-main/pom.xml | 2 +- .../apache/camel/main/MainFaultToleranceTest.java | 18 +++++++++-------- .../camel/main/MainPropertyPlaceholderTest.java | 1 - .../main/MainPropertyPlaceholderWithEnvTest.java | 2 +- .../java/org/apache/camel/main/MainRestTest.java | 23 ++++++++++++---------- .../apache/camel/main/MainRouteTemplateTest.java | 7 ++++--- .../apache/camel/main/xml/MainXmlTemplateTest.java | 1 - 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml index 9c0d86c..c8b8802 100644 --- a/core/camel-main/pom.xml +++ b/core/camel-main/pom.xml @@ -72,7 +72,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java index 8c6c377..fcdac77 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainFaultToleranceTest.java @@ -19,9 +19,11 @@ package org.apache.camel.main; import org.apache.camel.CamelContext; import org.apache.camel.model.FaultToleranceConfigurationDefinition; import org.apache.camel.model.ModelCamelContext; -import org.junit.Assert; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class MainFaultToleranceTest { @Test @@ -41,17 +43,17 @@ public class MainFaultToleranceTest { main.start(); CamelContext context = main.getCamelContext(); - Assert.assertNotNull(context); + assertNotNull(context); ModelCamelContext mcc = context.adapt(ModelCamelContext.class); FaultToleranceConfigurationDefinition def = mcc.getFaultToleranceConfiguration(null); - Assert.assertNotNull(def); + assertNotNull(def); - Assert.assertEquals("500", def.getDelay()); - Assert.assertEquals("123", def.getSuccessThreshold()); - Assert.assertEquals("20", def.getTimeoutPoolSize()); - Assert.assertEquals("555", def.getFailureRatio()); - Assert.assertEquals("true", def.getBulkheadEnabled()); + assertEquals("500", def.getDelay()); + assertEquals("123", def.getSuccessThreshold()); + assertEquals("20", def.getTimeoutPoolSize()); + assertEquals("555", def.getFailureRatio()); + assertEquals("true", def.getBulkheadEnabled()); main.stop(); } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java index ade9280..a3c9c7b 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderTest.java @@ -19,7 +19,6 @@ package org.apache.camel.main; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; public class MainPropertyPlaceholderTest { diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java index ae00e08..9939d00 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java @@ -24,7 +24,7 @@ import java.util.Properties; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MainPropertyPlaceholderWithEnvTest { diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java index a663c72..70de886 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainRestTest.java @@ -18,9 +18,12 @@ package org.apache.camel.main; import org.apache.camel.CamelContext; import org.apache.camel.spi.RestConfiguration; -import org.junit.Assert; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class MainRestTest { @Test @@ -40,17 +43,17 @@ public class MainRestTest { main.start(); CamelContext context = main.getCamelContext(); - Assert.assertNotNull(context); + assertNotNull(context); RestConfiguration def = context.getRestConfiguration(); - Assert.assertNotNull(def); - - Assert.assertEquals(1234, def.getPort()); - Assert.assertTrue(def.isUseXForwardHeaders()); - Assert.assertEquals("foo", def.getContextPath()); - Assert.assertEquals("bar", def.getApiContextPath()); - Assert.assertEquals("servlet", def.getComponent()); - Assert.assertEquals(RestConfiguration.RestBindingMode.json, def.getBindingMode()); + assertNotNull(def); + + assertEquals(1234, def.getPort()); + assertTrue(def.isUseXForwardHeaders()); + assertEquals("foo", def.getContextPath()); + assertEquals("bar", def.getApiContextPath()); + assertEquals("servlet", def.getComponent()); + assertEquals(RestConfiguration.RestBindingMode.json, def.getBindingMode()); main.stop(); } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java index a46e0e4..fb4238e 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainRouteTemplateTest.java @@ -21,9 +21,10 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; -import org.junit.Assert; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class MainRouteTemplateTest { @Test @@ -44,8 +45,8 @@ public class MainRouteTemplateTest { main.start(); CamelContext context = main.getCamelContext(); - Assert.assertEquals(1, context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().size()); - Assert.assertEquals("mytemplate", context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().get(0).getId()); + assertEquals(1, context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().size()); + assertEquals("mytemplate", context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions().get(0).getId()); MockEndpoint mock = context.getEndpoint("mock:cheese", MockEndpoint.class); mock.expectedBodiesReceived("Hello Camel", "Hello World"); diff --git a/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java b/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java index a6bf863..134a6ff 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTemplateTest.java @@ -21,7 +21,6 @@ import org.apache.camel.main.Main; import org.apache.camel.model.ModelCamelContext; import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull;
