loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade openapi poms and codegen tests to junit5 (#18619)

Browse Source
This commit is contained in:
Thorsten Hirsch 2024-05-09 06:19:56 +02:00 committed by GitHub
parent 89c2664e4c
commit 5614eef995
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 778 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml
View File

@ -19,7 +19,7 @@
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<jodatime-version>2.7</jodatime-version> <jodatime-version>2.7</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.13.2</junit-version> <junit-version>5.10.2</junit-version>
<http-signature-version>1.4</http-signature-version> <http-signature-version>1.4</http-signature-version>
</properties> </properties>
</project> </project>

4
modules/openapi-generator-maven-plugin/pom.xml
View File

@ -59,8 +59,8 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java
View File

@ -16,7 +16,7 @@
package org.openapitools.codegen.plugin; package org.openapitools.codegen.plugin;
import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File; import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;

4
modules/openapi-generator-online/pom.xml
View File

@ -127,8 +127,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

8
modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java
View File

@ -1,14 +1,14 @@
package org.openapitools.codegen.online.api; package org.openapitools.codegen.online.api;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.openapitools.codegen.online.model.ResponseCode; import org.openapitools.codegen.online.model.ResponseCode;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItem;
@ -18,7 +18,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@RunWith(SpringRunner.class) @ExtendWith(SpringExtension.class)
@WebMvcTest(GenApiController.class) @WebMvcTest(GenApiController.class)
public class GenApiControllerTest { public class GenApiControllerTest {

8
modules/openapi-generator/pom.xml
View File

@ -322,10 +322,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tngtech.archunit</groupId> <groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit4</artifactId> <artifactId>archunit-junit5</artifactId>
<version>${archunit.version}</version> <version>${archunit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>

2
modules/openapi-generator/src/main/resources/codegen/generatorClassTest.mustache vendored
View File

@ -1,6 +1,6 @@
package {{generatorPackage}}; package {{generatorPackage}};
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.openapitools.codegen.ClientOptInput; import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.CodegenConfigurator;

10
modules/openapi-generator/src/main/resources/codegen/pom.mustache vendored
View File

@ -31,7 +31,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version> <version>2.22.2</version>
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<property> <property>
@ -41,7 +41,6 @@
</systemPropertyVariables> </systemPropertyVariables>
<argLine>-Xms512m -Xmx1500m</argLine> <argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel> <parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration> </configuration>
</plugin> </plugin>
@ -114,15 +113,16 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>${junit-version}</version> <version>${junit-version}</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openapi-generator-version>{{openapiGeneratorVersion}}</openapi-generator-version> <openapi-generator-version>{{openapiGeneratorVersion}}</openapi-generator-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.13.2</junit-version> <junit-version>5.10.2</junit-version>
</properties> </properties>
</project> </project>

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/ArchUnitRulesTest.java
View File

@ -4,7 +4,7 @@ import com.tngtech.archunit.core.domain.JavaClasses;
import com.tngtech.archunit.core.domain.JavaModifier; import com.tngtech.archunit.core.domain.JavaModifier;
import com.tngtech.archunit.core.importer.ClassFileImporter; import com.tngtech.archunit.core.importer.ClassFileImporter;
import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ArchRule;
import org.junit.Test; import org.junit.jupiter.api.Test;
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*;
import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS; import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS;

1060
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View File

File diff suppressed because it is too large Load Diff

3
modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java
View File

@ -16,9 +16,8 @@
package org.openapitools.codegen.csharpnetcore; package org.openapitools.codegen.csharpnetcore;
import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.assertFileExists;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientDeepObjectTest.java
View File

@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileContains;
public class CSharpClientDeepObjectTest { public class CSharpClientDeepObjectTest {

390
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View File

@ -17,7 +17,7 @@
package org.openapitools.codegen.java; package org.openapitools.codegen.java;
import static org.junit.Assert.assertNotNull; import org.junit.jupiter.api.Assertions;
import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.assertFileNotContains; import static org.openapitools.codegen.TestUtils.assertFileNotContains;
import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles; import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles;
@ -109,9 +109,9 @@ public class JavaClientCodegenTest {
"application/json", "application/json",
new MediaType().schema(new ArraySchema().items(new StringSchema())))); new MediaType().schema(new ArraySchema().items(new StringSchema()))));
CodegenParameter codegenParameter1 = codegen.fromRequestBody(body1, new HashSet<String>(), null); CodegenParameter codegenParameter1 = codegen.fromRequestBody(body1, new HashSet<String>(), null);
Assert.assertEquals(codegenParameter1.description, "A list of ids"); Assertions.assertEquals(codegenParameter1.description, "A list of ids");
Assert.assertEquals(codegenParameter1.dataType, "List<String>"); Assertions.assertEquals(codegenParameter1.dataType, "List<String>");
Assert.assertEquals(codegenParameter1.baseType, "String"); Assertions.assertEquals(codegenParameter1.baseType, "String");
RequestBody body2 = new RequestBody(); RequestBody body2 = new RequestBody();
body2.setDescription("A list of list of values"); body2.setDescription("A list of list of values");
@ -123,9 +123,9 @@ public class JavaClientCodegenTest {
.schema( .schema(
new ArraySchema().items(new ArraySchema().items(new IntegerSchema()))))); new ArraySchema().items(new ArraySchema().items(new IntegerSchema())))));
CodegenParameter codegenParameter2 = codegen.fromRequestBody(body2, new HashSet<String>(), null); CodegenParameter codegenParameter2 = codegen.fromRequestBody(body2, new HashSet<String>(), null);
Assert.assertEquals(codegenParameter2.description, "A list of list of values"); Assertions.assertEquals(codegenParameter2.description, "A list of list of values");
Assert.assertEquals(codegenParameter2.dataType, "List<List<Integer>>"); Assertions.assertEquals(codegenParameter2.dataType, "List<List<Integer>>");
Assert.assertEquals(codegenParameter2.baseType, "List"); Assertions.assertEquals(codegenParameter2.baseType, "List");
RequestBody body3 = new RequestBody(); RequestBody body3 = new RequestBody();
body3.setDescription("A list of points"); body3.setDescription("A list of points");
@ -142,9 +142,9 @@ public class JavaClientCodegenTest {
point.addProperty("x", new IntegerSchema().format(SchemaTypeUtil.INTEGER32_FORMAT)); point.addProperty("x", new IntegerSchema().format(SchemaTypeUtil.INTEGER32_FORMAT));
point.addProperty("y", new IntegerSchema().format(SchemaTypeUtil.INTEGER32_FORMAT)); point.addProperty("y", new IntegerSchema().format(SchemaTypeUtil.INTEGER32_FORMAT));
CodegenParameter codegenParameter3 = codegen.fromRequestBody(body3, new HashSet<String>(), null); CodegenParameter codegenParameter3 = codegen.fromRequestBody(body3, new HashSet<String>(), null);
Assert.assertEquals(codegenParameter3.description, "A list of points"); Assertions.assertEquals(codegenParameter3.description, "A list of points");
Assert.assertEquals(codegenParameter3.dataType, "List<Point>"); Assertions.assertEquals(codegenParameter3.dataType, "List<Point>");
Assert.assertEquals(codegenParameter3.baseType, "Point"); Assertions.assertEquals(codegenParameter3.baseType, "Point");
} }
@Test @Test
@ -153,7 +153,7 @@ public class JavaClientCodegenTest {
ComposedSchema schema = new ComposedSchema(); ComposedSchema schema = new ComposedSchema();
CodegenModel result = codegen.fromModel("CompSche", CodegenModel result = codegen.fromModel("CompSche",
schema); schema);
Assert.assertEquals(result.name, "CompSche"); Assertions.assertEquals(result.name, "CompSche");
} }
@Test @Test
@ -177,7 +177,7 @@ public class JavaClientCodegenTest {
javaClientCodegen.postProcessOperationsWithModels(objs, Collections.emptyList()); javaClientCodegen.postProcessOperationsWithModels(objs, Collections.emptyList());
Assert.assertEquals(Arrays.asList(pathParam1, pathParam2, queryParamRequired, queryParamOptional), codegenOperation.allParams); Assertions.assertEquals(Arrays.asList(pathParam1, pathParam2, queryParamRequired, queryParamOptional), codegenOperation.allParams);
} }
@Test @Test
@ -185,22 +185,22 @@ public class JavaClientCodegenTest {
final JavaClientCodegen codegen = new JavaClientCodegen(); final JavaClientCodegen codegen = new JavaClientCodegen();
codegen.processOpts(); codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); Assertions.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertFalse(codegen.isHideGenerationTimestamp()); Assertions.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.client.model"); Assertions.assertEquals(codegen.modelPackage(), "org.openapitools.client.model");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE),
"org.openapitools.client.model"); "org.openapitools.client.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.client.api"); Assertions.assertEquals(codegen.apiPackage(), "org.openapitools.client.api");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), codegen.additionalProperties().get(CodegenConstants.API_PACKAGE),
"org.openapitools.client.api"); "org.openapitools.client.api");
Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools.client"); Assertions.assertEquals(codegen.getInvokerPackage(), "org.openapitools.client");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE),
"org.openapitools.client"); "org.openapitools.client");
Assert.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_GSON); Assertions.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_GSON);
} }
@Test @Test
@ -213,20 +213,20 @@ public class JavaClientCodegenTest {
codegen.setSerializationLibrary("JACKSON"); codegen.setSerializationLibrary("JACKSON");
codegen.processOpts(); codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assertions.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertTrue(codegen.isHideGenerationTimestamp()); Assertions.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.model"); Assertions.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE),
"xyz.yyyyy.zzzzzzz.model"); "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.api"); Assertions.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.api");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xyz.yyyyy.zzzzzzz.api"); codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xyz.yyyyy.zzzzzzz.api");
Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.invoker"); Assertions.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.invoker");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE),
"xyz.yyyyy.zzzzzzz.invoker"); "xyz.yyyyy.zzzzzzz.invoker");
Assert.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_GSON); // the library JavaClientCodegen.OKHTTP_GSON only supports GSON Assertions.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_GSON); // the library JavaClientCodegen.OKHTTP_GSON only supports GSON
} }
@Test @Test
@ -244,21 +244,21 @@ public class JavaClientCodegenTest {
codegen.additionalProperties().put(CodegenConstants.LIBRARY, JavaClientCodegen.JERSEY2); codegen.additionalProperties().put(CodegenConstants.LIBRARY, JavaClientCodegen.JERSEY2);
codegen.processOpts(); codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); Assertions.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertTrue(codegen.isHideGenerationTimestamp()); Assertions.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model"); Assertions.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE),
"xyz.yyyyy.zzzzzzz.mmmmm.model"); "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.aaaaa.api"); Assertions.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.aaaaa.api");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), codegen.additionalProperties().get(CodegenConstants.API_PACKAGE),
"xyz.yyyyy.zzzzzzz.aaaaa.api"); "xyz.yyyyy.zzzzzzz.aaaaa.api");
Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.iiii.invoker"); Assertions.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.iiii.invoker");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE),
"xyz.yyyyy.zzzzzzz.iiii.invoker"); "xyz.yyyyy.zzzzzzz.iiii.invoker");
Assert.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_JACKSON); Assertions.assertEquals(codegen.getSerializationLibrary(), JavaClientCodegen.SERIALIZATION_LIBRARY_JACKSON);
} }
@Test @Test
@ -321,7 +321,7 @@ public class JavaClientCodegenTest {
codegen.additionalProperties().put(CodegenConstants.LIBRARY, JavaClientCodegen.JERSEY3); codegen.additionalProperties().put(CodegenConstants.LIBRARY, JavaClientCodegen.JERSEY3);
codegen.processOpts(); codegen.processOpts();
Assert.assertTrue(codegen.getFeatureSet().getSecurityFeatures().contains(SecurityFeature.SignatureAuth)); Assertions.assertTrue(codegen.getFeatureSet().getSecurityFeatures().contains(SecurityFeature.SignatureAuth));
} }
@Test @Test
@ -333,16 +333,16 @@ public class JavaClientCodegenTest {
codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.yyyyy.zzzzzzz.aaaaa.api"); codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.yyyyy.zzzzzzz.aaaaa.api");
codegen.processOpts(); codegen.processOpts();
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model"); Assertions.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE),
"xyz.yyyyy.zzzzzzz.mmmmm.model"); "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.aaaaa.api"); Assertions.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.aaaaa.api");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), codegen.additionalProperties().get(CodegenConstants.API_PACKAGE),
"xyz.yyyyy.zzzzzzz.aaaaa.api"); "xyz.yyyyy.zzzzzzz.aaaaa.api");
Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.aaaaa"); Assertions.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.aaaaa");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE),
"xyz.yyyyy.zzzzzzz.aaaaa"); "xyz.yyyyy.zzzzzzz.aaaaa");
} }
@ -355,16 +355,16 @@ public class JavaClientCodegenTest {
.put(CodegenConstants.MODEL_PACKAGE, "xyz.yyyyy.zzzzzzz.mmmmm.model"); .put(CodegenConstants.MODEL_PACKAGE, "xyz.yyyyy.zzzzzzz.mmmmm.model");
codegen.processOpts(); codegen.processOpts();
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model"); Assertions.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE),
"xyz.yyyyy.zzzzzzz.mmmmm.model"); "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.client.api"); Assertions.assertEquals(codegen.apiPackage(), "org.openapitools.client.api");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), codegen.additionalProperties().get(CodegenConstants.API_PACKAGE),
"org.openapitools.client.api"); "org.openapitools.client.api");
Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.mmmmm"); Assertions.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.mmmmm");
Assert.assertEquals( Assertions.assertEquals(
codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE),
"xyz.yyyyy.zzzzzzz.mmmmm"); "xyz.yyyyy.zzzzzzz.mmmmm");
} }
@ -377,8 +377,8 @@ public class JavaClientCodegenTest {
Operation operation = openAPI.getPaths().get("/ping").getPost(); Operation operation = openAPI.getPaths().get("/ping").getPost();
CodegenOperation co = codegen.fromOperation("/ping", "POST", operation, null); CodegenOperation co = codegen.fromOperation("/ping", "POST", operation, null);
Assert.assertEquals(co.allParams.size(), 1); Assertions.assertEquals(co.allParams.size(), 1);
Assert.assertEquals(co.allParams.get(0).baseType, "MessageEventCoreWithTimeListEntries"); Assertions.assertEquals(co.allParams.get(0).baseType, "MessageEventCoreWithTimeListEntries");
} }
@Test @Test
@ -390,11 +390,11 @@ public class JavaClientCodegenTest {
List<Map<String, String>> enumVars = List<Map<String, String>> enumVars =
(List<Map<String, String>>) array.getItems().getAllowableValues().get("enumVars"); (List<Map<String, String>>) array.getItems().getAllowableValues().get("enumVars");
Assert.assertNotNull(enumVars); Assertions.assertNotNull(enumVars);
Map<String, String> testedEnumVar = enumVars.get(0); Map<String, String> testedEnumVar = enumVars.get(0);
Assert.assertNotNull(testedEnumVar); Assertions.assertNotNull(testedEnumVar);
Assert.assertEquals(testedEnumVar.getOrDefault("name", ""), "NUMBER_1"); Assertions.assertEquals(testedEnumVar.getOrDefault("name", ""), "NUMBER_1");
Assert.assertEquals(testedEnumVar.getOrDefault("value", ""), "1"); Assertions.assertEquals(testedEnumVar.getOrDefault("value", ""), "1");
} }
@Test @Test
@ -410,11 +410,11 @@ public class JavaClientCodegenTest {
List<Map<String, String>> enumVars = List<Map<String, String>> enumVars =
(List<Map<String, String>>) array.getItems().getAllowableValues().get("enumVars"); (List<Map<String, String>>) array.getItems().getAllowableValues().get("enumVars");
Assert.assertNotNull(enumVars); Assertions.assertNotNull(enumVars);
Map<String, String> testedEnumVar = enumVars.get(0); Map<String, String> testedEnumVar = enumVars.get(0);
Assert.assertNotNull(testedEnumVar); Assertions.assertNotNull(testedEnumVar);
Assert.assertEquals(testedEnumVar.getOrDefault("name", ""), "ONE"); Assertions.assertEquals(testedEnumVar.getOrDefault("name", ""), "ONE");
Assert.assertEquals(testedEnumVar.getOrDefault("value", ""), "1"); Assertions.assertEquals(testedEnumVar.getOrDefault("value", ""), "1");
} }
@Test @Test
@ -435,7 +435,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 40); Assertions.assertEquals(files.size(), 40);
TestUtils.ensureContainsFile(files, output, ".gitignore"); TestUtils.ensureContainsFile(files, output, ".gitignore");
TestUtils.ensureContainsFile(files, output, ".openapi-generator-ignore"); TestUtils.ensureContainsFile(files, output, ".openapi-generator-ignore");
TestUtils.ensureContainsFile(files, output, ".openapi-generator/FILES"); TestUtils.ensureContainsFile(files, output, ".openapi-generator/FILES");
@ -511,7 +511,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 43); Assertions.assertEquals(files.size(), 43);
TestUtils.ensureContainsFile(files, output, ".gitignore"); TestUtils.ensureContainsFile(files, output, ".gitignore");
TestUtils.ensureContainsFile(files, output, ".openapi-generator-ignore"); TestUtils.ensureContainsFile(files, output, ".openapi-generator-ignore");
TestUtils.ensureContainsFile(files, output, ".openapi-generator/FILES"); TestUtils.ensureContainsFile(files, output, ".openapi-generator/FILES");
@ -599,7 +599,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 32); Assertions.assertEquals(files.size(), 32);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
TestUtils.assertFileContains( TestUtils.assertFileContains(
@ -668,7 +668,7 @@ public class JavaClientCodegenTest {
generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 153); Assertions.assertEquals(files.size(), 153);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/Dog.java"), TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/Dog.java"),
@ -695,7 +695,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 35); Assertions.assertEquals(files.size(), 35);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/PingApi.java"); Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/api/PingApi.java");
@ -722,10 +722,10 @@ public class JavaClientCodegenTest {
ApiResponse ok_200 = openAPI.getComponents().getResponses().get("OK_200"); ApiResponse ok_200 = openAPI.getComponents().getResponses().get("OK_200");
CodegenResponse response = codegen.fromResponse("200", ok_200); CodegenResponse response = codegen.fromResponse("200", ok_200);
Assert.assertEquals(response.headers.size(), 1); Assertions.assertEquals(response.headers.size(), 1);
CodegenProperty header = response.headers.get(0); CodegenProperty header = response.headers.get(0);
Assert.assertEquals(header.dataType, "UUID"); Assertions.assertEquals(header.dataType, "UUID");
Assert.assertEquals(header.baseName, "Request"); Assertions.assertEquals(header.baseName, "Request");
} }
@Test @Test
@ -791,7 +791,7 @@ public class JavaClientCodegenTest {
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
Assert.assertEquals(files.size(), 1); Assertions.assertEquals(files.size(), 1);
files.forEach(File::deleteOnExit); files.forEach(File::deleteOnExit);
} }
@ -820,7 +820,7 @@ public class JavaClientCodegenTest {
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
Assert.assertEquals(files.size(), 9); Assertions.assertEquals(files.size(), 9);
files.forEach(File::deleteOnExit); files.forEach(File::deleteOnExit);
} }
@ -899,29 +899,29 @@ public class JavaClientCodegenTest {
Schema test1 = openAPI.getComponents().getSchemas().get("MapTest1"); Schema test1 = openAPI.getComponents().getSchemas().get("MapTest1");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm1 = codegen.fromModel("MapTest1", test1); CodegenModel cm1 = codegen.fromModel("MapTest1", test1);
Assert.assertEquals(cm1.getDataType(), "Map"); Assertions.assertEquals(cm1.getDataType(), "Map");
Assert.assertEquals(cm1.getParent(), "HashMap<String, Object>"); Assertions.assertEquals(cm1.getParent(), "HashMap<String, Object>");
Assert.assertEquals(cm1.getClassname(), "MapTest1"); Assertions.assertEquals(cm1.getClassname(), "MapTest1");
Schema test2 = openAPI.getComponents().getSchemas().get("MapTest2"); Schema test2 = openAPI.getComponents().getSchemas().get("MapTest2");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm2 = codegen.fromModel("MapTest2", test2); CodegenModel cm2 = codegen.fromModel("MapTest2", test2);
Assert.assertEquals(cm2.getDataType(), "Map"); Assertions.assertEquals(cm2.getDataType(), "Map");
Assert.assertEquals(cm2.getParent(), "HashMap<String, Object>"); Assertions.assertEquals(cm2.getParent(), "HashMap<String, Object>");
Assert.assertEquals(cm2.getClassname(), "MapTest2"); Assertions.assertEquals(cm2.getClassname(), "MapTest2");
Schema test3 = openAPI.getComponents().getSchemas().get("MapTest3"); Schema test3 = openAPI.getComponents().getSchemas().get("MapTest3");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm3 = codegen.fromModel("MapTest3", test3); CodegenModel cm3 = codegen.fromModel("MapTest3", test3);
Assert.assertEquals(cm3.getDataType(), "Map"); Assertions.assertEquals(cm3.getDataType(), "Map");
Assert.assertEquals(cm3.getParent(), "HashMap<String, Object>"); Assertions.assertEquals(cm3.getParent(), "HashMap<String, Object>");
Assert.assertEquals(cm3.getClassname(), "MapTest3"); Assertions.assertEquals(cm3.getClassname(), "MapTest3");
Schema other = openAPI.getComponents().getSchemas().get("OtherObj"); Schema other = openAPI.getComponents().getSchemas().get("OtherObj");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm = codegen.fromModel("OtherObj", other); CodegenModel cm = codegen.fromModel("OtherObj", other);
Assert.assertEquals(cm.getDataType(), "Object"); Assertions.assertEquals(cm.getDataType(), "Object");
Assert.assertEquals(cm.getClassname(), "OtherObj"); Assertions.assertEquals(cm.getClassname(), "OtherObj");
} }
/** /**
@ -949,7 +949,7 @@ public class JavaClientCodegenTest {
.setOutputDir(output.getAbsolutePath().replace("\\", "/")); .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
final ClientOptInput clientOptInput = configurator.toClientOptInput(); final ClientOptInput clientOptInput = configurator.toClientOptInput();
Assert.assertEquals( Assertions.assertEquals(
clientOptInput.getConfig().schemaMapping().get("TypeAlias"), "foo.bar.TypeAlias"); clientOptInput.getConfig().schemaMapping().get("TypeAlias"), "foo.bar.TypeAlias");
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
@ -964,7 +964,7 @@ public class JavaClientCodegenTest {
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
Assert.assertEquals(files.size(), 1); Assertions.assertEquals(files.size(), 1);
TestUtils.ensureContainsFile( TestUtils.ensureContainsFile(
files, output, "src/main/java/org/openapitools/client/model/ParentType.java"); files, output, "src/main/java/org/openapitools/client/model/ParentType.java");
@ -979,11 +979,11 @@ public class JavaClientCodegenTest {
final Pattern FIELD_PATTERN = Pattern.compile(".* private (.*?) typeAlias;.*", Pattern.DOTALL); final Pattern FIELD_PATTERN = Pattern.compile(".* private (.*?) typeAlias;.*", Pattern.DOTALL);
Matcher fieldMatcher = FIELD_PATTERN.matcher(parentTypeContents); Matcher fieldMatcher = FIELD_PATTERN.matcher(parentTypeContents);
Assert.assertTrue(fieldMatcher.matches()); Assertions.assertTrue(fieldMatcher.matches());
// this is the type of the field 'typeAlias'. With a working schemaMapping it should // this is the type of the field 'typeAlias'. With a working schemaMapping it should
// be 'foo.bar.TypeAlias' or just 'TypeAlias' // be 'foo.bar.TypeAlias' or just 'TypeAlias'
Assert.assertEquals(fieldMatcher.group(1), "foo.bar.TypeAlias"); Assertions.assertEquals(fieldMatcher.group(1), "foo.bar.TypeAlias");
} }
@Test @Test
@ -993,10 +993,10 @@ public class JavaClientCodegenTest {
JavaClientCodegen codegen = new JavaClientCodegen(); JavaClientCodegen codegen = new JavaClientCodegen();
List<CodegenSecurity> security = codegen.fromSecurity(openAPI.getComponents().getSecuritySchemes()); List<CodegenSecurity> security = codegen.fromSecurity(openAPI.getComponents().getSecuritySchemes());
Assert.assertEquals(security.size(), 1); Assertions.assertEquals(security.size(), 1);
Assert.assertEquals(security.get(0).isBasic, Boolean.TRUE); Assertions.assertEquals(security.get(0).isBasic, Boolean.TRUE);
Assert.assertEquals(security.get(0).isBasicBasic, Boolean.FALSE); Assertions.assertEquals(security.get(0).isBasicBasic, Boolean.FALSE);
Assert.assertEquals(security.get(0).isBasicBearer, Boolean.TRUE); Assertions.assertEquals(security.get(0).isBasicBearer, Boolean.TRUE);
} }
private CodegenProperty codegenPropertyWithArrayOfIntegerValues() { private CodegenProperty codegenPropertyWithArrayOfIntegerValues() {
@ -1049,135 +1049,135 @@ public class JavaClientCodegenTest {
Schema test1 = openAPI.getComponents().getSchemas().get("AnyValueModel"); Schema test1 = openAPI.getComponents().getSchemas().get("AnyValueModel");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm1 = codegen.fromModel("AnyValueModel", test1); CodegenModel cm1 = codegen.fromModel("AnyValueModel", test1);
Assert.assertEquals(cm1.getClassname(), "AnyValueModel"); Assertions.assertEquals(cm1.getClassname(), "AnyValueModel");
final CodegenProperty property1 = cm1.allVars.get(0); final CodegenProperty property1 = cm1.allVars.get(0);
Assert.assertEquals(property1.baseName, "any_value"); Assertions.assertEquals(property1.baseName, "any_value");
Assert.assertEquals(property1.dataType, "Object"); Assertions.assertEquals(property1.dataType, "Object");
Assert.assertTrue(property1.isPrimitiveType); Assertions.assertTrue(property1.isPrimitiveType);
Assert.assertFalse(property1.isContainer); Assertions.assertFalse(property1.isContainer);
Assert.assertFalse(property1.isFreeFormObject); Assertions.assertFalse(property1.isFreeFormObject);
Assert.assertTrue(property1.isAnyType); Assertions.assertTrue(property1.isAnyType);
final CodegenProperty property2 = cm1.allVars.get(1); final CodegenProperty property2 = cm1.allVars.get(1);
Assert.assertEquals(property2.baseName, "any_value_with_desc"); Assertions.assertEquals(property2.baseName, "any_value_with_desc");
Assert.assertEquals(property2.dataType, "Object"); Assertions.assertEquals(property2.dataType, "Object");
Assert.assertFalse(property2.required); Assertions.assertFalse(property2.required);
Assert.assertTrue(property2.isPrimitiveType); Assertions.assertTrue(property2.isPrimitiveType);
Assert.assertFalse(property2.isContainer); Assertions.assertFalse(property2.isContainer);
Assert.assertFalse(property2.isFreeFormObject); Assertions.assertFalse(property2.isFreeFormObject);
Assert.assertTrue(property2.isAnyType); Assertions.assertTrue(property2.isAnyType);
final CodegenProperty property3 = cm1.allVars.get(2); final CodegenProperty property3 = cm1.allVars.get(2);
Assert.assertEquals(property3.baseName, "any_value_nullable"); Assertions.assertEquals(property3.baseName, "any_value_nullable");
Assert.assertEquals(property3.dataType, "Object"); Assertions.assertEquals(property3.dataType, "Object");
Assert.assertFalse(property3.required); Assertions.assertFalse(property3.required);
Assert.assertTrue(property3.isPrimitiveType); Assertions.assertTrue(property3.isPrimitiveType);
Assert.assertFalse(property3.isContainer); Assertions.assertFalse(property3.isContainer);
Assert.assertFalse(property3.isFreeFormObject); Assertions.assertFalse(property3.isFreeFormObject);
Assert.assertTrue(property3.isAnyType); Assertions.assertTrue(property3.isAnyType);
Schema test2 = openAPI.getComponents().getSchemas().get("AnyValueModelInline"); Schema test2 = openAPI.getComponents().getSchemas().get("AnyValueModelInline");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
CodegenModel cm2 = codegen.fromModel("AnyValueModelInline", test2); CodegenModel cm2 = codegen.fromModel("AnyValueModelInline", test2);
Assert.assertEquals(cm2.getClassname(), "AnyValueModelInline"); Assertions.assertEquals(cm2.getClassname(), "AnyValueModelInline");
final CodegenProperty cp1 = cm2.vars.get(0); final CodegenProperty cp1 = cm2.vars.get(0);
Assert.assertEquals(cp1.baseName, "any_value"); Assertions.assertEquals(cp1.baseName, "any_value");
Assert.assertEquals(cp1.dataType, "Object"); Assertions.assertEquals(cp1.dataType, "Object");
Assert.assertFalse(cp1.required); Assertions.assertFalse(cp1.required);
Assert.assertTrue(cp1.isPrimitiveType); Assertions.assertTrue(cp1.isPrimitiveType);
Assert.assertFalse(cp1.isContainer); Assertions.assertFalse(cp1.isContainer);
Assert.assertFalse(cp1.isFreeFormObject); Assertions.assertFalse(cp1.isFreeFormObject);
Assert.assertTrue(cp1.isAnyType); Assertions.assertTrue(cp1.isAnyType);
final CodegenProperty cp2 = cm2.vars.get(1); final CodegenProperty cp2 = cm2.vars.get(1);
Assert.assertEquals(cp2.baseName, "any_value_with_desc"); Assertions.assertEquals(cp2.baseName, "any_value_with_desc");
Assert.assertEquals(cp2.dataType, "Object"); Assertions.assertEquals(cp2.dataType, "Object");
Assert.assertFalse(cp2.required); Assertions.assertFalse(cp2.required);
Assert.assertTrue(cp2.isPrimitiveType); Assertions.assertTrue(cp2.isPrimitiveType);
Assert.assertFalse(cp2.isContainer); Assertions.assertFalse(cp2.isContainer);
Assert.assertFalse(cp2.isFreeFormObject); Assertions.assertFalse(cp2.isFreeFormObject);
Assert.assertTrue(cp2.isAnyType); Assertions.assertTrue(cp2.isAnyType);
final CodegenProperty cp3 = cm2.vars.get(2); final CodegenProperty cp3 = cm2.vars.get(2);
Assert.assertEquals(cp3.baseName, "any_value_nullable"); Assertions.assertEquals(cp3.baseName, "any_value_nullable");
Assert.assertEquals(cp3.dataType, "Object"); Assertions.assertEquals(cp3.dataType, "Object");
Assert.assertFalse(cp3.required); Assertions.assertFalse(cp3.required);
Assert.assertTrue(cp3.isPrimitiveType); Assertions.assertTrue(cp3.isPrimitiveType);
Assert.assertFalse(cp3.isContainer); Assertions.assertFalse(cp3.isContainer);
Assert.assertFalse(cp3.isFreeFormObject); Assertions.assertFalse(cp3.isFreeFormObject);
Assert.assertTrue(cp3.isAnyType); Assertions.assertTrue(cp3.isAnyType);
// map // map
// Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp4 = cm2.vars.get(3); final CodegenProperty cp4 = cm2.vars.get(3);
Assert.assertEquals(cp4.baseName, "map_free_form_object"); Assertions.assertEquals(cp4.baseName, "map_free_form_object");
Assert.assertEquals(cp4.dataType, "Map<String, Object>"); Assertions.assertEquals(cp4.dataType, "Map<String, Object>");
Assert.assertFalse(cp4.required); Assertions.assertFalse(cp4.required);
Assert.assertTrue(cp4.isPrimitiveType); Assertions.assertTrue(cp4.isPrimitiveType);
Assert.assertTrue(cp4.isContainer); Assertions.assertTrue(cp4.isContainer);
Assert.assertTrue(cp4.isMap); Assertions.assertTrue(cp4.isMap);
Assert.assertTrue(cp4.isFreeFormObject); Assertions.assertTrue(cp4.isFreeFormObject);
Assert.assertFalse(cp4.isAnyType); Assertions.assertFalse(cp4.isAnyType);
Assert.assertFalse(cp4.isModel); Assertions.assertFalse(cp4.isModel);
// Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp5 = cm2.vars.get(4); final CodegenProperty cp5 = cm2.vars.get(4);
Assert.assertEquals(cp5.baseName, "map_any_value_with_desc"); Assertions.assertEquals(cp5.baseName, "map_any_value_with_desc");
Assert.assertEquals(cp5.dataType, "Map<String, Object>"); Assertions.assertEquals(cp5.dataType, "Map<String, Object>");
Assert.assertFalse(cp5.required); Assertions.assertFalse(cp5.required);
Assert.assertTrue(cp5.isPrimitiveType); Assertions.assertTrue(cp5.isPrimitiveType);
Assert.assertTrue(cp5.isContainer); Assertions.assertTrue(cp5.isContainer);
Assert.assertTrue(cp5.isMap); Assertions.assertTrue(cp5.isMap);
Assert.assertTrue(cp5.isFreeFormObject); Assertions.assertTrue(cp5.isFreeFormObject);
Assert.assertFalse(cp5.isAnyType); Assertions.assertFalse(cp5.isAnyType);
Assert.assertFalse(cp5.isModel); Assertions.assertFalse(cp5.isModel);
// Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including map, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp6 = cm2.vars.get(5); final CodegenProperty cp6 = cm2.vars.get(5);
Assert.assertEquals(cp6.baseName, "map_any_value_nullable"); Assertions.assertEquals(cp6.baseName, "map_any_value_nullable");
Assert.assertEquals(cp6.dataType, "Map<String, Object>"); Assertions.assertEquals(cp6.dataType, "Map<String, Object>");
Assert.assertFalse(cp6.required); Assertions.assertFalse(cp6.required);
Assert.assertTrue(cp6.isPrimitiveType); Assertions.assertTrue(cp6.isPrimitiveType);
Assert.assertTrue(cp6.isContainer); Assertions.assertTrue(cp6.isContainer);
Assert.assertTrue(cp6.isMap); Assertions.assertTrue(cp6.isMap);
Assert.assertTrue(cp6.isFreeFormObject); Assertions.assertTrue(cp6.isFreeFormObject);
Assert.assertFalse(cp6.isAnyType); Assertions.assertFalse(cp6.isAnyType);
// array // array
// Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp7 = cm2.vars.get(6); final CodegenProperty cp7 = cm2.vars.get(6);
Assert.assertEquals(cp7.baseName, "array_any_value"); Assertions.assertEquals(cp7.baseName, "array_any_value");
Assert.assertEquals(cp7.dataType, "List<Object>"); Assertions.assertEquals(cp7.dataType, "List<Object>");
Assert.assertFalse(cp7.required); Assertions.assertFalse(cp7.required);
Assert.assertTrue(cp7.isPrimitiveType); Assertions.assertTrue(cp7.isPrimitiveType);
Assert.assertTrue(cp7.isContainer); Assertions.assertTrue(cp7.isContainer);
Assert.assertTrue(cp7.isArray); Assertions.assertTrue(cp7.isArray);
Assert.assertFalse(cp7.isFreeFormObject); Assertions.assertFalse(cp7.isFreeFormObject);
Assert.assertFalse(cp7.isAnyType); Assertions.assertFalse(cp7.isAnyType);
// Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp8 = cm2.vars.get(7); final CodegenProperty cp8 = cm2.vars.get(7);
Assert.assertEquals(cp8.baseName, "array_any_value_with_desc"); Assertions.assertEquals(cp8.baseName, "array_any_value_with_desc");
Assert.assertEquals(cp8.dataType, "List<Object>"); Assertions.assertEquals(cp8.dataType, "List<Object>");
Assert.assertFalse(cp8.required); Assertions.assertFalse(cp8.required);
Assert.assertTrue(cp8.isPrimitiveType); Assertions.assertTrue(cp8.isPrimitiveType);
Assert.assertTrue(cp8.isContainer); Assertions.assertTrue(cp8.isContainer);
Assert.assertTrue(cp8.isArray); Assertions.assertTrue(cp8.isArray);
Assert.assertFalse(cp8.isFreeFormObject); Assertions.assertFalse(cp8.isFreeFormObject);
Assert.assertFalse(cp8.isAnyType); Assertions.assertFalse(cp8.isAnyType);
// Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603 // Should allow in any type including array, https://github.com/swagger-api/swagger-parser/issues/1603
final CodegenProperty cp9 = cm2.vars.get(8); final CodegenProperty cp9 = cm2.vars.get(8);
Assert.assertEquals(cp9.baseName, "array_any_value_nullable"); Assertions.assertEquals(cp9.baseName, "array_any_value_nullable");
Assert.assertEquals(cp9.dataType, "List<Object>"); Assertions.assertEquals(cp9.dataType, "List<Object>");
Assert.assertFalse(cp9.required); Assertions.assertFalse(cp9.required);
Assert.assertTrue(cp9.isPrimitiveType); Assertions.assertTrue(cp9.isPrimitiveType);
Assert.assertTrue(cp9.isContainer); Assertions.assertTrue(cp9.isContainer);
Assert.assertTrue(cp9.isArray); Assertions.assertTrue(cp9.isArray);
Assert.assertFalse(cp9.isFreeFormObject); Assertions.assertFalse(cp9.isFreeFormObject);
Assert.assertFalse(cp9.isAnyType); Assertions.assertFalse(cp9.isAnyType);
} }
/** /**
@ -1329,7 +1329,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 49); Assertions.assertEquals(files.size(), 49);
TestUtils.ensureContainsFile( TestUtils.ensureContainsFile(
files, output, "src/main/java/org/openapitools/client/model/RealCommand.java"); files, output, "src/main/java/org/openapitools/client/model/RealCommand.java");
TestUtils.ensureContainsFile( TestUtils.ensureContainsFile(
@ -1624,7 +1624,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 35); Assertions.assertEquals(files.size(), 35);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
TestUtils.assertFileContains( TestUtils.assertFileContains(
@ -1655,7 +1655,7 @@ public class JavaClientCodegenTest {
DefaultGenerator generator = new DefaultGenerator(); DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 38); Assertions.assertEquals(files.size(), 38);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
TestUtils.assertFileContains( TestUtils.assertFileContains(
@ -2126,7 +2126,7 @@ public class JavaClientCodegenTest {
generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
List<File> files = generator.opts(clientOptInput).generate(); List<File> files = generator.opts(clientOptInput).generate();
Assert.assertEquals(files.size(), 27); Assertions.assertEquals(files.size(), 27);
validateJavaSourceFiles(files); validateJavaSourceFiles(files);
TestUtils.assertFileContains( TestUtils.assertFileContains(
@ -2464,12 +2464,12 @@ public class JavaClientCodegenTest {
CodegenModel cm1 = codegen.fromModel("Cat", test1); CodegenModel cm1 = codegen.fromModel("Cat", test1);
CodegenProperty cp0 = cm1.getAllVars().get(0); CodegenProperty cp0 = cm1.getAllVars().get(0);
Assert.assertEquals(cp0.getName(), "petType"); Assertions.assertEquals(cp0.getName(), "petType");
Assert.assertEquals(cp0.isOverridden, true); Assertions.assertEquals(cp0.isOverridden, true);
CodegenProperty cp1 = cm1.getAllVars().get(1); CodegenProperty cp1 = cm1.getAllVars().get(1);
Assert.assertEquals(cp1.getName(), "name"); Assertions.assertEquals(cp1.getName(), "name");
Assert.assertEquals(cp1.isOverridden, false); Assertions.assertEquals(cp1.isOverridden, false);
} }
@Test @Test
@ -2997,7 +2997,7 @@ public class JavaClientCodegenTest {
File apiFile = files.get("HelloExampleApi.java"); File apiFile = files.get("HelloExampleApi.java");
assertNotNull(apiFile); Assertions.assertNotNull(apiFile);
JavaFileAssert.assertThat(apiFile) JavaFileAssert.assertThat(apiFile)
.assertMethod("helloCall", "String", "ApiCallback") .assertMethod("helloCall", "String", "ApiCallback")
.bodyContainsLines( .bodyContainsLines(
@ -3121,12 +3121,12 @@ public class JavaClientCodegenTest {
// enum // enum
File modelFile = files.get("Metadata.java"); File modelFile = files.get("Metadata.java");
assertNotNull(modelFile); Assertions.assertNotNull(modelFile);
JavaFileAssert.assertThat(modelFile).fileContains(expectedEnumLines); JavaFileAssert.assertThat(modelFile).fileContains(expectedEnumLines);
// Inner enum // Inner enum
File apiFile = files.get("V1SchemasGetDefaultResponse.java"); File apiFile = files.get("V1SchemasGetDefaultResponse.java");
assertNotNull(apiFile); Assertions.assertNotNull(apiFile);
JavaFileAssert.assertThat(apiFile).fileContains(expectedInnerEnumLines); JavaFileAssert.assertThat(apiFile).fileContains(expectedInnerEnumLines);
} }

8
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenPackagePrefixTest.java
View File

@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
@ -76,10 +76,10 @@ public class JavaHelidonCommonCodegenPackagePrefixTest {
String explicitPrefix, String explicitPrefix,
String generatorName, String generatorName,
String libraryName) { String libraryName) {
IllegalArgumentException e = Assert.assertThrows(IllegalArgumentException.class, IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class,
() -> runTest(explicitHelidonVersion, explicitPrefix, generatorName, libraryName)); () -> runTest(explicitHelidonVersion, explicitPrefix, generatorName, libraryName));
Assert.assertTrue("Exception message '" + e.getMessage() + "' contains '" + EXCEPTION_MESSAGE_FRAGMENT + "'", Assertions.assertTrue(e.getMessage().contains(EXCEPTION_MESSAGE_FRAGMENT),
e.getMessage().contains(EXCEPTION_MESSAGE_FRAGMENT)); "Exception message '" + e.getMessage() + "' contains '" + EXCEPTION_MESSAGE_FRAGMENT + "'");
} }
@DataProvider(name = "valid") @DataProvider(name = "valid")

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/helidon/JavaHelidonCommonCodegenTest.java
View File

@ -26,7 +26,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
@ -77,8 +77,8 @@ public class JavaHelidonCommonCodegenTest {
@Test @Test
public void bothNotEqualsVersionTest() { public void bothNotEqualsVersionTest() {
IllegalArgumentException e = Assert.assertThrows(IllegalArgumentException.class,() -> runVersionTest("1.0.0", "2.0.0")); IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class,() -> runVersionTest("1.0.0", "2.0.0"));
Assert.assertEquals( Assertions.assertEquals(
"Both parentVersion and helidonVersion properties were set with different value.", "Both parentVersion and helidonVersion properties were set with different value.",
e.getMessage()); e.getMessage());
} }

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/jetbrains/http/client/JetbrainsHttpClientClientCodegenTest.java
View File

@ -1,7 +1,7 @@
package org.openapitools.codegen.jetbrains.http.client; package org.openapitools.codegen.jetbrains.http.client;
import org.junit.Ignore; import org.junit.jupiter.api.Disabled;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.languages.JetbrainsHttpClientClientCodegen; import org.openapitools.codegen.languages.JetbrainsHttpClientClientCodegen;
@ -403,7 +403,7 @@ public class JetbrainsHttpClientClientCodegenTest {
} }
@Test @Test
@Ignore // For some reason this test fails during Docker image generation. Investigate one day. @Disabled // For some reason this test fails during Docker image generation. Investigate one day.
public void testBasicGenerationMultipleRequests() throws IOException { public void testBasicGenerationMultipleRequests() throws IOException {
// Checking that each request example is present in the output file // Checking that each request example is present in the output file
File output = Files.createTempDirectory("jetbrainstest_").toFile(); File output = Files.createTempDirectory("jetbrainstest_").toFile();

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/n4js/N4jsClientCodegenOptionsTest.java
View File

@ -1,7 +1,7 @@
package org.openapitools.codegen.n4js; package org.openapitools.codegen.n4js;
import static java.lang.Boolean.parseBoolean; import static java.lang.Boolean.parseBoolean;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.openapitools.codegen.CodegenConstants.API_NAME_PREFIX; import static org.openapitools.codegen.CodegenConstants.API_NAME_PREFIX;
import static org.openapitools.codegen.CodegenConstants.API_PACKAGE; import static org.openapitools.codegen.CodegenConstants.API_PACKAGE;

18
modules/openapi-generator/src/test/java/org/openapitools/codegen/postman/PostmanCollectionCodegenTest.java
View File

@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import io.swagger.v3.oas.models.tags.Tag; import io.swagger.v3.oas.models.tags.Tag;
import org.junit.Assert;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.languages.PostmanCollectionCodegen; import org.openapitools.codegen.languages.PostmanCollectionCodegen;
@ -22,8 +21,7 @@ import java.util.Arrays;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.*;
import static org.junit.Assert.assertTrue;
import static org.openapitools.codegen.TestUtils.*; import static org.openapitools.codegen.TestUtils.*;
public class PostmanCollectionCodegenTest { public class PostmanCollectionCodegenTest {
@ -33,11 +31,11 @@ public class PostmanCollectionCodegenTest {
final PostmanCollectionCodegen postmanCollectionCodegen = new PostmanCollectionCodegen(); final PostmanCollectionCodegen postmanCollectionCodegen = new PostmanCollectionCodegen();
postmanCollectionCodegen.processOpts(); postmanCollectionCodegen.processOpts();
Assert.assertEquals(postmanCollectionCodegen.folderStrategy, "Tags"); assertEquals(postmanCollectionCodegen.folderStrategy, "Tags");
Assert.assertEquals(postmanCollectionCodegen.postmanFile, "postman.json"); assertEquals(postmanCollectionCodegen.postmanFile, "postman.json");
Assert.assertNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsList")); assertNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsList"));
Assert.assertNotNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsByTag")); assertNotNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsByTag"));
} }
@Test @Test
@ -47,10 +45,10 @@ public class PostmanCollectionCodegenTest {
postmanCollectionCodegen.additionalProperties().put(postmanCollectionCodegen.FOLDER_STRATEGY, "Tags"); postmanCollectionCodegen.additionalProperties().put(postmanCollectionCodegen.FOLDER_STRATEGY, "Tags");
postmanCollectionCodegen.processOpts(); postmanCollectionCodegen.processOpts();
Assert.assertEquals(postmanCollectionCodegen.folderStrategy, "Tags"); assertEquals(postmanCollectionCodegen.folderStrategy, "Tags");
Assert.assertNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsList")); assertNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsList"));
Assert.assertNotNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsByTag")); assertNotNull(postmanCollectionCodegen.additionalProperties().get("codegenOperationsByTag"));
} }
@Test @Test

3
modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java
View File

@ -17,7 +17,7 @@
package org.openapitools.codegen.python; package org.openapitools.codegen.python;
import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser; import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
@ -31,7 +31,6 @@ import org.openapitools.codegen.languages.features.CXFServerFeatures;
import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.assertFileExists; import static org.openapitools.codegen.TestUtils.assertFileExists;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.java.assertions.JavaFileAssert;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import java.io.File; import java.io.File;

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/templating/mustache/IndentedLambdaTest.java
View File

@ -1,6 +1,6 @@
package org.openapitools.codegen.templating.mustache; package org.openapitools.codegen.templating.mustache;
import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Map; import java.util.Map;

1
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java
View File

@ -9,7 +9,6 @@ import io.swagger.v3.oas.models.media.StringSchema;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;

10
pom.xml
View File

@ -1183,8 +1183,8 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -1214,7 +1214,7 @@
<properties> <properties>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<archunit.version>0.23.1</archunit.version> <archunit.version>1.3.0</archunit.version>
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version> <checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<commons-cli.version>1.5.0</commons-cli.version> <commons-cli.version>1.5.0</commons-cli.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
@ -1231,7 +1231,7 @@
<jackson.version>2.15.3</jackson.version> <jackson.version>2.15.3</jackson.version>
<jacoco.version>0.8.10</jacoco.version> <jacoco.version>0.8.10</jacoco.version>
<jmustache.version>1.15</jmustache.version> <jmustache.version>1.15</jmustache.version>
<junit.version>4.13.2</junit.version> <junit.version>5.10.2</junit.version>
<kotlin.version>1.6.21</kotlin.version> <kotlin.version>1.6.21</kotlin.version>
<kotlin-compiler-embeddable.version>1.6.21</kotlin-compiler-embeddable.version> <kotlin-compiler-embeddable.version>1.6.21</kotlin-compiler-embeddable.version>
<lombok.version>1.18.30</lombok.version> <lombok.version>1.18.30</lombok.version>
@ -1242,7 +1242,7 @@
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version> <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version> <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-site-plugin.version>4.0.0-M8</maven-site-plugin.version> <maven-site-plugin.version>4.0.0-M8</maven-site-plugin.version>
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version> <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<mockito.version>4.10.0</mockito.version> <mockito.version>4.10.0</mockito.version>
<openrewrite.version>8.8.3</openrewrite.version> <openrewrite.version>8.8.3</openrewrite.version>
<pmd-plugin.version>3.12.0</pmd-plugin.version> <pmd-plugin.version>3.12.0</pmd-plugin.version>

2
samples/meta-codegen/lib/src/test/java/com/my/company/codegen/MyclientcodegenGeneratorTest.java
View File

@ -1,6 +1,6 @@
package com.my.company.codegen; package com.my.company.codegen;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.openapitools.codegen.ClientOptInput; import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.config.CodegenConfigurator; import org.openapitools.codegen.config.CodegenConfigurator;