[java] update rest-assured, retrofit2, vertx to use junit 5 (#19185)

* update rest assured to use junit 5

* regenerate samples

* update junit from 4 to 5 for retrofit2, vertx

* update vertx test template

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache

@@ -8,9 +8,9 @@ import {{invokerPackage}}.ApiClient;
 import {{apiPackage}}.{{classname}};
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -31,12 +31,12 @@ import static {{invokerPackage}}.{{#gson}}GsonObjectMapper.gson{{/gson}}{{#jacks
 /**
  * API tests for {{classname}}
  */
-@Ignore
+@Disabled
 public class {{classname}}Test {
 
     private {{classname}} api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache

@@ -104,14 +104,13 @@ ext {
     swagger_annotations_version = "2.2.15"
     {{/swagger2AnnotationLibrary}}
     rest_assured_version = "5.3.2"
-    junit_version = "4.13.2"
+    junit_version = "5.10.3"
 {{#jackson}}
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.6"
     {{/openApiNullable}}
-    jakarta_annotation_version = "1.3.5"
 {{/jackson}}
 {{#gson}}
     gson_version = "2.10.1"
@@ -121,6 +120,7 @@ ext {
     jodatime_version = "2.10.5"
 {{/joda}}
     okio_version = "3.6.0"
+    jakarta_annotation_version = "1.3.5"
 }
 
 dependencies {
@@ -163,5 +163,5 @@ dependencies {
     implementation "org.hibernate:hibernate-validator:6.0.19.Final"
 {{/performBeanValidation}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache

@@ -43,7 +43,7 @@ lazy val root = (project in file(".")).
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
 {{/performBeanValidation}}
     "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "junit" % "junit" % "4.13.2" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache

@@ -331,8 +331,8 @@
         {{/performBeanValidation}}
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -366,6 +366,6 @@
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useBeanValidation}}
         <okio-version>3.6.0</okio-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.3</junit-version>
     </properties>
 </project>

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache

@@ -3,8 +3,9 @@ package {{package}};
 import {{invokerPackage}}.ApiClient;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -25,7 +26,7 @@ public class {{classname}}Test {
 
     private {{classname}} api;
 
-    @Before
+    @BeforeEach
     public void setup() {
         api = new ApiClient().createService({{classname}}.class);
     }

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

@@ -112,7 +112,7 @@ ext {
     {{/usePlayWS}}
     jakarta_annotation_version = "1.3.5"
     swagger_annotations_version = "1.5.22"
-    junit_version = "4.13.2"
+    junit_version = "5.10.3"
     {{#useRxJava2}}
     rx_java_version = "2.1.1"
     {{/useRxJava2}}
@@ -162,5 +162,5 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     {{/jackson}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache

@@ -37,7 +37,7 @@ lazy val root = (project in file(".")).
       {{/joda}}
       "io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "junit" % "junit" % "4.13.2" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
   )

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -367,8 +367,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -413,6 +413,6 @@
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useBeanValidation}}
         <oltu-version>1.0.1</oltu-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.3</junit-version>
     </properties>
 </project>

modules/openapi-generator/src/main/resources/Java/libraries/vertx/api_test.mustache

@@ -6,11 +6,10 @@ package {{package}};
 
 import {{invokerPackage}}.Configuration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
-import org.junit.Ignore;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Rule;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
@@ -31,24 +30,18 @@ import java.util.Map;
 /**
  * API tests for {{classname}}
  */
-@RunWith(VertxUnitRunner.class)
+@Disabled
-@Ignore
 public class {{classname}}Test {
 
     private {{classname}} api;
 
-    @Rule
+    @BeforeAll
-    public RunTestOnContext rule = new RunTestOnContext();
-
-    @BeforeClass
     public void setupApiClient() {
-        JsonObject config = new JsonObject();
-        Vertx vertx = rule.vertx();
-        Configuration.setupDefaultApiClient(vertx, config);
-
         api = new {{classname}}Impl();
     }
-    {{#operations}}{{#operation}}
+
+    {{#operations}}
+    {{#operation}}
     /**
      * {{summary}}
      * {{notes}}
@@ -66,5 +59,6 @@ public class {{classname}}Test {
             async.complete();
         });
     }
-    {{/operation}}{{/operations}}
+    {{/operation}}
+    {{/operations}}
 }

modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache

@@ -33,7 +33,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     vertx_version = "3.5.2"
-    junit_version = "4.13.2"
+    junit_version = "5.10.3"
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.6"
     {{/openApiNullable}}
@@ -56,6 +56,6 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     {{/openApiNullable}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testImplementation "io.vertx:vertx-unit:$vertx_version"
 }

modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache

@@ -284,8 +284,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -315,6 +315,6 @@
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         {{/useJakartaEe}}
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.3</junit-version>
     </properties>
 </project>

samples/client/petstore/java/rest-assured-jackson/build.gradle

@@ -98,12 +98,12 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     rest_assured_version = "5.3.2"
-    junit_version = "4.13.2"
+    junit_version = "5.10.3"
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    jakarta_annotation_version = "1.3.5"
     okio_version = "3.6.0"
+    jakarta_annotation_version = "1.3.5"
 }
 
 dependencies {
@@ -119,5 +119,5 @@ dependencies {
     implementation "jakarta.validation:jakarta.validation-api:3.0.2"
     implementation "org.hibernate:hibernate-validator:6.0.19.Final"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

samples/client/petstore/java/rest-assured-jackson/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile",
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
     "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "junit" % "junit" % "4.13.2" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )

samples/client/petstore/java/rest-assured-jackson/pom.xml

@@ -269,8 +269,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -286,6 +286,6 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
         <okio-version>3.6.0</okio-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.3</junit-version>
     </properties>
 </project>

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java

@@ -14,18 +14,25 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Client;
+import java.util.UUID;
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.AnotherFakeApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -33,12 +40,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for AnotherFakeApi
  */
-@Ignore
+@Disabled
 public class AnotherFakeApiTest {
 
     private AnotherFakeApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -52,10 +59,12 @@ public class AnotherFakeApiTest {
      */
     @Test
     public void shouldSee200AfterCall123testSpecialTags() {
+        String uuidTest = null;
         Client body = null;
         api.call123testSpecialTags()
+                .uuidTestHeader(uuidTest)
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java

@@ -26,14 +26,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.FakeApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -41,12 +47,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for FakeApi
  */
-@Ignore
+@Disabled
 public class FakeApiTest {
 
     private FakeApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -303,4 +309,4 @@ public class FakeApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java

@@ -18,14 +18,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.FakeClassnameTags123Api;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -33,12 +39,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for FakeClassnameTags123Api
  */
-@Ignore
+@Disabled
 public class FakeClassnameTags123ApiTest {
 
     private FakeClassnameTags123Api api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -58,4 +64,4 @@ public class FakeClassnameTags123ApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -21,14 +21,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.PetApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -36,12 +42,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
 public class PetApiTest {
 
     private PetApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -244,7 +250,7 @@ public class PetApiTest {
     public void shouldSee200AfterUploadFile() {
         Long petId = null;
         String additionalMetadata = null;
-        File file = null;
+        File _file = null;
         api.uploadFile()
                 .petIdPath(petId).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -265,4 +271,4 @@ public class PetApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -18,14 +18,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.StoreApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -33,12 +39,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
 public class StoreApiTest {
 
     private StoreApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -136,4 +142,4 @@ public class StoreApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -13,19 +13,26 @@
 
 package org.openapitools.client.api;
 
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.UserApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.JacksonObjectMapper.jackson;
@@ -33,12 +40,12 @@ import static org.openapitools.client.JacksonObjectMapper.jackson;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
 public class UserApiTest {
 
     private UserApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -64,7 +71,7 @@ public class UserApiTest {
      */
     @Test
     public void shouldSee0AfterCreateUsersWithArrayInput() {
-        List<User> body = null;
+        List<@Valid User> body = null;
         api.createUsersWithArrayInput()
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -76,7 +83,7 @@ public class UserApiTest {
      */
     @Test
     public void shouldSee0AfterCreateUsersWithListInput() {
-        List<User> body = null;
+        List<@Valid User> body = null;
         api.createUsersWithListInput()
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -203,4 +210,4 @@ public class UserApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesAnyType
  */
-public class AdditionalPropertiesAnyTypeTest {
+class AdditionalPropertiesAnyTypeTest {
     private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
 
     /**
      * Model tests for AdditionalPropertiesAnyType
      */
     @Test
-    public void testAdditionalPropertiesAnyType() {
+    void testAdditionalPropertiesAnyType() {
         // TODO: test AdditionalPropertiesAnyType
     }
 
@@ -43,7 +42,7 @@ public class AdditionalPropertiesAnyTypeTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java

@@ -21,22 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesArray
  */
-public class AdditionalPropertiesArrayTest {
+class AdditionalPropertiesArrayTest {
     private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
 
     /**
      * Model tests for AdditionalPropertiesArray
      */
     @Test
-    public void testAdditionalPropertiesArray() {
+    void testAdditionalPropertiesArray() {
         // TODO: test AdditionalPropertiesArray
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesArrayTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesBoolean
  */
-public class AdditionalPropertiesBooleanTest {
+class AdditionalPropertiesBooleanTest {
     private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
 
     /**
      * Model tests for AdditionalPropertiesBoolean
      */
     @Test
-    public void testAdditionalPropertiesBoolean() {
+    void testAdditionalPropertiesBoolean() {
         // TODO: test AdditionalPropertiesBoolean
     }
 
@@ -43,7 +42,7 @@ public class AdditionalPropertiesBooleanTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java

@@ -22,22 +22,21 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesClass
  */
-public class AdditionalPropertiesClassTest {
+class AdditionalPropertiesClassTest {
     private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
 
     /**
      * Model tests for AdditionalPropertiesClass
      */
     @Test
-    public void testAdditionalPropertiesClass() {
+    void testAdditionalPropertiesClass() {
         // TODO: test AdditionalPropertiesClass
     }
 
@@ -45,7 +44,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapString'
      */
     @Test
-    public void mapStringTest() {
+    void mapStringTest() {
         // TODO: test mapString
     }
 
@@ -53,7 +52,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapNumber'
      */
     @Test
-    public void mapNumberTest() {
+    void mapNumberTest() {
         // TODO: test mapNumber
     }
 
@@ -61,7 +60,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapInteger'
      */
     @Test
-    public void mapIntegerTest() {
+    void mapIntegerTest() {
         // TODO: test mapInteger
     }
 
@@ -69,7 +68,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapBoolean'
      */
     @Test
-    public void mapBooleanTest() {
+    void mapBooleanTest() {
         // TODO: test mapBoolean
     }
 
@@ -77,7 +76,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayInteger'
      */
     @Test
-    public void mapArrayIntegerTest() {
+    void mapArrayIntegerTest() {
         // TODO: test mapArrayInteger
     }
 
@@ -85,7 +84,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayAnytype'
      */
     @Test
-    public void mapArrayAnytypeTest() {
+    void mapArrayAnytypeTest() {
         // TODO: test mapArrayAnytype
     }
 
@@ -93,7 +92,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapString'
      */
     @Test
-    public void mapMapStringTest() {
+    void mapMapStringTest() {
         // TODO: test mapMapString
     }
 
@@ -101,7 +100,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapAnytype'
      */
     @Test
-    public void mapMapAnytypeTest() {
+    void mapMapAnytypeTest() {
         // TODO: test mapMapAnytype
     }
 
@@ -109,7 +108,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype1'
      */
     @Test
-    public void anytype1Test() {
+    void anytype1Test() {
         // TODO: test anytype1
     }
 
@@ -117,7 +116,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype2'
      */
     @Test
-    public void anytype2Test() {
+    void anytype2Test() {
         // TODO: test anytype2
     }
 
@@ -125,7 +124,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype3'
      */
     @Test
-    public void anytype3Test() {
+    void anytype3Test() {
         // TODO: test anytype3
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesInteger
  */
-public class AdditionalPropertiesIntegerTest {
+class AdditionalPropertiesIntegerTest {
     private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
 
     /**
      * Model tests for AdditionalPropertiesInteger
      */
     @Test
-    public void testAdditionalPropertiesInteger() {
+    void testAdditionalPropertiesInteger() {
         // TODO: test AdditionalPropertiesInteger
     }
 
@@ -43,7 +42,7 @@ public class AdditionalPropertiesIntegerTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java

@@ -21,22 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesNumber
  */
-public class AdditionalPropertiesNumberTest {
+class AdditionalPropertiesNumberTest {
     private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
 
     /**
      * Model tests for AdditionalPropertiesNumber
      */
     @Test
-    public void testAdditionalPropertiesNumber() {
+    void testAdditionalPropertiesNumber() {
         // TODO: test AdditionalPropertiesNumber
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesNumberTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesObject
  */
-public class AdditionalPropertiesObjectTest {
+class AdditionalPropertiesObjectTest {
     private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
 
     /**
      * Model tests for AdditionalPropertiesObject
      */
     @Test
-    public void testAdditionalPropertiesObject() {
+    void testAdditionalPropertiesObject() {
         // TODO: test AdditionalPropertiesObject
     }
 
@@ -43,7 +42,7 @@ public class AdditionalPropertiesObjectTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesString
  */
-public class AdditionalPropertiesStringTest {
+class AdditionalPropertiesStringTest {
     private final AdditionalPropertiesString model = new AdditionalPropertiesString();
 
     /**
      * Model tests for AdditionalPropertiesString
      */
     @Test
-    public void testAdditionalPropertiesString() {
+    void testAdditionalPropertiesString() {
         // TODO: test AdditionalPropertiesString
     }
 
@@ -43,7 +42,7 @@ public class AdditionalPropertiesStringTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/AnimalTest.java

@@ -21,25 +21,21 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.openapitools.client.model.BigCat;
+import org.junit.jupiter.api.Assertions;
-import org.openapitools.client.model.Cat;
+import org.junit.jupiter.api.Disabled;
-import org.openapitools.client.model.Dog;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
 
 /**
  * Model tests for Animal
  */
-public class AnimalTest {
+class AnimalTest {
     private final Animal model = new Animal();
 
     /**
      * Model tests for Animal
      */
     @Test
-    public void testAnimal() {
+    void testAnimal() {
         // TODO: test Animal
     }
 
@@ -47,7 +43,7 @@ public class AnimalTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -55,7 +51,7 @@ public class AnimalTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java

@@ -20,23 +20,23 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayOfArrayOfNumberOnly
  */
-public class ArrayOfArrayOfNumberOnlyTest {
+class ArrayOfArrayOfNumberOnlyTest {
     private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfArrayOfNumberOnly() {
+    void testArrayOfArrayOfNumberOnly() {
         // TODO: test ArrayOfArrayOfNumberOnly
     }
 
@@ -44,7 +44,7 @@ public class ArrayOfArrayOfNumberOnlyTest {
      * Test the property 'arrayArrayNumber'
      */
     @Test
-    public void arrayArrayNumberTest() {
+    void arrayArrayNumberTest() {
         // TODO: test arrayArrayNumber
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java

@@ -20,23 +20,23 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayOfNumberOnly
  */
-public class ArrayOfNumberOnlyTest {
+class ArrayOfNumberOnlyTest {
     private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfNumberOnly() {
+    void testArrayOfNumberOnly() {
         // TODO: test ArrayOfNumberOnly
     }
 
@@ -44,7 +44,7 @@ public class ArrayOfNumberOnlyTest {
      * Test the property 'arrayNumber'
      */
     @Test
-    public void arrayNumberTest() {
+    void arrayNumberTest() {
         // TODO: test arrayNumber
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ArrayTestTest.java

@@ -19,24 +19,24 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayTest
  */
-public class ArrayTestTest {
+class ArrayTestTest {
     private final ArrayTest model = new ArrayTest();
 
     /**
      * Model tests for ArrayTest
      */
     @Test
-    public void testArrayTest() {
+    void testArrayTest() {
         // TODO: test ArrayTest
     }
 
@@ -44,7 +44,7 @@ public class ArrayTestTest {
      * Test the property 'arrayOfString'
      */
     @Test
-    public void arrayOfStringTest() {
+    void arrayOfStringTest() {
         // TODO: test arrayOfString
     }
 
@@ -52,7 +52,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfInteger'
      */
     @Test
-    public void arrayArrayOfIntegerTest() {
+    void arrayArrayOfIntegerTest() {
         // TODO: test arrayArrayOfInteger
     }
 
@@ -60,7 +60,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfModel'
      */
     @Test
-    public void arrayArrayOfModelTest() {
+    void arrayArrayOfModelTest() {
         // TODO: test arrayArrayOfModel
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/BigCatTest.java

@@ -22,21 +22,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Cat;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for BigCat
  */
-public class BigCatTest {
+class BigCatTest {
     private final BigCat model = new BigCat();
 
     /**
      * Model tests for BigCat
      */
     @Test
-    public void testBigCat() {
+    void testBigCat() {
         // TODO: test BigCat
     }
 
@@ -44,7 +44,7 @@ public class BigCatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -52,7 +52,7 @@ public class BigCatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -60,7 +60,7 @@ public class BigCatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 
@@ -68,7 +68,7 @@ public class BigCatTest {
      * Test the property 'kind'
      */
     @Test
-    public void kindTest() {
+    void kindTest() {
         // TODO: test kind
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/CapitalizationTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Capitalization
  */
-public class CapitalizationTest {
+class CapitalizationTest {
     private final Capitalization model = new Capitalization();
 
     /**
      * Model tests for Capitalization
      */
     @Test
-    public void testCapitalization() {
+    void testCapitalization() {
         // TODO: test Capitalization
     }
 
@@ -41,7 +40,7 @@ public class CapitalizationTest {
      * Test the property 'smallCamel'
      */
     @Test
-    public void smallCamelTest() {
+    void smallCamelTest() {
         // TODO: test smallCamel
     }
 
@@ -49,7 +48,7 @@ public class CapitalizationTest {
      * Test the property 'capitalCamel'
      */
     @Test
-    public void capitalCamelTest() {
+    void capitalCamelTest() {
         // TODO: test capitalCamel
     }
 
@@ -57,7 +56,7 @@ public class CapitalizationTest {
      * Test the property 'smallSnake'
      */
     @Test
-    public void smallSnakeTest() {
+    void smallSnakeTest() {
         // TODO: test smallSnake
     }
 
@@ -65,7 +64,7 @@ public class CapitalizationTest {
      * Test the property 'capitalSnake'
      */
     @Test
-    public void capitalSnakeTest() {
+    void capitalSnakeTest() {
         // TODO: test capitalSnake
     }
 
@@ -73,7 +72,7 @@ public class CapitalizationTest {
      * Test the property 'scAETHFlowPoints'
      */
     @Test
-    public void scAETHFlowPointsTest() {
+    void scAETHFlowPointsTest() {
         // TODO: test scAETHFlowPoints
     }
 
@@ -81,7 +80,7 @@ public class CapitalizationTest {
      * Test the property 'ATT_NAME'
      */
     @Test
-    public void ATT_NAMETest() {
+    void ATT_NAMETest() {
         // TODO: test ATT_NAME
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/CatTest.java

@@ -22,23 +22,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Assert;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
-
 
 /**
  * Model tests for Cat
  */
-public class CatTest {
+class CatTest {
     private final Cat model = new Cat();
 
     /**
      * Model tests for Cat
      */
     @Test
-    public void testCat() {
+    void testCat() {
         // TODO: test Cat
     }
 
@@ -46,7 +44,7 @@ public class CatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -54,7 +52,7 @@ public class CatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -62,7 +60,7 @@ public class CatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -41,7 +40,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ClassModelTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ClassModel
  */
-public class ClassModelTest {
+class ClassModelTest {
     private final ClassModel model = new ClassModel();
 
     /**
      * Model tests for ClassModel
      */
     @Test
-    public void testClassModel() {
+    void testClassModel() {
         // TODO: test ClassModel
     }
 
@@ -41,7 +40,7 @@ public class ClassModelTest {
      * Test the property 'propertyClass'
      */
     @Test
-    public void propertyClassTest() {
+    void propertyClassTest() {
         // TODO: test propertyClass
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ClientTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Client
  */
-public class ClientTest {
+class ClientTest {
     private final Client model = new Client();
 
     /**
      * Model tests for Client
      */
     @Test
-    public void testClient() {
+    void testClient() {
         // TODO: test Client
     }
 
@@ -41,7 +40,7 @@ public class ClientTest {
      * Test the property 'client'
      */
     @Test
-    public void clientTest() {
+    void clientTest() {
         // TODO: test client
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/DogTest.java

@@ -22,22 +22,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Dog
  */
-public class DogTest {
+class DogTest {
     private final Dog model = new Dog();
 
     /**
      * Model tests for Dog
      */
     @Test
-    public void testDog() {
+    void testDog() {
         // TODO: test Dog
     }
 
@@ -45,7 +44,7 @@ public class DogTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -53,7 +52,7 @@ public class DogTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -61,7 +60,7 @@ public class DogTest {
      * Test the property 'breed'
      */
     @Test
-    public void breedTest() {
+    void breedTest() {
         // TODO: test breed
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/EnumArraysTest.java

@@ -19,23 +19,23 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumArrays
  */
-public class EnumArraysTest {
+class EnumArraysTest {
     private final EnumArrays model = new EnumArrays();
 
     /**
      * Model tests for EnumArrays
      */
     @Test
-    public void testEnumArrays() {
+    void testEnumArrays() {
         // TODO: test EnumArrays
     }
 
@@ -43,7 +43,7 @@ public class EnumArraysTest {
      * Test the property 'justSymbol'
      */
     @Test
-    public void justSymbolTest() {
+    void justSymbolTest() {
         // TODO: test justSymbol
     }
 
@@ -51,7 +51,7 @@ public class EnumArraysTest {
      * Test the property 'arrayEnum'
      */
     @Test
-    public void arrayEnumTest() {
+    void arrayEnumTest() {
         // TODO: test arrayEnum
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/EnumClassTest.java

@@ -13,20 +13,19 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumClass
  */
-public class EnumClassTest {
+class EnumClassTest {
     /**
      * Model tests for EnumClass
      */
     @Test
-    public void testEnumClass() {
+    void testEnumClass() {
         // TODO: test EnumClass
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/EnumTestTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumTest
  */
-public class EnumTestTest {
+class EnumTestTest {
     private final EnumTest model = new EnumTest();
 
     /**
      * Model tests for EnumTest
      */
     @Test
-    public void testEnumTest() {
+    void testEnumTest() {
         // TODO: test EnumTest
     }
 
@@ -42,7 +41,7 @@ public class EnumTestTest {
      * Test the property 'enumString'
      */
     @Test
-    public void enumStringTest() {
+    void enumStringTest() {
         // TODO: test enumString
     }
 
@@ -50,7 +49,7 @@ public class EnumTestTest {
      * Test the property 'enumStringRequired'
      */
     @Test
-    public void enumStringRequiredTest() {
+    void enumStringRequiredTest() {
         // TODO: test enumStringRequired
     }
 
@@ -58,7 +57,7 @@ public class EnumTestTest {
      * Test the property 'enumInteger'
      */
     @Test
-    public void enumIntegerTest() {
+    void enumIntegerTest() {
         // TODO: test enumInteger
     }
 
@@ -66,7 +65,7 @@ public class EnumTestTest {
      * Test the property 'enumNumber'
      */
     @Test
-    public void enumNumberTest() {
+    void enumNumberTest() {
         // TODO: test enumNumber
     }
 
@@ -74,7 +73,7 @@ public class EnumTestTest {
      * Test the property 'outerEnum'
      */
     @Test
-    public void outerEnumTest() {
+    void outerEnumTest() {
         // TODO: test outerEnum
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java

@@ -19,24 +19,24 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ModelFile;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for FileSchemaTestClass
  */
-public class FileSchemaTestClassTest {
+class FileSchemaTestClassTest {
     private final FileSchemaTestClass model = new FileSchemaTestClass();
 
     /**
      * Model tests for FileSchemaTestClass
      */
     @Test
-    public void testFileSchemaTestClass() {
+    void testFileSchemaTestClass() {
         // TODO: test FileSchemaTestClass
     }
 
@@ -44,7 +44,7 @@ public class FileSchemaTestClassTest {
      * Test the property '_file'
      */
     @Test
-    public void _fileTest() {
+    void _fileTest() {
         // TODO: test _file
     }
 
@@ -52,7 +52,7 @@ public class FileSchemaTestClassTest {
      * Test the property 'files'
      */
     @Test
-    public void filesTest() {
+    void filesTest() {
         // TODO: test files
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/FormatTestTest.java

@@ -23,22 +23,21 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for FormatTest
  */
-public class FormatTestTest {
+class FormatTestTest {
     private final FormatTest model = new FormatTest();
 
     /**
      * Model tests for FormatTest
      */
     @Test
-    public void testFormatTest() {
+    void testFormatTest() {
         // TODO: test FormatTest
     }
 
@@ -46,7 +45,7 @@ public class FormatTestTest {
      * Test the property 'integer'
      */
     @Test
-    public void integerTest() {
+    void integerTest() {
         // TODO: test integer
     }
 
@@ -54,7 +53,7 @@ public class FormatTestTest {
      * Test the property 'int32'
      */
     @Test
-    public void int32Test() {
+    void int32Test() {
         // TODO: test int32
     }
 
@@ -62,7 +61,7 @@ public class FormatTestTest {
      * Test the property 'int64'
      */
     @Test
-    public void int64Test() {
+    void int64Test() {
         // TODO: test int64
     }
 
@@ -70,7 +69,7 @@ public class FormatTestTest {
      * Test the property 'number'
      */
     @Test
-    public void numberTest() {
+    void numberTest() {
         // TODO: test number
     }
 
@@ -78,7 +77,7 @@ public class FormatTestTest {
      * Test the property '_float'
      */
     @Test
-    public void _floatTest() {
+    void _floatTest() {
         // TODO: test _float
     }
 
@@ -86,7 +85,7 @@ public class FormatTestTest {
      * Test the property '_double'
      */
     @Test
-    public void _doubleTest() {
+    void _doubleTest() {
         // TODO: test _double
     }
 
@@ -94,7 +93,7 @@ public class FormatTestTest {
      * Test the property 'string'
      */
     @Test
-    public void stringTest() {
+    void stringTest() {
         // TODO: test string
     }
 
@@ -102,7 +101,7 @@ public class FormatTestTest {
      * Test the property '_byte'
      */
     @Test
-    public void _byteTest() {
+    void _byteTest() {
         // TODO: test _byte
     }
 
@@ -110,7 +109,7 @@ public class FormatTestTest {
      * Test the property 'binary'
      */
     @Test
-    public void binaryTest() {
+    void binaryTest() {
         // TODO: test binary
     }
 
@@ -118,7 +117,7 @@ public class FormatTestTest {
      * Test the property 'date'
      */
     @Test
-    public void dateTest() {
+    void dateTest() {
         // TODO: test date
     }
 
@@ -126,7 +125,7 @@ public class FormatTestTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -134,7 +133,7 @@ public class FormatTestTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -142,7 +141,7 @@ public class FormatTestTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -150,7 +149,7 @@ public class FormatTestTest {
      * Test the property 'bigDecimal'
      */
     @Test
-    public void bigDecimalTest() {
+    void bigDecimalTest() {
         // TODO: test bigDecimal
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for HasOnlyReadOnly
  */
-public class HasOnlyReadOnlyTest {
+class HasOnlyReadOnlyTest {
     private final HasOnlyReadOnly model = new HasOnlyReadOnly();
 
     /**
      * Model tests for HasOnlyReadOnly
      */
     @Test
-    public void testHasOnlyReadOnly() {
+    void testHasOnlyReadOnly() {
         // TODO: test HasOnlyReadOnly
     }
 
@@ -41,7 +40,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 
@@ -49,7 +48,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'foo'
      */
     @Test
-    public void fooTest() {
+    void fooTest() {
         // TODO: test foo
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/MapTestTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for MapTest
  */
-public class MapTestTest {
+class MapTestTest {
     private final MapTest model = new MapTest();
 
     /**
      * Model tests for MapTest
      */
     @Test
-    public void testMapTest() {
+    void testMapTest() {
         // TODO: test MapTest
     }
 
@@ -43,7 +42,7 @@ public class MapTestTest {
      * Test the property 'mapMapOfString'
      */
     @Test
-    public void mapMapOfStringTest() {
+    void mapMapOfStringTest() {
         // TODO: test mapMapOfString
     }
 
@@ -51,7 +50,7 @@ public class MapTestTest {
      * Test the property 'mapOfEnumString'
      */
     @Test
-    public void mapOfEnumStringTest() {
+    void mapOfEnumStringTest() {
         // TODO: test mapOfEnumString
     }
 
@@ -59,7 +58,7 @@ public class MapTestTest {
      * Test the property 'directMap'
      */
     @Test
-    public void directMapTest() {
+    void directMapTest() {
         // TODO: test directMap
     }
 
@@ -67,7 +66,7 @@ public class MapTestTest {
      * Test the property 'indirectMap'
      */
     @Test
-    public void indirectMapTest() {
+    void indirectMapTest() {
         // TODO: test indirectMap
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java

@@ -23,22 +23,21 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for MixedPropertiesAndAdditionalPropertiesClass
  */
-public class MixedPropertiesAndAdditionalPropertiesClassTest {
+class MixedPropertiesAndAdditionalPropertiesClassTest {
     private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
 
     /**
      * Model tests for MixedPropertiesAndAdditionalPropertiesClass
      */
     @Test
-    public void testMixedPropertiesAndAdditionalPropertiesClass() {
+    void testMixedPropertiesAndAdditionalPropertiesClass() {
         // TODO: test MixedPropertiesAndAdditionalPropertiesClass
     }
 
@@ -46,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -54,7 +53,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -62,7 +61,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'map'
      */
     @Test
-    public void mapTest() {
+    void mapTest() {
         // TODO: test map
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/Model200ResponseTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Model200Response
  */
-public class Model200ResponseTest {
+class Model200ResponseTest {
     private final Model200Response model = new Model200Response();
 
     /**
      * Model tests for Model200Response
      */
     @Test
-    public void testModel200Response() {
+    void testModel200Response() {
         // TODO: test Model200Response
     }
 
@@ -41,7 +40,7 @@ public class Model200ResponseTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -49,7 +48,7 @@ public class Model200ResponseTest {
      * Test the property 'propertyClass'
      */
     @Test
-    public void propertyClassTest() {
+    void propertyClassTest() {
         // TODO: test propertyClass
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelApiResponse
  */
-public class ModelApiResponseTest {
+class ModelApiResponseTest {
     private final ModelApiResponse model = new ModelApiResponse();
 
     /**
      * Model tests for ModelApiResponse
      */
     @Test
-    public void testModelApiResponse() {
+    void testModelApiResponse() {
         // TODO: test ModelApiResponse
     }
 
@@ -41,7 +40,7 @@ public class ModelApiResponseTest {
      * Test the property 'code'
      */
     @Test
-    public void codeTest() {
+    void codeTest() {
         // TODO: test code
     }
 
@@ -49,7 +48,7 @@ public class ModelApiResponseTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -57,7 +56,7 @@ public class ModelApiResponseTest {
      * Test the property 'message'
      */
     @Test
-    public void messageTest() {
+    void messageTest() {
         // TODO: test message
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ModelFileTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelFile
  */
-public class ModelFileTest {
+class ModelFileTest {
     private final ModelFile model = new ModelFile();
 
     /**
      * Model tests for ModelFile
      */
     @Test
-    public void testModelFile() {
+    void testModelFile() {
         // TODO: test ModelFile
     }
 
@@ -41,7 +40,7 @@ public class ModelFileTest {
      * Test the property 'sourceURI'
      */
     @Test
-    public void sourceURITest() {
+    void sourceURITest() {
         // TODO: test sourceURI
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ModelListTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelList
  */
-public class ModelListTest {
+class ModelListTest {
     private final ModelList model = new ModelList();
 
     /**
      * Model tests for ModelList
      */
     @Test
-    public void testModelList() {
+    void testModelList() {
         // TODO: test ModelList
     }
 
@@ -41,7 +40,7 @@ public class ModelListTest {
      * Test the property '_123list'
      */
     @Test
-    public void _123listTest() {
+    void _123listTest() {
         // TODO: test _123list
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ModelReturnTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelReturn
  */
-public class ModelReturnTest {
+class ModelReturnTest {
     private final ModelReturn model = new ModelReturn();
 
     /**
      * Model tests for ModelReturn
      */
     @Test
-    public void testModelReturn() {
+    void testModelReturn() {
         // TODO: test ModelReturn
     }
 
@@ -41,7 +40,7 @@ public class ModelReturnTest {
      * Test the property '_return'
      */
     @Test
-    public void _returnTest() {
+    void _returnTest() {
         // TODO: test _return
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/NameTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Name
  */
-public class NameTest {
+class NameTest {
     private final Name model = new Name();
 
     /**
      * Model tests for Name
      */
     @Test
-    public void testName() {
+    void testName() {
         // TODO: test Name
     }
 
@@ -41,7 +40,7 @@ public class NameTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -49,7 +48,7 @@ public class NameTest {
      * Test the property 'snakeCase'
      */
     @Test
-    public void snakeCaseTest() {
+    void snakeCaseTest() {
         // TODO: test snakeCase
     }
 
@@ -57,7 +56,7 @@ public class NameTest {
      * Test the property 'property'
      */
     @Test
-    public void propertyTest() {
+    void propertyTest() {
         // TODO: test property
     }
 
@@ -65,7 +64,7 @@ public class NameTest {
      * Test the property '_123number'
      */
     @Test
-    public void _123numberTest() {
+    void _123numberTest() {
         // TODO: test _123number
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/NumberOnlyTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for NumberOnly
  */
-public class NumberOnlyTest {
+class NumberOnlyTest {
     private final NumberOnly model = new NumberOnly();
 
     /**
      * Model tests for NumberOnly
      */
     @Test
-    public void testNumberOnly() {
+    void testNumberOnly() {
         // TODO: test NumberOnly
     }
 
@@ -42,7 +41,7 @@ public class NumberOnlyTest {
      * Test the property 'justNumber'
      */
     @Test
-    public void justNumberTest() {
+    void justNumberTest() {
         // TODO: test justNumber
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.time.OffsetDateTime;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Order
  */
-public class OrderTest {
+class OrderTest {
     private final Order model = new Order();
 
     /**
      * Model tests for Order
      */
     @Test
-    public void testOrder() {
+    void testOrder() {
         // TODO: test Order
     }
 
@@ -42,7 +41,7 @@ public class OrderTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class OrderTest {
      * Test the property 'petId'
      */
     @Test
-    public void petIdTest() {
+    void petIdTest() {
         // TODO: test petId
     }
 
@@ -58,7 +57,7 @@ public class OrderTest {
      * Test the property 'quantity'
      */
     @Test
-    public void quantityTest() {
+    void quantityTest() {
         // TODO: test quantity
     }
 
@@ -66,7 +65,7 @@ public class OrderTest {
      * Test the property 'shipDate'
      */
     @Test
-    public void shipDateTest() {
+    void shipDateTest() {
         // TODO: test shipDate
     }
 
@@ -74,7 +73,7 @@ public class OrderTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 
@@ -82,7 +81,7 @@ public class OrderTest {
      * Test the property 'complete'
      */
     @Test
-    public void completeTest() {
+    void completeTest() {
         // TODO: test complete
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/OuterCompositeTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for OuterComposite
  */
-public class OuterCompositeTest {
+class OuterCompositeTest {
     private final OuterComposite model = new OuterComposite();
 
     /**
      * Model tests for OuterComposite
      */
     @Test
-    public void testOuterComposite() {
+    void testOuterComposite() {
         // TODO: test OuterComposite
     }
 
@@ -42,7 +41,7 @@ public class OuterCompositeTest {
      * Test the property 'myNumber'
      */
     @Test
-    public void myNumberTest() {
+    void myNumberTest() {
         // TODO: test myNumber
     }
 
@@ -50,7 +49,7 @@ public class OuterCompositeTest {
      * Test the property 'myString'
      */
     @Test
-    public void myStringTest() {
+    void myStringTest() {
         // TODO: test myString
     }
 
@@ -58,7 +57,7 @@ public class OuterCompositeTest {
      * Test the property 'myBoolean'
      */
     @Test
-    public void myBooleanTest() {
+    void myBooleanTest() {
         // TODO: test myBoolean
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/OuterEnumTest.java

@@ -13,20 +13,19 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for OuterEnum
  */
-public class OuterEnumTest {
+class OuterEnumTest {
     /**
      * Model tests for OuterEnum
      */
     @Test
-    public void testOuterEnum() {
+    void testOuterEnum() {
         // TODO: test OuterEnum
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/PetTest.java

@@ -20,27 +20,27 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Pet
  */
-public class PetTest {
+class PetTest {
     private final Pet model = new Pet();
 
     /**
      * Model tests for Pet
      */
     @Test
-    public void testPet() {
+    void testPet() {
         // TODO: test Pet
     }
 
@@ -48,7 +48,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -56,7 +56,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -64,7 +64,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -72,7 +72,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -80,7 +80,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -88,7 +88,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ReadOnlyFirst
  */
-public class ReadOnlyFirstTest {
+class ReadOnlyFirstTest {
     private final ReadOnlyFirst model = new ReadOnlyFirst();
 
     /**
      * Model tests for ReadOnlyFirst
      */
     @Test
-    public void testReadOnlyFirst() {
+    void testReadOnlyFirst() {
         // TODO: test ReadOnlyFirst
     }
 
@@ -41,7 +40,7 @@ public class ReadOnlyFirstTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 
@@ -49,7 +48,7 @@ public class ReadOnlyFirstTest {
      * Test the property 'baz'
      */
     @Test
-    public void bazTest() {
+    void bazTest() {
         // TODO: test baz
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for SpecialModelName
  */
-public class SpecialModelNameTest {
+class SpecialModelNameTest {
     private final SpecialModelName model = new SpecialModelName();
 
     /**
      * Model tests for SpecialModelName
      */
     @Test
-    public void testSpecialModelName() {
+    void testSpecialModelName() {
         // TODO: test SpecialModelName
     }
 
@@ -41,7 +40,7 @@ public class SpecialModelNameTest {
      * Test the property '$specialPropertyName'
      */
     @Test
-    public void $specialPropertyNameTest() {
+    void $specialPropertyNameTest() {
         // TODO: test $specialPropertyName
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/TagTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Tag
  */
-public class TagTest {
+class TagTest {
     private final Tag model = new Tag();
 
     /**
      * Model tests for Tag
      */
     @Test
-    public void testTag() {
+    void testTag() {
         // TODO: test Tag
     }
 
@@ -41,7 +40,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java

@@ -20,23 +20,23 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for TypeHolderDefault
  */
-public class TypeHolderDefaultTest {
+class TypeHolderDefaultTest {
     private final TypeHolderDefault model = new TypeHolderDefault();
 
     /**
      * Model tests for TypeHolderDefault
      */
     @Test
-    public void testTypeHolderDefault() {
+    void testTypeHolderDefault() {
         // TODO: test TypeHolderDefault
     }
 
@@ -44,7 +44,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'stringItem'
      */
     @Test
-    public void stringItemTest() {
+    void stringItemTest() {
         // TODO: test stringItem
     }
 
@@ -52,7 +52,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'numberItem'
      */
     @Test
-    public void numberItemTest() {
+    void numberItemTest() {
         // TODO: test numberItem
     }
 
@@ -60,7 +60,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'integerItem'
      */
     @Test
-    public void integerItemTest() {
+    void integerItemTest() {
         // TODO: test integerItem
     }
 
@@ -68,7 +68,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'boolItem'
      */
     @Test
-    public void boolItemTest() {
+    void boolItemTest() {
         // TODO: test boolItem
     }
 
@@ -76,7 +76,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'arrayItem'
      */
     @Test
-    public void arrayItemTest() {
+    void arrayItemTest() {
         // TODO: test arrayItem
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java

@@ -20,23 +20,23 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for TypeHolderExample
  */
-public class TypeHolderExampleTest {
+class TypeHolderExampleTest {
     private final TypeHolderExample model = new TypeHolderExample();
 
     /**
      * Model tests for TypeHolderExample
      */
     @Test
-    public void testTypeHolderExample() {
+    void testTypeHolderExample() {
         // TODO: test TypeHolderExample
     }
 
@@ -44,7 +44,7 @@ public class TypeHolderExampleTest {
      * Test the property 'stringItem'
      */
     @Test
-    public void stringItemTest() {
+    void stringItemTest() {
         // TODO: test stringItem
     }
 
@@ -52,7 +52,7 @@ public class TypeHolderExampleTest {
      * Test the property 'numberItem'
      */
     @Test
-    public void numberItemTest() {
+    void numberItemTest() {
         // TODO: test numberItem
     }
 
@@ -60,7 +60,7 @@ public class TypeHolderExampleTest {
      * Test the property 'floatItem'
      */
     @Test
-    public void floatItemTest() {
+    void floatItemTest() {
         // TODO: test floatItem
     }
 
@@ -68,7 +68,7 @@ public class TypeHolderExampleTest {
      * Test the property 'integerItem'
      */
     @Test
-    public void integerItemTest() {
+    void integerItemTest() {
         // TODO: test integerItem
     }
 
@@ -76,7 +76,7 @@ public class TypeHolderExampleTest {
      * Test the property 'boolItem'
      */
     @Test
-    public void boolItemTest() {
+    void boolItemTest() {
         // TODO: test boolItem
     }
 
@@ -84,7 +84,7 @@ public class TypeHolderExampleTest {
      * Test the property 'arrayItem'
      */
     @Test
-    public void arrayItemTest() {
+    void arrayItemTest() {
         // TODO: test arrayItem
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/UserTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for User
  */
-public class UserTest {
+class UserTest {
     private final User model = new User();
 
     /**
      * Model tests for User
      */
     @Test
-    public void testUser() {
+    void testUser() {
         // TODO: test User
     }
 
@@ -41,7 +40,7 @@ public class UserTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class UserTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -57,7 +56,7 @@ public class UserTest {
      * Test the property 'firstName'
      */
     @Test
-    public void firstNameTest() {
+    void firstNameTest() {
         // TODO: test firstName
     }
 
@@ -65,7 +64,7 @@ public class UserTest {
      * Test the property 'lastName'
      */
     @Test
-    public void lastNameTest() {
+    void lastNameTest() {
         // TODO: test lastName
     }
 
@@ -73,7 +72,7 @@ public class UserTest {
      * Test the property 'email'
      */
     @Test
-    public void emailTest() {
+    void emailTest() {
         // TODO: test email
     }
 
@@ -81,7 +80,7 @@ public class UserTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -89,7 +88,7 @@ public class UserTest {
      * Test the property 'phone'
      */
     @Test
-    public void phoneTest() {
+    void phoneTest() {
         // TODO: test phone
     }
 
@@ -97,7 +96,7 @@ public class UserTest {
      * Test the property 'userStatus'
      */
     @Test
-    public void userStatusTest() {
+    void userStatusTest() {
         // TODO: test userStatus
     }
 

samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/model/XmlItemTest.java

@@ -20,23 +20,23 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for XmlItem
  */
-public class XmlItemTest {
+class XmlItemTest {
     private final XmlItem model = new XmlItem();
 
     /**
      * Model tests for XmlItem
      */
     @Test
-    public void testXmlItem() {
+    void testXmlItem() {
         // TODO: test XmlItem
     }
 
@@ -44,7 +44,7 @@ public class XmlItemTest {
      * Test the property 'attributeString'
      */
     @Test
-    public void attributeStringTest() {
+    void attributeStringTest() {
         // TODO: test attributeString
     }
 
@@ -52,7 +52,7 @@ public class XmlItemTest {
      * Test the property 'attributeNumber'
      */
     @Test
-    public void attributeNumberTest() {
+    void attributeNumberTest() {
         // TODO: test attributeNumber
     }
 
@@ -60,7 +60,7 @@ public class XmlItemTest {
      * Test the property 'attributeInteger'
      */
     @Test
-    public void attributeIntegerTest() {
+    void attributeIntegerTest() {
         // TODO: test attributeInteger
     }
 
@@ -68,7 +68,7 @@ public class XmlItemTest {
      * Test the property 'attributeBoolean'
      */
     @Test
-    public void attributeBooleanTest() {
+    void attributeBooleanTest() {
         // TODO: test attributeBoolean
     }
 
@@ -76,7 +76,7 @@ public class XmlItemTest {
      * Test the property 'wrappedArray'
      */
     @Test
-    public void wrappedArrayTest() {
+    void wrappedArrayTest() {
         // TODO: test wrappedArray
     }
 
@@ -84,7 +84,7 @@ public class XmlItemTest {
      * Test the property 'nameString'
      */
     @Test
-    public void nameStringTest() {
+    void nameStringTest() {
         // TODO: test nameString
     }
 
@@ -92,7 +92,7 @@ public class XmlItemTest {
      * Test the property 'nameNumber'
      */
     @Test
-    public void nameNumberTest() {
+    void nameNumberTest() {
         // TODO: test nameNumber
     }
 
@@ -100,7 +100,7 @@ public class XmlItemTest {
      * Test the property 'nameInteger'
      */
     @Test
-    public void nameIntegerTest() {
+    void nameIntegerTest() {
         // TODO: test nameInteger
     }
 
@@ -108,7 +108,7 @@ public class XmlItemTest {
      * Test the property 'nameBoolean'
      */
     @Test
-    public void nameBooleanTest() {
+    void nameBooleanTest() {
         // TODO: test nameBoolean
     }
 
@@ -116,7 +116,7 @@ public class XmlItemTest {
      * Test the property 'nameArray'
      */
     @Test
-    public void nameArrayTest() {
+    void nameArrayTest() {
         // TODO: test nameArray
     }
 
@@ -124,7 +124,7 @@ public class XmlItemTest {
      * Test the property 'nameWrappedArray'
      */
     @Test
-    public void nameWrappedArrayTest() {
+    void nameWrappedArrayTest() {
         // TODO: test nameWrappedArray
     }
 
@@ -132,7 +132,7 @@ public class XmlItemTest {
      * Test the property 'prefixString'
      */
     @Test
-    public void prefixStringTest() {
+    void prefixStringTest() {
         // TODO: test prefixString
     }
 
@@ -140,7 +140,7 @@ public class XmlItemTest {
      * Test the property 'prefixNumber'
      */
     @Test
-    public void prefixNumberTest() {
+    void prefixNumberTest() {
         // TODO: test prefixNumber
     }
 
@@ -148,7 +148,7 @@ public class XmlItemTest {
      * Test the property 'prefixInteger'
      */
     @Test
-    public void prefixIntegerTest() {
+    void prefixIntegerTest() {
         // TODO: test prefixInteger
     }
 
@@ -156,7 +156,7 @@ public class XmlItemTest {
      * Test the property 'prefixBoolean'
      */
     @Test
-    public void prefixBooleanTest() {
+    void prefixBooleanTest() {
         // TODO: test prefixBoolean
     }
 
@@ -164,7 +164,7 @@ public class XmlItemTest {
      * Test the property 'prefixArray'
      */
     @Test
-    public void prefixArrayTest() {
+    void prefixArrayTest() {
         // TODO: test prefixArray
     }
 
@@ -172,7 +172,7 @@ public class XmlItemTest {
      * Test the property 'prefixWrappedArray'
      */
     @Test
-    public void prefixWrappedArrayTest() {
+    void prefixWrappedArrayTest() {
         // TODO: test prefixWrappedArray
     }
 
@@ -180,7 +180,7 @@ public class XmlItemTest {
      * Test the property 'namespaceString'
      */
     @Test
-    public void namespaceStringTest() {
+    void namespaceStringTest() {
         // TODO: test namespaceString
     }
 
@@ -188,7 +188,7 @@ public class XmlItemTest {
      * Test the property 'namespaceNumber'
      */
     @Test
-    public void namespaceNumberTest() {
+    void namespaceNumberTest() {
         // TODO: test namespaceNumber
     }
 
@@ -196,7 +196,7 @@ public class XmlItemTest {
      * Test the property 'namespaceInteger'
      */
     @Test
-    public void namespaceIntegerTest() {
+    void namespaceIntegerTest() {
         // TODO: test namespaceInteger
     }
 
@@ -204,7 +204,7 @@ public class XmlItemTest {
      * Test the property 'namespaceBoolean'
      */
     @Test
-    public void namespaceBooleanTest() {
+    void namespaceBooleanTest() {
         // TODO: test namespaceBoolean
     }
 
@@ -212,7 +212,7 @@ public class XmlItemTest {
      * Test the property 'namespaceArray'
      */
     @Test
-    public void namespaceArrayTest() {
+    void namespaceArrayTest() {
         // TODO: test namespaceArray
     }
 
@@ -220,7 +220,7 @@ public class XmlItemTest {
      * Test the property 'namespaceWrappedArray'
      */
     @Test
-    public void namespaceWrappedArrayTest() {
+    void namespaceWrappedArrayTest() {
         // TODO: test namespaceWrappedArray
     }
 
@@ -228,7 +228,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsString'
      */
     @Test
-    public void prefixNsStringTest() {
+    void prefixNsStringTest() {
         // TODO: test prefixNsString
     }
 
@@ -236,7 +236,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsNumber'
      */
     @Test
-    public void prefixNsNumberTest() {
+    void prefixNsNumberTest() {
         // TODO: test prefixNsNumber
     }
 
@@ -244,7 +244,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsInteger'
      */
     @Test
-    public void prefixNsIntegerTest() {
+    void prefixNsIntegerTest() {
         // TODO: test prefixNsInteger
     }
 
@@ -252,7 +252,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsBoolean'
      */
     @Test
-    public void prefixNsBooleanTest() {
+    void prefixNsBooleanTest() {
         // TODO: test prefixNsBoolean
     }
 
@@ -260,7 +260,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsArray'
      */
     @Test
-    public void prefixNsArrayTest() {
+    void prefixNsArrayTest() {
         // TODO: test prefixNsArray
     }
 
@@ -268,7 +268,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsWrappedArray'
      */
     @Test
-    public void prefixNsWrappedArrayTest() {
+    void prefixNsWrappedArrayTest() {
         // TODO: test prefixNsWrappedArray
     }
 

samples/client/petstore/java/rest-assured/build.gradle

@@ -98,10 +98,11 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     rest_assured_version = "5.3.2"
-    junit_version = "4.13.2"
+    junit_version = "5.10.3"
     gson_version = "2.10.1"
     gson_fire_version = "1.9.0"
     okio_version = "3.6.0"
+    jakarta_annotation_version = "1.3.5"
 }
 
 dependencies {
@@ -113,5 +114,5 @@ dependencies {
     implementation "jakarta.validation:jakarta.validation-api:3.0.2"
     implementation "org.hibernate:hibernate-validator:6.0.19.Final"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }

samples/client/petstore/java/rest-assured/build.sbt

@@ -19,7 +19,7 @@ lazy val root = (project in file(".")).
       "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile",
       "org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
     "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "junit" % "junit" % "4.13.2" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
   )

samples/client/petstore/java/rest-assured/pom.xml

@@ -246,8 +246,8 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -260,6 +260,6 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>3.0.2</beanvalidation-version>
         <okio-version>3.6.0</okio-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.3</junit-version>
     </properties>
 </project>

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java

@@ -14,18 +14,25 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Client;
+import java.util.UUID;
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.AnotherFakeApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.GsonObjectMapper.gson;
@@ -33,12 +40,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for AnotherFakeApi
  */
-@Ignore
+@Disabled
 public class AnotherFakeApiTest {
 
     private AnotherFakeApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -52,10 +59,12 @@ public class AnotherFakeApiTest {
      */
     @Test
     public void shouldSee200AfterCall123testSpecialTags() {
+        String uuidTest = null;
         Client body = null;
         api.call123testSpecialTags()
+                .uuidTestHeader(uuidTest)
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java

@@ -26,14 +26,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.FakeApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.GsonObjectMapper.gson;
@@ -41,12 +47,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for FakeApi
  */
-@Ignore
+@Disabled
 public class FakeApiTest {
 
     private FakeApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -303,4 +309,4 @@ public class FakeApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java

@@ -18,14 +18,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.FakeClassnameTags123Api;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.GsonObjectMapper.gson;
@@ -33,12 +39,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for FakeClassnameTags123Api
  */
-@Ignore
+@Disabled
 public class FakeClassnameTags123ApiTest {
 
     private FakeClassnameTags123Api api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -58,4 +64,4 @@ public class FakeClassnameTags123ApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -16,19 +16,24 @@ package org.openapitools.client.api;
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
+import java.util.Set;
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.PetApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
@@ -37,12 +42,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
 public class PetApiTest {
 
     private PetApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -245,7 +250,7 @@ public class PetApiTest {
     public void shouldSee200AfterUploadFile() {
         Long petId = null;
         String additionalMetadata = null;
-        File file = null;
+        File _file = null;
         api.uploadFile()
                 .petIdPath(petId).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -266,4 +271,4 @@ public class PetApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -18,14 +18,20 @@ import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.StoreApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.GsonObjectMapper.gson;
@@ -33,12 +39,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
 public class StoreApiTest {
 
     private StoreApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -136,4 +142,4 @@ public class StoreApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -13,19 +13,26 @@
 
 package org.openapitools.client.api;
 
+import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
 import org.openapitools.client.ApiClient;
 import org.openapitools.client.api.UserApi;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.log.ErrorLoggingFilter;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
+
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
 import static io.restassured.config.RestAssuredConfig.config;
 import static org.openapitools.client.GsonObjectMapper.gson;
@@ -33,12 +40,12 @@ import static org.openapitools.client.GsonObjectMapper.gson;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
 public class UserApiTest {
 
     private UserApi api;
 
-    @Before
+    @BeforeEach
     public void createApi() {
         api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
                 () -> new RequestSpecBuilder()
@@ -64,7 +71,7 @@ public class UserApiTest {
      */
     @Test
     public void shouldSee0AfterCreateUsersWithArrayInput() {
-        List<User> body = null;
+        List<@Valid User> body = null;
         api.createUsersWithArrayInput()
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -76,7 +83,7 @@ public class UserApiTest {
      */
     @Test
     public void shouldSee0AfterCreateUsersWithListInput() {
-        List<User> body = null;
+        List<@Valid User> body = null;
         api.createUsersWithListInput()
                 .body(body).execute(r -> r.prettyPeek());
         // TODO: test validations
@@ -203,4 +210,4 @@ public class UserApiTest {
         // TODO: test validations
     }
 
-}
+}

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesAnyType
  */
-public class AdditionalPropertiesAnyTypeTest {
+class AdditionalPropertiesAnyTypeTest {
     private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
 
     /**
      * Model tests for AdditionalPropertiesAnyType
      */
     @Test
-    public void testAdditionalPropertiesAnyType() {
+    void testAdditionalPropertiesAnyType() {
         // TODO: test AdditionalPropertiesAnyType
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesAnyTypeTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java

@@ -22,22 +22,21 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesArray
  */
-public class AdditionalPropertiesArrayTest {
+class AdditionalPropertiesArrayTest {
     private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
 
     /**
      * Model tests for AdditionalPropertiesArray
      */
     @Test
-    public void testAdditionalPropertiesArray() {
+    void testAdditionalPropertiesArray() {
         // TODO: test AdditionalPropertiesArray
     }
 
@@ -45,7 +44,7 @@ public class AdditionalPropertiesArrayTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesBoolean
  */
-public class AdditionalPropertiesBooleanTest {
+class AdditionalPropertiesBooleanTest {
     private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
 
     /**
      * Model tests for AdditionalPropertiesBoolean
      */
     @Test
-    public void testAdditionalPropertiesBoolean() {
+    void testAdditionalPropertiesBoolean() {
         // TODO: test AdditionalPropertiesBoolean
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesBooleanTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java

@@ -23,22 +23,21 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesClass
  */
-public class AdditionalPropertiesClassTest {
+class AdditionalPropertiesClassTest {
     private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
 
     /**
      * Model tests for AdditionalPropertiesClass
      */
     @Test
-    public void testAdditionalPropertiesClass() {
+    void testAdditionalPropertiesClass() {
         // TODO: test AdditionalPropertiesClass
     }
 
@@ -46,7 +45,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapString'
      */
     @Test
-    public void mapStringTest() {
+    void mapStringTest() {
         // TODO: test mapString
     }
 
@@ -54,7 +53,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapNumber'
      */
     @Test
-    public void mapNumberTest() {
+    void mapNumberTest() {
         // TODO: test mapNumber
     }
 
@@ -62,7 +61,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapInteger'
      */
     @Test
-    public void mapIntegerTest() {
+    void mapIntegerTest() {
         // TODO: test mapInteger
     }
 
@@ -70,7 +69,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapBoolean'
      */
     @Test
-    public void mapBooleanTest() {
+    void mapBooleanTest() {
         // TODO: test mapBoolean
     }
 
@@ -78,7 +77,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayInteger'
      */
     @Test
-    public void mapArrayIntegerTest() {
+    void mapArrayIntegerTest() {
         // TODO: test mapArrayInteger
     }
 
@@ -86,7 +85,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayAnytype'
      */
     @Test
-    public void mapArrayAnytypeTest() {
+    void mapArrayAnytypeTest() {
         // TODO: test mapArrayAnytype
     }
 
@@ -94,7 +93,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapString'
      */
     @Test
-    public void mapMapStringTest() {
+    void mapMapStringTest() {
         // TODO: test mapMapString
     }
 
@@ -102,7 +101,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapAnytype'
      */
     @Test
-    public void mapMapAnytypeTest() {
+    void mapMapAnytypeTest() {
         // TODO: test mapMapAnytype
     }
 
@@ -110,7 +109,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype1'
      */
     @Test
-    public void anytype1Test() {
+    void anytype1Test() {
         // TODO: test anytype1
     }
 
@@ -118,7 +117,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype2'
      */
     @Test
-    public void anytype2Test() {
+    void anytype2Test() {
         // TODO: test anytype2
     }
 
@@ -126,7 +125,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype3'
      */
     @Test
-    public void anytype3Test() {
+    void anytype3Test() {
         // TODO: test anytype3
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesInteger
  */
-public class AdditionalPropertiesIntegerTest {
+class AdditionalPropertiesIntegerTest {
     private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
 
     /**
      * Model tests for AdditionalPropertiesInteger
      */
     @Test
-    public void testAdditionalPropertiesInteger() {
+    void testAdditionalPropertiesInteger() {
         // TODO: test AdditionalPropertiesInteger
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesIntegerTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java

@@ -22,22 +22,21 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesNumber
  */
-public class AdditionalPropertiesNumberTest {
+class AdditionalPropertiesNumberTest {
     private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
 
     /**
      * Model tests for AdditionalPropertiesNumber
      */
     @Test
-    public void testAdditionalPropertiesNumber() {
+    void testAdditionalPropertiesNumber() {
         // TODO: test AdditionalPropertiesNumber
     }
 
@@ -45,7 +44,7 @@ public class AdditionalPropertiesNumberTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesObject
  */
-public class AdditionalPropertiesObjectTest {
+class AdditionalPropertiesObjectTest {
     private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
 
     /**
      * Model tests for AdditionalPropertiesObject
      */
     @Test
-    public void testAdditionalPropertiesObject() {
+    void testAdditionalPropertiesObject() {
         // TODO: test AdditionalPropertiesObject
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesObjectTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for AdditionalPropertiesString
  */
-public class AdditionalPropertiesStringTest {
+class AdditionalPropertiesStringTest {
     private final AdditionalPropertiesString model = new AdditionalPropertiesString();
 
     /**
      * Model tests for AdditionalPropertiesString
      */
     @Test
-    public void testAdditionalPropertiesString() {
+    void testAdditionalPropertiesString() {
         // TODO: test AdditionalPropertiesString
     }
 
@@ -44,7 +43,7 @@ public class AdditionalPropertiesStringTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/AnimalTest.java

@@ -19,25 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.openapitools.client.model.BigCat;
+import org.junit.jupiter.api.Assertions;
-import org.openapitools.client.model.Cat;
+import org.junit.jupiter.api.Disabled;
-import org.openapitools.client.model.Dog;
+import org.junit.jupiter.api.Test;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
 
 /**
  * Model tests for Animal
  */
-public class AnimalTest {
+class AnimalTest {
     private final Animal model = new Animal();
 
     /**
      * Model tests for Animal
      */
     @Test
-    public void testAnimal() {
+    void testAnimal() {
         // TODO: test Animal
     }
 
@@ -45,7 +41,7 @@ public class AnimalTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -53,7 +49,7 @@ public class AnimalTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java

@@ -21,23 +21,23 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayOfArrayOfNumberOnly
  */
-public class ArrayOfArrayOfNumberOnlyTest {
+class ArrayOfArrayOfNumberOnlyTest {
     private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfArrayOfNumberOnly() {
+    void testArrayOfArrayOfNumberOnly() {
         // TODO: test ArrayOfArrayOfNumberOnly
     }
 
@@ -45,7 +45,7 @@ public class ArrayOfArrayOfNumberOnlyTest {
      * Test the property 'arrayArrayNumber'
      */
     @Test
-    public void arrayArrayNumberTest() {
+    void arrayArrayNumberTest() {
         // TODO: test arrayArrayNumber
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java

@@ -21,23 +21,23 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayOfNumberOnly
  */
-public class ArrayOfNumberOnlyTest {
+class ArrayOfNumberOnlyTest {
     private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfNumberOnly() {
+    void testArrayOfNumberOnly() {
         // TODO: test ArrayOfNumberOnly
     }
 
@@ -45,7 +45,7 @@ public class ArrayOfNumberOnlyTest {
      * Test the property 'arrayNumber'
      */
     @Test
-    public void arrayNumberTest() {
+    void arrayNumberTest() {
         // TODO: test arrayNumber
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/ArrayTestTest.java

@@ -20,24 +20,24 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ArrayTest
  */
-public class ArrayTestTest {
+class ArrayTestTest {
     private final ArrayTest model = new ArrayTest();
 
     /**
      * Model tests for ArrayTest
      */
     @Test
-    public void testArrayTest() {
+    void testArrayTest() {
         // TODO: test ArrayTest
     }
 
@@ -45,7 +45,7 @@ public class ArrayTestTest {
      * Test the property 'arrayOfString'
      */
     @Test
-    public void arrayOfStringTest() {
+    void arrayOfStringTest() {
         // TODO: test arrayOfString
     }
 
@@ -53,7 +53,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfInteger'
      */
     @Test
-    public void arrayArrayOfIntegerTest() {
+    void arrayArrayOfIntegerTest() {
         // TODO: test arrayArrayOfInteger
     }
 
@@ -61,7 +61,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfModel'
      */
     @Test
-    public void arrayArrayOfModelTest() {
+    void arrayArrayOfModelTest() {
         // TODO: test arrayArrayOfModel
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/BigCatTest.java

@@ -20,21 +20,21 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import org.openapitools.client.model.Cat;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for BigCat
  */
-public class BigCatTest {
+class BigCatTest {
     private final BigCat model = new BigCat();
 
     /**
      * Model tests for BigCat
      */
     @Test
-    public void testBigCat() {
+    void testBigCat() {
         // TODO: test BigCat
     }
 
@@ -42,7 +42,7 @@ public class BigCatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -50,7 +50,7 @@ public class BigCatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -58,7 +58,7 @@ public class BigCatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 
@@ -66,7 +66,7 @@ public class BigCatTest {
      * Test the property 'kind'
      */
     @Test
-    public void kindTest() {
+    void kindTest() {
         // TODO: test kind
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/CapitalizationTest.java

@@ -19,22 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Capitalization
  */
-public class CapitalizationTest {
+class CapitalizationTest {
     private final Capitalization model = new Capitalization();
 
     /**
      * Model tests for Capitalization
      */
     @Test
-    public void testCapitalization() {
+    void testCapitalization() {
         // TODO: test Capitalization
     }
 
@@ -42,7 +41,7 @@ public class CapitalizationTest {
      * Test the property 'smallCamel'
      */
     @Test
-    public void smallCamelTest() {
+    void smallCamelTest() {
         // TODO: test smallCamel
     }
 
@@ -50,7 +49,7 @@ public class CapitalizationTest {
      * Test the property 'capitalCamel'
      */
     @Test
-    public void capitalCamelTest() {
+    void capitalCamelTest() {
         // TODO: test capitalCamel
     }
 
@@ -58,7 +57,7 @@ public class CapitalizationTest {
      * Test the property 'smallSnake'
      */
     @Test
-    public void smallSnakeTest() {
+    void smallSnakeTest() {
         // TODO: test smallSnake
     }
 
@@ -66,7 +65,7 @@ public class CapitalizationTest {
      * Test the property 'capitalSnake'
      */
     @Test
-    public void capitalSnakeTest() {
+    void capitalSnakeTest() {
         // TODO: test capitalSnake
     }
 
@@ -74,7 +73,7 @@ public class CapitalizationTest {
      * Test the property 'scAETHFlowPoints'
      */
     @Test
-    public void scAETHFlowPointsTest() {
+    void scAETHFlowPointsTest() {
         // TODO: test scAETHFlowPoints
     }
 
@@ -82,7 +81,7 @@ public class CapitalizationTest {
      * Test the property 'ATT_NAME'
      */
     @Test
-    public void ATT_NAMETest() {
+    void ATT_NAMETest() {
         // TODO: test ATT_NAME
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/CatTest.java

@@ -20,23 +20,21 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.BigCat;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Assert;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
-
 
 /**
  * Model tests for Cat
  */
-public class CatTest {
+class CatTest {
     private final Cat model = new Cat();
 
     /**
      * Model tests for Cat
      */
     @Test
-    public void testCat() {
+    void testCat() {
         // TODO: test Cat
     }
 
@@ -44,7 +42,7 @@ public class CatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -52,7 +50,7 @@ public class CatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -60,7 +58,7 @@ public class CatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -19,22 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -42,7 +41,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/ClassModelTest.java

@@ -19,22 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ClassModel
  */
-public class ClassModelTest {
+class ClassModelTest {
     private final ClassModel model = new ClassModel();
 
     /**
      * Model tests for ClassModel
      */
     @Test
-    public void testClassModel() {
+    void testClassModel() {
         // TODO: test ClassModel
     }
 
@@ -42,7 +41,7 @@ public class ClassModelTest {
      * Test the property 'propertyClass'
      */
     @Test
-    public void propertyClassTest() {
+    void propertyClassTest() {
         // TODO: test propertyClass
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/ClientTest.java

@@ -19,22 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Client
  */
-public class ClientTest {
+class ClientTest {
     private final Client model = new Client();
 
     /**
      * Model tests for Client
      */
     @Test
-    public void testClient() {
+    void testClient() {
         // TODO: test Client
     }
 
@@ -42,7 +41,7 @@ public class ClientTest {
      * Test the property 'client'
      */
     @Test
-    public void clientTest() {
+    void clientTest() {
         // TODO: test client
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/DogTest.java

@@ -20,22 +20,21 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Dog
  */
-public class DogTest {
+class DogTest {
     private final Dog model = new Dog();
 
     /**
      * Model tests for Dog
      */
     @Test
-    public void testDog() {
+    void testDog() {
         // TODO: test Dog
     }
 
@@ -43,7 +42,7 @@ public class DogTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -51,7 +50,7 @@ public class DogTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -59,7 +58,7 @@ public class DogTest {
      * Test the property 'breed'
      */
     @Test
-    public void breedTest() {
+    void breedTest() {
         // TODO: test breed
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/EnumArraysTest.java

@@ -20,23 +20,23 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumArrays
  */
-public class EnumArraysTest {
+class EnumArraysTest {
     private final EnumArrays model = new EnumArrays();
 
     /**
      * Model tests for EnumArrays
      */
     @Test
-    public void testEnumArrays() {
+    void testEnumArrays() {
         // TODO: test EnumArrays
     }
 
@@ -44,7 +44,7 @@ public class EnumArraysTest {
      * Test the property 'justSymbol'
      */
     @Test
-    public void justSymbolTest() {
+    void justSymbolTest() {
         // TODO: test justSymbol
     }
 
@@ -52,7 +52,7 @@ public class EnumArraysTest {
      * Test the property 'arrayEnum'
      */
     @Test
-    public void arrayEnumTest() {
+    void arrayEnumTest() {
         // TODO: test arrayEnum
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/EnumClassTest.java

@@ -14,20 +14,19 @@
 package org.openapitools.client.model;
 
 import com.google.gson.annotations.SerializedName;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumClass
  */
-public class EnumClassTest {
+class EnumClassTest {
     /**
      * Model tests for EnumClass
      */
     @Test
-    public void testEnumClass() {
+    void testEnumClass() {
         // TODO: test EnumClass
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/EnumTestTest.java

@@ -20,22 +20,21 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import org.openapitools.client.model.OuterEnum;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for EnumTest
  */
-public class EnumTestTest {
+class EnumTestTest {
     private final EnumTest model = new EnumTest();
 
     /**
      * Model tests for EnumTest
      */
     @Test
-    public void testEnumTest() {
+    void testEnumTest() {
         // TODO: test EnumTest
     }
 
@@ -43,7 +42,7 @@ public class EnumTestTest {
      * Test the property 'enumString'
      */
     @Test
-    public void enumStringTest() {
+    void enumStringTest() {
         // TODO: test enumString
     }
 
@@ -51,7 +50,7 @@ public class EnumTestTest {
      * Test the property 'enumStringRequired'
      */
     @Test
-    public void enumStringRequiredTest() {
+    void enumStringRequiredTest() {
         // TODO: test enumStringRequired
     }
 
@@ -59,7 +58,7 @@ public class EnumTestTest {
      * Test the property 'enumInteger'
      */
     @Test
-    public void enumIntegerTest() {
+    void enumIntegerTest() {
         // TODO: test enumInteger
     }
 
@@ -67,7 +66,7 @@ public class EnumTestTest {
      * Test the property 'enumNumber'
      */
     @Test
-    public void enumNumberTest() {
+    void enumNumberTest() {
         // TODO: test enumNumber
     }
 
@@ -75,7 +74,7 @@ public class EnumTestTest {
      * Test the property 'outerEnum'
      */
     @Test
-    public void outerEnumTest() {
+    void outerEnumTest() {
         // TODO: test outerEnum
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java

@@ -20,24 +20,24 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ModelFile;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for FileSchemaTestClass
  */
-public class FileSchemaTestClassTest {
+class FileSchemaTestClassTest {
     private final FileSchemaTestClass model = new FileSchemaTestClass();
 
     /**
      * Model tests for FileSchemaTestClass
      */
     @Test
-    public void testFileSchemaTestClass() {
+    void testFileSchemaTestClass() {
         // TODO: test FileSchemaTestClass
     }
 
@@ -45,7 +45,7 @@ public class FileSchemaTestClassTest {
      * Test the property '_file'
      */
     @Test
-    public void _fileTest() {
+    void _fileTest() {
         // TODO: test _file
     }
 
@@ -53,7 +53,7 @@ public class FileSchemaTestClassTest {
      * Test the property 'files'
      */
     @Test
-    public void filesTest() {
+    void filesTest() {
         // TODO: test files
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/FormatTestTest.java

@@ -24,22 +24,21 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for FormatTest
  */
-public class FormatTestTest {
+class FormatTestTest {
     private final FormatTest model = new FormatTest();
 
     /**
      * Model tests for FormatTest
      */
     @Test
-    public void testFormatTest() {
+    void testFormatTest() {
         // TODO: test FormatTest
     }
 
@@ -47,7 +46,7 @@ public class FormatTestTest {
      * Test the property 'integer'
      */
     @Test
-    public void integerTest() {
+    void integerTest() {
         // TODO: test integer
     }
 
@@ -55,7 +54,7 @@ public class FormatTestTest {
      * Test the property 'int32'
      */
     @Test
-    public void int32Test() {
+    void int32Test() {
         // TODO: test int32
     }
 
@@ -63,7 +62,7 @@ public class FormatTestTest {
      * Test the property 'int64'
      */
     @Test
-    public void int64Test() {
+    void int64Test() {
         // TODO: test int64
     }
 
@@ -71,7 +70,7 @@ public class FormatTestTest {
      * Test the property 'number'
      */
     @Test
-    public void numberTest() {
+    void numberTest() {
         // TODO: test number
     }
 
@@ -79,7 +78,7 @@ public class FormatTestTest {
      * Test the property '_float'
      */
     @Test
-    public void _floatTest() {
+    void _floatTest() {
         // TODO: test _float
     }
 
@@ -87,7 +86,7 @@ public class FormatTestTest {
      * Test the property '_double'
      */
     @Test
-    public void _doubleTest() {
+    void _doubleTest() {
         // TODO: test _double
     }
 
@@ -95,7 +94,7 @@ public class FormatTestTest {
      * Test the property 'string'
      */
     @Test
-    public void stringTest() {
+    void stringTest() {
         // TODO: test string
     }
 
@@ -103,7 +102,7 @@ public class FormatTestTest {
      * Test the property '_byte'
      */
     @Test
-    public void _byteTest() {
+    void _byteTest() {
         // TODO: test _byte
     }
 
@@ -111,7 +110,7 @@ public class FormatTestTest {
      * Test the property 'binary'
      */
     @Test
-    public void binaryTest() {
+    void binaryTest() {
         // TODO: test binary
     }
 
@@ -119,7 +118,7 @@ public class FormatTestTest {
      * Test the property 'date'
      */
     @Test
-    public void dateTest() {
+    void dateTest() {
         // TODO: test date
     }
 
@@ -127,7 +126,7 @@ public class FormatTestTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -135,7 +134,7 @@ public class FormatTestTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -143,7 +142,7 @@ public class FormatTestTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -151,7 +150,7 @@ public class FormatTestTest {
      * Test the property 'bigDecimal'
      */
     @Test
-    public void bigDecimalTest() {
+    void bigDecimalTest() {
         // TODO: test bigDecimal
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java

@@ -19,22 +19,21 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for HasOnlyReadOnly
  */
-public class HasOnlyReadOnlyTest {
+class HasOnlyReadOnlyTest {
     private final HasOnlyReadOnly model = new HasOnlyReadOnly();
 
     /**
      * Model tests for HasOnlyReadOnly
      */
     @Test
-    public void testHasOnlyReadOnly() {
+    void testHasOnlyReadOnly() {
         // TODO: test HasOnlyReadOnly
     }
 
@@ -42,7 +41,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 
@@ -50,7 +49,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'foo'
      */
     @Test
-    public void fooTest() {
+    void fooTest() {
         // TODO: test foo
     }
 

samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/MapTestTest.java

@@ -21,22 +21,21 @@ import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for MapTest
  */
-public class MapTestTest {
+class MapTestTest {
     private final MapTest model = new MapTest();
 
     /**
      * Model tests for MapTest
      */
     @Test
-    public void testMapTest() {
+    void testMapTest() {
         // TODO: test MapTest
     }
 
@@ -44,7 +43,7 @@ public class MapTestTest {
      * Test the property 'mapMapOfString'
      */
     @Test
-    public void mapMapOfStringTest() {
+    void mapMapOfStringTest() {
         // TODO: test mapMapOfString
     }
 
@@ -52,7 +51,7 @@ public class MapTestTest {
      * Test the property 'mapOfEnumString'
      */
     @Test
-    public void mapOfEnumStringTest() {
+    void mapOfEnumStringTest() {
         // TODO: test mapOfEnumString
     }
 
@@ -60,7 +59,7 @@ public class MapTestTest {
      * Test the property 'directMap'
      */
     @Test
-    public void directMapTest() {
+    void directMapTest() {
         // TODO: test directMap
     }
 
@@ -68,7 +67,7 @@ public class MapTestTest {
      * Test the property 'indirectMap'
      */
     @Test
-    public void indirectMapTest() {
+    void indirectMapTest() {
         // TODO: test indirectMap
     }