From 204fd645c8582df4b227ecbc3e1ea609d18ffbc5 Mon Sep 17 00:00:00 2001 From: sullis Date: Sat, 5 Mar 2022 21:10:53 -0800 Subject: [PATCH] add: testJersey3 --- .../org/openapitools/codegen/TestUtils.java | 1 + .../jaxrs/JavaJerseyServerCodegenTest.java | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java index 9b53ebe6266a..3ad6676a2410 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java @@ -229,6 +229,7 @@ public class TestUtils { fail("Unable to evaluate file " + path); } String file = linearize(generatedFile); + System.out.println(file); assertNotNull(file); for (String line : lines) assertFalse(file.contains(linearize(line))); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java index 1b870254bc5f..3274d291c5cc 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java @@ -25,6 +25,8 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import static org.openapitools.codegen.TestUtils.assertFileContains; +import static org.openapitools.codegen.TestUtils.assertFileNotContains; +import static org.testng.Assert.assertTrue; import java.io.File; import java.io.IOException; @@ -130,13 +132,30 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest { final DefaultGenerator generator = new DefaultGenerator(); final List files = generator.opts(input).generate(); - Assert.assertTrue(files.size() > 0); + assertTrue(files.size() > 0); + for (File file : files) { + Assert.assertTrue(file.exists()); + Assert.assertTrue(file.isFile()); + } + TestUtils.validateJavaSourceFiles(files); TestUtils.validatePomXmlFiles(files); return files.stream().collect(Collectors.toMap(e -> e.getName().replace(outputPath, ""), i -> i)); } + @Test + public void testJersey3() throws Exception { + codegen.setLibrary("jersey3"); + codegen.setDateLibrary("java8"); + + final Map files = generateFiles(codegen, "src/test/resources/3_0/form-multipart-binary-array.yaml"); + files.values().forEach(file -> { + System.out.println(file.getName()); + assertFileNotContains(file.toPath(), "javax.ws"); + }); + } + @DataProvider(name = "codegenParameterMatrix") public Object[][] codegenParameterMatrix() { final Set libraries = new JavaJerseyServerCodegen().supportedLibraries().keySet();