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 962dc789d04c41383cdfff4179d78929a5c0dfb6 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Thu Jun 25 15:16:51 2020 +0200 [CAMEL-11807] Upgrade camel-graphql to junit5 --- components/camel-graphql/pom.xml | 2 +- .../apache/camel/component/graphql/GraphqlComponentTest.java | 12 ++++++------ .../apache/camel/component/graphql/GraphqlProducerTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/camel-graphql/pom.xml b/components/camel-graphql/pom.xml index 4b7151e..9b918d8 100644 --- a/components/camel-graphql/pom.xml +++ b/components/camel-graphql/pom.xml @@ -50,7 +50,7 @@ <!-- for testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java index 13545fe..5c1c970 100644 --- a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java +++ b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlComponentTest.java @@ -24,13 +24,13 @@ import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.graphql.server.GraphqlServer; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.json.JsonObject; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class GraphqlComponentTest extends CamelTestSupport { @@ -42,7 +42,7 @@ public class GraphqlComponentTest extends CamelTestSupport { @EndpointInject("mock:result") private MockEndpoint result; - @BeforeClass + @BeforeAll public static void setUpBeforeClass() throws Exception { booksQueryResult = readJsonFile("booksQueryResult.json"); bookByIdQueryResult = readJsonFile("bookByIdQueryResult.json"); @@ -58,7 +58,7 @@ public class GraphqlComponentTest extends CamelTestSupport { IOHelper.loadText(ObjectHelper.loadResourceAsStream(name)), Object.class)); } - @AfterClass + @AfterAll public static void tearDownAfterClass() throws Exception { server.shutdown(); } diff --git a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlProducerTest.java b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlProducerTest.java index f50164d..da4ae80 100644 --- a/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlProducerTest.java +++ b/components/camel-graphql/src/test/java/org/apache/camel/component/graphql/GraphqlProducerTest.java @@ -17,9 +17,9 @@ package org.apache.camel.component.graphql; import org.apache.camel.util.json.JsonObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class GraphqlProducerTest {