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 8f870fe8d45fb5e207fec907d77dda5492498895 Author: Guillaume Nodet <[email protected]> AuthorDate: Thu Jun 11 06:14:52 2020 +0200 [CAMEL-11807] Upgrade tooling to junit5 --- .../maven/camel-api-component-maven-plugin/pom.xml | 6 +++--- .../src/main/resources/api-route-test.vm | 10 +++++---- .../component/test/AbstractTestTestSupport.java | 8 +------ .../camel/maven/AbstractGeneratorMojoTest.java | 25 +++++++++------------- .../camel/maven/ApiComponentGeneratorMojoTest.java | 2 +- .../camel/maven/DocumentGeneratorMojoTest.java | 6 +++--- .../maven/FileApiMethodGeneratorMojoTest.java | 2 +- .../maven/JavadocApiMethodGeneratorMojoTest.java | 2 +- .../org/apache/camel/maven/JavadocParserTest.java | 24 +++++++++++---------- .../pom.xml | 14 ++++-------- .../camel/maven/CamelSpringNamespaceTest.java | 8 +++---- .../java/org/apache/camel/maven/DomFinderTest.java | 4 ++-- .../maven/EipDocumentationEnricherMojoTest.java | 14 ++++++------ .../java/org/apache/camel/maven/XmlHelperTest.java | 7 +++--- .../integration/EIPDocumentationMojoTest.java | 10 ++++----- tooling/openapi-rest-dsl-generator/pom.xml | 4 ++-- .../openapi/MethodBodySourceCodeEmitterTest.java | 2 +- .../generator/openapi/OperationVisitorTest.java | 2 +- .../PathSpringBootProjectSourceGeneratorTest.java | 2 +- .../openapi/RestDefinitionEmitterTest.java | 2 +- .../generator/openapi/RestDslGeneratorTest.java | 6 +++--- .../generator/openapi/RestDslGeneratorV3Test.java | 6 +++--- .../openapi/RestDslSourceCodeGeneratorTest.java | 2 +- .../openapi/RestDslSourceCodeGeneratorV3Test.java | 2 +- .../generator/openapi/RestDslXmlGeneratorTest.java | 6 +++--- .../openapi/RestDslXmlGeneratorV3Test.java | 6 +++--- tooling/swagger-rest-dsl-generator/pom.xml | 4 ++-- .../swagger/MethodBodySourceCodeEmitterTest.java | 2 +- .../PathSpringBootProjectSourceGeneratorTest.java | 2 +- .../swagger/RestDefinitionEmitterTest.java | 2 +- .../generator/swagger/RestDslGeneratorTest.java | 2 +- .../swagger/RestDslSourceCodeGeneratorTest.java | 2 +- .../generator/swagger/RestDslXmlGeneratorTest.java | 2 +- 33 files changed, 93 insertions(+), 105 deletions(-) diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 0e2748b..918b54c 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -139,12 +139,12 @@ <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <!-- VelocityEngine javadoc for testing --> diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm index 1c144c5..4bca5c0 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/resources/api-route-test.vm @@ -40,14 +40,16 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ${packageName}.${componentName}ApiCollection; import ${packageName}.${enumName}; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test class for {@link ${proxyType.Name}} APIs. * TODO Move the file to src/test/java, populate parameter values, and remove @Ignore annotations. @@ -67,7 +69,7 @@ public class ${testName} extends Abstract${componentName}TestSupport { #if ( !$args.isEmpty() ) // TODO provide parameter values for $model.Name #end - @Ignore + @Disabled @Test public void test${testName}() throws Exception { ## single argument, use as body @@ -100,7 +102,7 @@ requestBodyAndHeaders("direct://${model.UniqueName}", null, headers); #end #if ( !$voidResult ) - assertNotNull("${model.Name} result", result); + assertNotNull(result, "${model.Name} result"); LOG.debug("${model.Name}: " + result); #end } diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java index 1fde9da..9a74a08 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/component/test/AbstractTestTestSupport.java @@ -19,19 +19,13 @@ package org.apache.camel.component.test; import java.util.Map; import org.apache.camel.CamelExecutionException; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; /** * Dummy TestSupport class. */ public class AbstractTestTestSupport extends CamelTestSupport { - @Override - public boolean isCreateCamelContextPerClass() { - // only create the context once for this class - return true; - } - @SuppressWarnings("unchecked") protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers) throws CamelExecutionException { diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java index 41bb07b..8c05506 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java @@ -20,20 +20,18 @@ import java.io.File; import java.util.Collections; import java.util.List; import java.util.function.Supplier; +import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.project.MavenProject; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.hasItems; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Base class for Generator MOJO tests. @@ -51,7 +49,7 @@ public abstract class AbstractGeneratorMojoTest { protected static final String SCHEME = "testComponent"; protected void assertExists(File outFile) { - assertTrue("Generated file not found " + outFile.getPath(), outFile.exists()); + assertTrue(outFile.exists(), "Generated file not found " + outFile.getPath()); } protected void configureSourceGeneratorMojo(AbstractSourceGeneratorMojo mojo) { @@ -110,7 +108,7 @@ public abstract class AbstractGeneratorMojoTest { @SuppressWarnings("unchecked") public void shouldAddCompilationRootsByDefault() throws Exception { AbstractSourceGeneratorMojo mojo = createGeneratorMojo(); - Assume.assumeThat("Ignored because createGeneratorMojo is not implemented", mojo, notNullValue()); + assumeTrue(mojo != null, "Ignored because createGeneratorMojo is not implemented"); // Differentiate target folders to simplify assertion mojo.generatedSrcDir = new File(OUT_DIR.replace("-test-", "")); mojo.generatedTestDir = new File(OUT_DIR); @@ -139,7 +137,7 @@ public abstract class AbstractGeneratorMojoTest { File srcDir, File testDir, File[] expectedSource, File[] expectedTest) throws Exception { AbstractSourceGeneratorMojo mojo = createGeneratorMojo(); - Assume.assumeThat("Ignored because createGeneratorMojo is not implemented", mojo, notNullValue()); + assumeTrue(mojo != null, "Ignored because createGeneratorMojo is not implemented"); mojo.generatedSrcDir = srcDir; mojo.generatedTestDir = testDir; mojo.addCompileSourceRoots = compileRoots; @@ -151,11 +149,8 @@ public abstract class AbstractGeneratorMojoTest { private void assertCompileSourceRoots(Supplier<List<String>> roots, File... expectedSources) { List<String> compileSourceRoots = roots.get(); - Assert.assertThat(compileSourceRoots.size(), is(expectedSources.length)); - Assert.assertThat(compileSourceRoots, hasItems( - Stream.of(expectedSources).map(File::getAbsolutePath).toArray(String[]::new)) - ); - + assertEquals(expectedSources.length, compileSourceRoots.size()); + assertEquals(Stream.of(expectedSources).map(File::getAbsolutePath).collect(Collectors.toList()), compileSourceRoots); } } diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java index b45cb50..1bab7bd 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/ApiComponentGeneratorMojoTest.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.camel.component.test.TestProxy; import org.apache.velocity.VelocityContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests {@link ApiComponentGeneratorMojo} diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/DocumentGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/DocumentGeneratorMojoTest.java index d3ac7a1..6282a10 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/DocumentGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/DocumentGeneratorMojoTest.java @@ -18,15 +18,15 @@ package org.apache.camel.maven; import java.io.File; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Tests {@link org.apache.camel.maven.FileApiMethodGeneratorMojo} */ public class DocumentGeneratorMojoTest extends AbstractGeneratorMojoTest { - @Ignore(value = "Can only be run manually after generating and compiling code from other generators") + @Disabled(value = "Can only be run manually after generating and compiling code from other generators") @Test public void testExecute() throws Exception { // delete target file to begin diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java index e387506..537ee6b 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/FileApiMethodGeneratorMojoTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.camel.component.test.TestProxy; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests {@link FileApiMethodGeneratorMojo} diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojoTest.java index 71a98e8..8b4754b 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocApiMethodGeneratorMojoTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.velocity.VelocityContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests {@link JavadocApiMethodGeneratorMojo} diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java index 5faa815..6481d73 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/JavadocParserTest.java @@ -20,13 +20,15 @@ import java.io.InputStreamReader; import javax.swing.text.html.parser.DTD; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Test JavadocParser using {@link java.lang.String} javadoc for Java 6, 7 and 8. */ -public class JavadocParserTest extends Assert { +public class JavadocParserTest { @Test public void testGetMethods() throws Exception { @@ -35,23 +37,23 @@ public class JavadocParserTest extends Assert { final JavadocParser htmlParser = new JavadocParser(dtd, javaDocPath); htmlParser.parse(new InputStreamReader(JavadocParserTest.class.getResourceAsStream("/Java6_String.html"), "UTF-8")); - assertNull("Java6 getErrorMessage", htmlParser.getErrorMessage()); - assertEquals("Java6 getMethods", 65, htmlParser.getMethods().size()); + assertNull(htmlParser.getErrorMessage(), "Java6 getErrorMessage"); + assertEquals(65, htmlParser.getMethods().size(), "Java6 getMethods"); htmlParser.reset(); htmlParser.parse(new InputStreamReader(JavadocParserTest.class.getResourceAsStream("/Java7_String.html"), "UTF-8")); - assertNull("Java7 getErrorMessage", htmlParser.getErrorMessage()); - assertEquals("Java7 getMethods", 65, htmlParser.getMethods().size()); + assertNull(htmlParser.getErrorMessage(), "Java7 getErrorMessage"); + assertEquals(65, htmlParser.getMethods().size(), "Java7 getMethods"); htmlParser.reset(); htmlParser.parse(new InputStreamReader(JavadocParserTest.class.getResourceAsStream("/Java8_String.html"), "UTF-8")); - assertNull("Java8 getErrorMessage", htmlParser.getErrorMessage()); - assertEquals("Java8 getMethods", 67, htmlParser.getMethods().size()); + assertNull(htmlParser.getErrorMessage(), "Java8 getErrorMessage"); + assertEquals(67, htmlParser.getMethods().size(), "Java8 getMethods"); htmlParser.reset(); htmlParser.parse(new InputStreamReader(JavadocParserTest.class.getResourceAsStream("/Java11_String.html"), "UTF-8")); - assertNull("Java11 getErrorMessage", htmlParser.getErrorMessage()); - assertEquals("Java11 getMethods", 75, htmlParser.getMethods().size()); + assertNull(htmlParser.getErrorMessage(), "Java11 getErrorMessage"); + assertEquals(75, htmlParser.getMethods().size(), "Java11 getMethods"); htmlParser.reset(); } } diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index 560d8bc..86e411e 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -108,19 +108,13 @@ <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.hamcrest</groupId> @@ -130,7 +124,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java index e7fc5bf..1aa0352 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java @@ -16,11 +16,11 @@ */ package org.apache.camel.maven; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; public class CamelSpringNamespaceTest { diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java index ee0300d..45d0193 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/DomFinderTest.java @@ -22,9 +22,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -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 DomFinderTest { diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java index 33ff889..53799c1 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java @@ -19,16 +19,16 @@ package org.apache.camel.maven; import java.io.File; import org.apache.maven.plugin.MojoExecutionException; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class EipDocumentationEnricherMojoTest { private EipDocumentationEnricherMojo eipDocumentationEnricherMojo = new EipDocumentationEnricherMojo(); @@ -40,7 +40,7 @@ public class EipDocumentationEnricherMojoTest { private File mockInputSchema; - @Before + @BeforeEach public void setUp() throws Exception { eipDocumentationEnricherMojo.camelCoreDir = mockCamelCore; eipDocumentationEnricherMojo.inputCamelSchemaFile = mockInputSchema; diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java index 03163d0..e5a2070 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java @@ -16,10 +16,11 @@ */ package org.apache.camel.maven; -import org.junit.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; public class XmlHelperTest { diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java index f963fa6..2aae1b3 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java @@ -34,20 +34,20 @@ import org.apache.camel.maven.CamelSpringNamespace; import org.apache.camel.maven.Constants; import org.apache.camel.maven.EipDocumentationEnricherMojo; import org.apache.camel.maven.ResourceUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class EIPDocumentationMojoTest { EipDocumentationEnricherMojo eipDocumentationEnricherMojo = new EipDocumentationEnricherMojo(); XPath xPath = XPathFactory.newInstance().newXPath(); File tempFile; - @Before + @BeforeEach public void setUp() throws Exception { eipDocumentationEnricherMojo.camelCoreDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration"); eipDocumentationEnricherMojo.camelCoreXmlDir = ResourceUtils.getResourceAsFile("integration/camel-core-integration"); diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml index a8e539a..e5e0138 100644 --- a/tooling/openapi-rest-dsl-generator/pom.xml +++ b/tooling/openapi-rest-dsl-generator/pom.xml @@ -61,8 +61,8 @@ <!-- test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java index 6d3cdaf..380aba1 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/MethodBodySourceCodeEmitterTest.java @@ -19,7 +19,7 @@ package org.apache.camel.generator.openapi; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec.Builder; import org.apache.camel.model.rest.RestParamType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java index d170e5f..87b3a0b 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/OperationVisitorTest.java @@ -30,7 +30,7 @@ import io.apicurio.datamodels.openapi.v3.models.Oas30Parameter; import io.apicurio.datamodels.openapi.v3.models.Oas30ParameterDefinition; import io.apicurio.datamodels.openapi.v3.models.Oas30Schema; import org.apache.camel.generator.openapi.PathVisitor.HttpMethod; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/PathSpringBootProjectSourceGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/PathSpringBootProjectSourceGeneratorTest.java index 3c3e973..22e8500 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/PathSpringBootProjectSourceGeneratorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/PathSpringBootProjectSourceGeneratorTest.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java index a863bb9..81d5851 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java @@ -25,7 +25,7 @@ import org.apache.camel.model.rest.RestOperationParamDefinition; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.model.rest.RestsDefinition; import org.apache.camel.model.rest.VerbDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java index 334bec2..c9ebd11 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorTest.java @@ -35,8 +35,8 @@ import io.apicurio.datamodels.openapi.v3.models.Oas30ServerVariable; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.rest.RestsDefinition; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -201,7 +201,7 @@ public class RestDslGeneratorTest { assertThat(RestDslGenerator.resolveVariablesIn("before {var} after", server)).isEqualTo("before value after"); } - @BeforeClass + @BeforeAll public static void readOpenApiDoc() throws Exception { final ObjectMapper mapper = new ObjectMapper(); try (InputStream is = RestDslGeneratorTest.class.getResourceAsStream("openapi-v2.json")) { diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java index 45ad5c6..a89e838 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslGeneratorV3Test.java @@ -30,8 +30,8 @@ import io.apicurio.datamodels.openapi.models.OasDocument; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.rest.RestsDefinition; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -118,7 +118,7 @@ public class RestDslGeneratorV3Test { assertThat(code.toString()).isEqualTo(expectedContent); } - @BeforeClass + @BeforeAll public static void readOpenApiDoc() throws Exception { final ObjectMapper mapper = new ObjectMapper(); try (InputStream is = RestDslGeneratorTest.class.getResourceAsStream("openapi-spec.json")) { diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorTest.java index d2ba094..1fcbcb0 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorTest.java @@ -19,7 +19,7 @@ package org.apache.camel.generator.openapi; import io.apicurio.datamodels.openapi.models.OasInfo; import io.apicurio.datamodels.openapi.v2.models.Oas20Document; import io.apicurio.datamodels.openapi.v2.models.Oas20Info; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java index 4b9707c..48eb5d0 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslSourceCodeGeneratorV3Test.java @@ -19,7 +19,7 @@ package org.apache.camel.generator.openapi; import io.apicurio.datamodels.openapi.models.OasInfo; import io.apicurio.datamodels.openapi.v3.models.Oas30Document; import io.apicurio.datamodels.openapi.v3.models.Oas30Info; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java index 891d3db..fc83b0e 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorTest.java @@ -36,8 +36,8 @@ import io.apicurio.datamodels.Library; import io.apicurio.datamodels.openapi.models.OasDocument; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -104,7 +104,7 @@ public class RestDslXmlGeneratorTest { } } - @BeforeClass + @BeforeAll public static void readOpenApiDoc() throws Exception { final ObjectMapper mapper = new ObjectMapper(); try (InputStream is = RestDslXmlGeneratorTest.class.getResourceAsStream("openapi-v2.json")) { diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java index 1a187ed..d1c1e76 100644 --- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java +++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslXmlGeneratorV3Test.java @@ -36,8 +36,8 @@ import io.apicurio.datamodels.Library; import io.apicurio.datamodels.openapi.models.OasDocument; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -103,7 +103,7 @@ public class RestDslXmlGeneratorV3Test { } } - @BeforeClass + @BeforeAll public static void readOpenApiDoc() throws Exception { final ObjectMapper mapper = new ObjectMapper(); try (InputStream is = RestDslXmlGeneratorV3Test.class.getResourceAsStream("openapi-spec.json")) { diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml index 153eb88..6f95250 100644 --- a/tooling/swagger-rest-dsl-generator/pom.xml +++ b/tooling/swagger-rest-dsl-generator/pom.xml @@ -56,8 +56,8 @@ <!-- test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/MethodBodySourceCodeEmitterTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/MethodBodySourceCodeEmitterTest.java index aaee36a..6f3514d 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/MethodBodySourceCodeEmitterTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/MethodBodySourceCodeEmitterTest.java @@ -19,7 +19,7 @@ package org.apache.camel.generator.swagger; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec.Builder; import org.apache.camel.model.rest.RestParamType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/PathSpringBootProjectSourceGeneratorTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/PathSpringBootProjectSourceGeneratorTest.java index 9b2aff2..797fc3e 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/PathSpringBootProjectSourceGeneratorTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/PathSpringBootProjectSourceGeneratorTest.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java index cf322c4..2e4951a 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java @@ -24,7 +24,7 @@ import org.apache.camel.model.rest.RestOperationParamDefinition; import org.apache.camel.model.rest.RestParamType; import org.apache.camel.model.rest.RestsDefinition; import org.apache.camel.model.rest.VerbDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java index 7b9aef0..deef825 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslGeneratorTest.java @@ -29,7 +29,7 @@ import io.swagger.parser.SwaggerParser; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.rest.RestsDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java index 60df4e7..ecc28d9 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java @@ -18,7 +18,7 @@ package org.apache.camel.generator.swagger; import io.swagger.models.Info; import io.swagger.models.Swagger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java index dcc22b9..7ba1198 100644 --- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java +++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslXmlGeneratorTest.java @@ -33,7 +33,7 @@ import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat;
