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 03560ecee14b4d812a9c67bfb0275cd83a0d5a57 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Tue Jun 9 17:39:05 2020 +0200 [CAMEL-11807] Upgrade camel-core-xml to junit5 --- core/camel-core-xml/pom.xml | 4 ++-- .../apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml index 9be7073..e4bd44f 100644 --- a/core/camel-core-xml/pom.xml +++ b/core/camel-core-xml/pom.xml @@ -46,8 +46,8 @@ <!-- testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java index 2f27241..fdfe437 100644 --- a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java +++ b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java @@ -39,13 +39,14 @@ import org.apache.camel.spi.Injector; import org.apache.camel.spi.ManagementNameStrategy; import org.apache.camel.spi.RuntimeEndpointRegistry; import org.apache.camel.support.ObjectHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.invocation.Invocation; import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doCallRealMethod;