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 a1270aa065a5d07581902ba3e92ce6bf325b7f18 Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jul 24 10:47:05 2020 +0200 [CAMEL-11807] Upgrade camel-spring-batch to junit5 --- components/camel-spring-batch/pom.xml | 6 +-- .../spring/batch/SpringBatchEndpointTest.java | 48 +++++++++++++--------- .../spring/batch/SpringBatchIntegrationTest.java | 8 ++-- .../spring/batch/SpringBatchJobLauncherTest.java | 8 ++-- .../spring/batch/SpringBatchJobRegistryTest.java | 14 +++---- .../batch/support/CamelItemProcessorTest.java | 6 ++- .../spring/batch/support/CamelItemReaderTest.java | 6 ++- .../spring/batch/support/CamelItemWriterTest.java | 6 ++- .../support/CamelJobExecutionListenerTest.java | 12 +++--- 9 files changed, 65 insertions(+), 49 deletions(-) diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml index 86e3c9d..684528b 100644 --- a/components/camel-spring-batch/pom.xml +++ b/components/camel-spring-batch/pom.xml @@ -60,17 +60,17 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java index 1581194..583dd68 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java @@ -30,23 +30,30 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.commons.lang3.reflect.FieldUtils; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobRegistry; import org.springframework.batch.core.launch.JobLauncher; - -import static org.mockito.BDDMockito.*; - -@RunWith(MockitoJUnitRunner.class) +import static org.apache.camel.test.junit5.TestSupport.header; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.BDDMockito.any; +import static org.mockito.BDDMockito.eq; +import static org.mockito.BDDMockito.mock; +import static org.mockito.BDDMockito.verify; +import static org.mockito.BDDMockito.when; + +@MockitoSettings(strictness = Strictness.LENIENT) public class SpringBatchEndpointTest extends CamelTestSupport { // Fixtures @@ -191,15 +198,16 @@ public class SpringBatchEndpointTest extends CamelTestSupport { mockEndpoint.expectedBodiesReceived(jobExecution); } - @Test(expected = FailedToStartRouteException.class) + @Test public void shouldThrowExceptionIfUsedAsConsumer() throws Exception { // When - context().addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - from("spring-batch:mockJob").to("direct:emptyEndpoint"); - } - }); + assertThrows(FailedToStartRouteException.class, + () -> context().addRoutes(new RouteBuilder() { + @Override + public void configure() throws Exception { + from("spring-batch:mockJob").to("direct:emptyEndpoint"); + } + })); } @Test @@ -301,7 +309,7 @@ public class SpringBatchEndpointTest extends CamelTestSupport { assertSame(alternativeJobLauncher, batchEndpointJobLauncher); } - @Test(expected = FailedToCreateRouteException.class) + @Test public void shouldFailWhenThereIsNoJobLauncher() throws Exception { // Given SimpleRegistry registry = new SimpleRegistry(); @@ -315,10 +323,11 @@ public class SpringBatchEndpointTest extends CamelTestSupport { }); // When - camelContext.start(); + assertThrows(FailedToCreateRouteException.class, + () -> camelContext.start()); } - @Test(expected = FailedToCreateRouteException.class) + @Test public void shouldFailWhenThereIsMoreThanOneJobLauncher() throws Exception { // Given SimpleRegistry registry = new SimpleRegistry(); @@ -334,7 +343,8 @@ public class SpringBatchEndpointTest extends CamelTestSupport { }); // When - camelContext.start(); + assertThrows(FailedToCreateRouteException.class, + () -> camelContext.start()); } @Test diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java index 79daf1c..bb5525d 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java @@ -18,9 +18,9 @@ package org.apache.camel.component.spring.batch; import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -37,7 +37,7 @@ public class SpringBatchIntegrationTest extends CamelSpringTestSupport { String[] inputMessages = new String[]{"foo", "bar", "baz", null}; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java index 7d8dc50..98e45f0 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobLauncherTest.java @@ -18,9 +18,9 @@ package org.apache.camel.component.spring.batch; import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -35,7 +35,7 @@ public class SpringBatchJobLauncherTest extends CamelSpringTestSupport { String[] inputMessages = new String[]{"foo", "bar", "baz", null}; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java index 3719913..5f48e17 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchJobRegistryTest.java @@ -27,11 +27,9 @@ import org.apache.camel.component.spring.batch.support.CamelItemReader; import org.apache.camel.component.spring.batch.support.CamelItemWriter; import org.apache.camel.component.spring.batch.support.CamelJobExecutionListener; import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration; -import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader; -import org.apache.camel.test.spring.CamelSpringRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.Step; @@ -51,8 +49,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -@RunWith(CamelSpringRunner.class) -@ContextConfiguration(classes = SpringBatchJobRegistryTest.ContextConfig.class, loader = CamelSpringDelegatingTestContextLoader.class) +@CamelSpringBootTest +@ContextConfiguration(classes = SpringBatchJobRegistryTest.ContextConfig.class) public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests { @EndpointInject("mock:output") @@ -69,7 +67,7 @@ public class SpringBatchJobRegistryTest extends AbstractJUnit4SpringContextTests String[] inputMessages = new String[]{"foo", "bar", "baz", null}; - @Before + @BeforeEach public void setUp() throws Exception { for (String message : inputMessages) { diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java index b09141c..141f5a0 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemProcessorTest.java @@ -18,8 +18,10 @@ package org.apache.camel.component.spring.batch.support; import org.apache.camel.ExchangePattern; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class CamelItemProcessorTest extends CamelTestSupport { diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java index 145f0b7..5fb9262 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemReaderTest.java @@ -16,8 +16,10 @@ */ package org.apache.camel.component.spring.batch.support; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class CamelItemReaderTest extends CamelTestSupport { diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java index c8a8e8b..8094252 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelItemWriterTest.java @@ -18,8 +18,10 @@ package org.apache.camel.component.spring.batch.support; import java.util.Collections; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class CamelItemWriterTest extends CamelTestSupport { diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java index 5621213..e314126 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/support/CamelJobExecutionListenerTest.java @@ -17,14 +17,16 @@ package org.apache.camel.component.spring.batch.support; import org.apache.camel.Exchange; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.batch.core.JobExecution; -@RunWith(MockitoJUnitRunner.class) +import static org.junit.jupiter.api.Assertions.assertEquals; + +@MockitoSettings(strictness = Strictness.LENIENT) public class CamelJobExecutionListenerTest extends CamelTestSupport { // Fixtures
