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 8d2f51705348a9ccb238b540bc5d7de74c2e5893 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 12:02:33 2020 +0200 [CAMEL-11807] Upgrade camel-elytron to junit5 --- components/camel-elytron/pom.xml | 6 +++--- .../java/org/apache/camel/component/elytron/BaseElytronTest.java | 6 +++--- .../org/apache/camel/component/elytron/ElytronBearerTokenTest.java | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/components/camel-elytron/pom.xml b/components/camel-elytron/pom.xml index 63ba0aa..505d6c4 100644 --- a/components/camel-elytron/pom.xml +++ b/components/camel-elytron/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -133,8 +133,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java index f486fcf..7fdd29c1 100644 --- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java +++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/BaseElytronTest.java @@ -31,8 +31,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.undertow.UndertowComponent; import org.apache.camel.component.undertow.spi.UndertowSecurityProvider; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.BeforeClass; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeAll; import org.wildfly.security.WildFlyElytronBaseProvider; import org.wildfly.security.auth.permission.LoginPermission; import org.wildfly.security.auth.realm.token.TokenSecurityRealm; @@ -57,7 +57,7 @@ public abstract class BaseElytronTest extends CamelTestSupport { abstract WildFlyElytronBaseProvider getElytronProvider(); - @BeforeClass + @BeforeAll public static void initPort() throws Exception { port = AvailablePortFinder.getNextAvailable(); keyPair = null; diff --git a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java index 6f5ab179..e3fee2f 100644 --- a/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java +++ b/components/camel-elytron/src/test/java/org/apache/camel/component/elytron/ElytronBearerTokenTest.java @@ -30,7 +30,7 @@ import io.undertow.util.Headers; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.http.base.HttpOperationFailedException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wildfly.security.WildFlyElytronBaseProvider; @@ -40,6 +40,11 @@ import org.wildfly.security.authz.RoleDecoder; import org.wildfly.security.http.HttpConstants; import org.wildfly.security.http.bearer.WildFlyElytronHttpBearerProvider; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + public class ElytronBearerTokenTest extends BaseElytronTest { private static final Logger LOG = LoggerFactory.getLogger(ElytronBearerTokenTest.class);
