update sample tests, fix Java tests (#20300)

* replace removed forkMode

* remove junit runner where it's not needed

* update samples without skipping test files, but skip files named "FILES"

* revert overwriting custom tests, add custom java tests to list

* add one sample to CircleCI, fix various Java tests

samples/client/echo_api/java/resttemplate/pom.xml

@@ -66,7 +66,7 @@
                     </systemPropertyVariables>
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
+                    <reuseForks>false</reuseForks>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
                 <dependencies>
@@ -271,12 +271,6 @@
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit-platform-runner.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -287,6 +281,5 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
-        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/CustomTest.java

@@ -13,8 +13,8 @@
 
 package org.openapitools.client;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.api.BodyApi;
 import org.openapitools.client.api.QueryApi;
 import org.openapitools.client.model.Category;
@@ -22,13 +22,11 @@ import org.openapitools.client.model.Pet;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertNotNull;
-
 
 /**
  * API tests
  */
-public class CustomTest {
+class CustomTest {
 
     private final QueryApi api = new QueryApi();
     private final BodyApi bodyApi = new BodyApi();
@@ -40,22 +38,22 @@ public class CustomTest {
      *
      */
     @Test
-    public void testEchoBodyPet() {
+    void testEchoBodyPet() {
         Pet pet = new Pet().id(12345L).name("Hello World").
                 photoUrls(Arrays.asList(new String[]{"http://a.com", "http://b.com"})).category(new Category().id(987L).name("new category"));
 
         Pet p = bodyApi.testEchoBodyPet(pet);
-        assertNotNull(p);
-        Assert.assertEquals("Hello World", p.getName());
-        Assert.assertEquals(Long.valueOf(12345L), p.getId());
+        Assertions.assertNotNull(p);
+        Assertions.assertEquals("Hello World", p.getName());
+        Assertions.assertEquals(Long.valueOf(12345L), p.getId());
 
         // response is empty body
         Pet p2 = bodyApi.testEchoBodyPet(null);
-        Assert.assertNull(p2);
+        Assertions.assertNull(p2);
     }
     
     @Test
-    public void testQueryParamsExploded_whenQueryParamIsNull() {
-        assertNotNull(api.testQueryStyleFormExplodeTrueObject(null));
+    void testQueryParamsExploded_whenQueryParamIsNull() {
+        Assertions.assertNotNull(api.testQueryStyleFormExplodeTrueObject(null));
     }
 }

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/AuthApiTest.java

@@ -13,9 +13,10 @@
 
 package org.openapitools.client.api;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,7 +28,7 @@ import java.util.Map;
 /**
  * API tests for AuthApi
  */
-public class AuthApiTest {
+class AuthApiTest {
 
     private final AuthApi api = new AuthApi();
 
@@ -37,11 +38,11 @@ public class AuthApiTest {
      *
      * To test HTTP basic authentication
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testAuthHttpBasicTest() {
+    void testAuthHttpBasicTest() {
 
         String response = api.testAuthHttpBasic();
 
@@ -53,19 +54,19 @@ public class AuthApiTest {
      *
      * To test HTTP bearer authentication
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testAuthHttpBearerTest() {
+    void testAuthHttpBearerTest() {
         String response;
         api.getApiClient().setBearerToken("fixed token");
         response = api.testAuthHttpBearer();
-        Assert.assertTrue(response.contains("Authorization: Bearer fixed token"));
+        Assertions.assertTrue(response.contains("Authorization: Bearer fixed token"));
 
         api.getApiClient().setBearerToken(() -> "dynamic token");
         response = api.testAuthHttpBearer();
-        Assert.assertTrue(response.contains("Authorization: Bearer dynamic token"));
+        Assertions.assertTrue(response.contains("Authorization: Bearer dynamic token"));
     }
     
 }

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/BodyApiTest.java

@@ -15,9 +15,11 @@ package org.openapitools.client.api;
 
 import java.io.File;
 import org.openapitools.client.model.Pet;
+import org.openapitools.client.model.StringEnumRef;
 import org.openapitools.client.model.Tag;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,8 +31,8 @@ import java.util.Map;
 /**
  * API tests for BodyApi
  */
-@Ignore
-public class BodyApiTest {
+@Disabled
+class BodyApiTest {
 
     private final BodyApi api = new BodyApi();
 
@@ -40,11 +42,11 @@ public class BodyApiTest {
      *
      * Test binary (gif) response body
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBinaryGifTest() {
+    void testBinaryGifTest() {
 
         File response = api.testBinaryGif();
 
@@ -56,11 +58,11 @@ public class BodyApiTest {
      *
      * Test body parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBodyApplicationOctetstreamBinaryTest() {
+    void testBodyApplicationOctetstreamBinaryTest() {
         File body = null;
 
         String response = api.testBodyApplicationOctetstreamBinary(body);
@@ -73,11 +75,11 @@ public class BodyApiTest {
      *
      * Test array of binary in multipart mime
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBodyMultipartFormdataArrayOfBinaryTest() {
+    void testBodyMultipartFormdataArrayOfBinaryTest() {
         List<File> files = null;
 
         String response = api.testBodyMultipartFormdataArrayOfBinary(files);
@@ -85,16 +87,33 @@ public class BodyApiTest {
         // TODO: test validations
     }
     
+    /**
+     * Test single binary in multipart mime
+     *
+     * Test single binary in multipart mime
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testBodyMultipartFormdataSingleBinaryTest() {
+        File myFile = null;
+
+        String response = api.testBodyMultipartFormdataSingleBinary(myFile);
+
+        // TODO: test validations
+    }
+    
     /**
      * Test body parameter(s)
      *
      * Test body parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEchoBodyAllOfPetTest() {
+    void testEchoBodyAllOfPetTest() {
         Pet pet = null;
 
         Pet response = api.testEchoBodyAllOfPet(pet);
@@ -107,11 +126,11 @@ public class BodyApiTest {
      *
      * Test free form object
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEchoBodyFreeFormObjectResponseStringTest() {
+    void testEchoBodyFreeFormObjectResponseStringTest() {
         Object body = null;
 
         String response = api.testEchoBodyFreeFormObjectResponseString(body);
@@ -124,11 +143,11 @@ public class BodyApiTest {
      *
      * Test body parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEchoBodyPetTest() {
+    void testEchoBodyPetTest() {
         Pet pet = null;
 
         Pet response = api.testEchoBodyPet(pet);
@@ -141,11 +160,11 @@ public class BodyApiTest {
      *
      * Test empty response body
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEchoBodyPetResponseStringTest() {
+    void testEchoBodyPetResponseStringTest() {
         Pet pet = null;
 
         String response = api.testEchoBodyPetResponseString(pet);
@@ -153,16 +172,33 @@ public class BodyApiTest {
         // TODO: test validations
     }
     
+    /**
+     * Test string enum response body
+     *
+     * Test string enum response body
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testEchoBodyStringEnumTest() {
+        String body = null;
+
+        StringEnumRef response = api.testEchoBodyStringEnum(body);
+
+        // TODO: test validations
+    }
+    
     /**
      * Test empty json (request body)
      *
      * Test empty json (request body)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEchoBodyTagResponseStringTest() {
+    void testEchoBodyTagResponseStringTest() {
         Tag tag = null;
 
         String response = api.testEchoBodyTagResponseString(tag);

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/FormApiTest.java

@@ -13,8 +13,10 @@
 
 package org.openapitools.client.api;
 
-import org.junit.Test;
-import org.junit.Ignore;
+import org.openapitools.client.model.TestFormObjectMultipartRequestMarker;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -26,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for FormApi
  */
-@Ignore
-public class FormApiTest {
+@Disabled
+class FormApiTest {
 
     private final FormApi api = new FormApi();
 
@@ -37,11 +39,11 @@ public class FormApiTest {
      *
      * Test form parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testFormIntegerBooleanStringTest() {
+    void testFormIntegerBooleanStringTest() {
         Integer integerForm = null;
         Boolean booleanForm = null;
         String stringForm = null;
@@ -52,15 +54,32 @@ public class FormApiTest {
     }
     
     /**
-     * Test form parameter(s) for oneOf schema
+     * Test form parameter(s) for multipart schema
      *
-     * Test form parameter(s) for oneOf schema
+     * Test form parameter(s) for multipart schema
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testFormOneofTest() {
+    void testFormObjectMultipartTest() {
+        TestFormObjectMultipartRequestMarker marker = null;
+
+        String response = api.testFormObjectMultipart(marker);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Test form parameter(s) for oneOf schema
+     *
+     * Test form parameter(s) for oneOf schema
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testFormOneofTest() {
         String form1 = null;
         Integer form2 = null;
         String form3 = null;

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/HeaderApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for HeaderApi
  */
-@Ignore
-public class HeaderApiTest {
+@Disabled
+class HeaderApiTest {
 
     private final HeaderApi api = new HeaderApi();
 
@@ -38,11 +39,11 @@ public class HeaderApiTest {
      *
      * Test header parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testHeaderIntegerBooleanStringEnumsTest() {
+    void testHeaderIntegerBooleanStringEnumsTest() {
         Integer integerHeader = null;
         Boolean booleanHeader = null;
         String stringHeader = null;

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/PathApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for PathApi
  */
-@Ignore
-public class PathApiTest {
+@Disabled
+class PathApiTest {
 
     private final PathApi api = new PathApi();
 
@@ -38,11 +39,11 @@ public class PathApiTest {
      *
      * Test path parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest() {
+    void testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest() {
         String pathString = null;
         Integer pathInteger = null;
         String enumNonrefStringPath = null;

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/QueryApiTest.java

@@ -20,8 +20,9 @@ import org.openapitools.client.model.Pet;
 import org.openapitools.client.model.StringEnumRef;
 import org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter;
 import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -33,8 +34,8 @@ import java.util.Map;
 /**
  * API tests for QueryApi
  */
-@Ignore
-public class QueryApiTest {
+@Disabled
+class QueryApiTest {
 
     private final QueryApi api = new QueryApi();
 
@@ -44,11 +45,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEnumRefStringTest() {
+    void testEnumRefStringTest() {
         String enumNonrefStringQuery = null;
         StringEnumRef enumRefStringQuery = null;
 
@@ -62,11 +63,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryDatetimeDateStringTest() {
+    void testQueryDatetimeDateStringTest() {
         OffsetDateTime datetimeQuery = null;
         LocalDate dateQuery = null;
         String stringQuery = null;
@@ -81,11 +82,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryIntegerBooleanStringTest() {
+    void testQueryIntegerBooleanStringTest() {
         Integer integerQuery = null;
         Boolean booleanQuery = null;
         String stringQuery = null;
@@ -100,11 +101,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryStyleDeepObjectExplodeTrueObjectTest() {
+    void testQueryStyleDeepObjectExplodeTrueObjectTest() {
         Pet queryObject = null;
 
         String response = api.testQueryStyleDeepObjectExplodeTrueObject(queryObject);
@@ -117,11 +118,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryStyleDeepObjectExplodeTrueObjectAllOfTest() {
+    void testQueryStyleDeepObjectExplodeTrueObjectAllOfTest() {
         TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject = null;
 
         String response = api.testQueryStyleDeepObjectExplodeTrueObjectAllOf(queryObject);
@@ -134,11 +135,45 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryStyleFormExplodeTrueArrayStringTest() {
+    void testQueryStyleFormExplodeFalseArrayIntegerTest() {
+        List<Integer> queryObject = null;
+
+        String response = api.testQueryStyleFormExplodeFalseArrayInteger(queryObject);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Test query parameter(s)
+     *
+     * Test query parameter(s)
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testQueryStyleFormExplodeFalseArrayStringTest() {
+        List<String> queryObject = null;
+
+        String response = api.testQueryStyleFormExplodeFalseArrayString(queryObject);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Test query parameter(s)
+     *
+     * Test query parameter(s)
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testQueryStyleFormExplodeTrueArrayStringTest() {
         TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject = null;
 
         String response = api.testQueryStyleFormExplodeTrueArrayString(queryObject);
@@ -151,11 +186,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryStyleFormExplodeTrueObjectTest() {
+    void testQueryStyleFormExplodeTrueObjectTest() {
         Pet queryObject = null;
 
         String response = api.testQueryStyleFormExplodeTrueObject(queryObject);
@@ -168,11 +203,11 @@ public class QueryApiTest {
      *
      * Test query parameter(s)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryStyleFormExplodeTrueObjectAllOfTest() {
+    void testQueryStyleFormExplodeTrueObjectAllOfTest() {
         DataQuery queryObject = null;
 
         String response = api.testQueryStyleFormExplodeTrueObjectAllOf(queryObject);

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/BirdTest.java

@@ -18,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Bird
  */
-public class BirdTest {
+class BirdTest {
     private final Bird model = new Bird();
 
     /**
      * Model tests for Bird
      */
     @Test
-    public void testBird() {
+    void testBird() {
         // TODO: test Bird
     }
 
@@ -40,7 +40,7 @@ public class BirdTest {
      * Test the property 'size'
      */
     @Test
-    public void sizeTest() {
+    void sizeTest() {
         // TODO: test size
     }
 
@@ -48,7 +48,7 @@ public class BirdTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -18,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+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
     }
 
@@ -40,7 +40,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -48,7 +48,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/DataQueryTest.java

@@ -23,21 +23,21 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Query;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for DataQuery
  */
-public class DataQueryTest {
+class DataQueryTest {
     private final DataQuery model = new DataQuery();
 
     /**
      * Model tests for DataQuery
      */
     @Test
-    public void testDataQuery() {
+    void testDataQuery() {
         // TODO: test DataQuery
     }
 
@@ -45,7 +45,7 @@ public class DataQueryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -53,7 +53,7 @@ public class DataQueryTest {
      * Test the property 'outcomes'
      */
     @Test
-    public void outcomesTest() {
+    void outcomesTest() {
         // TODO: test outcomes
     }
 
@@ -61,7 +61,7 @@ public class DataQueryTest {
      * Test the property 'suffix'
      */
     @Test
-    public void suffixTest() {
+    void suffixTest() {
         // TODO: test suffix
     }
 
@@ -69,7 +69,7 @@ public class DataQueryTest {
      * Test the property 'text'
      */
     @Test
-    public void textTest() {
+    void textTest() {
         // TODO: test text
     }
 
@@ -77,7 +77,7 @@ public class DataQueryTest {
      * Test the property 'date'
      */
     @Test
-    public void dateTest() {
+    void dateTest() {
         // TODO: test date
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/DefaultValueTest.java

@@ -26,21 +26,21 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for DefaultValue
  */
-public class DefaultValueTest {
+class DefaultValueTest {
     private final DefaultValue model = new DefaultValue();
 
     /**
      * Model tests for DefaultValue
      */
     @Test
-    public void testDefaultValue() {
+    void testDefaultValue() {
         // TODO: test DefaultValue
     }
 
@@ -48,7 +48,7 @@ public class DefaultValueTest {
      * Test the property 'arrayStringEnumRefDefault'
      */
     @Test
-    public void arrayStringEnumRefDefaultTest() {
+    void arrayStringEnumRefDefaultTest() {
         // TODO: test arrayStringEnumRefDefault
     }
 
@@ -56,7 +56,7 @@ public class DefaultValueTest {
      * Test the property 'arrayStringEnumDefault'
      */
     @Test
-    public void arrayStringEnumDefaultTest() {
+    void arrayStringEnumDefaultTest() {
         // TODO: test arrayStringEnumDefault
     }
 
@@ -64,7 +64,7 @@ public class DefaultValueTest {
      * Test the property 'arrayStringDefault'
      */
     @Test
-    public void arrayStringDefaultTest() {
+    void arrayStringDefaultTest() {
         // TODO: test arrayStringDefault
     }
 
@@ -72,7 +72,7 @@ public class DefaultValueTest {
      * Test the property 'arrayIntegerDefault'
      */
     @Test
-    public void arrayIntegerDefaultTest() {
+    void arrayIntegerDefaultTest() {
         // TODO: test arrayIntegerDefault
     }
 
@@ -80,7 +80,7 @@ public class DefaultValueTest {
      * Test the property 'arrayString'
      */
     @Test
-    public void arrayStringTest() {
+    void arrayStringTest() {
         // TODO: test arrayString
     }
 
@@ -88,7 +88,7 @@ public class DefaultValueTest {
      * Test the property 'arrayStringNullable'
      */
     @Test
-    public void arrayStringNullableTest() {
+    void arrayStringNullableTest() {
         // TODO: test arrayStringNullable
     }
 
@@ -96,7 +96,7 @@ public class DefaultValueTest {
      * Test the property 'arrayStringExtensionNullable'
      */
     @Test
-    public void arrayStringExtensionNullableTest() {
+    void arrayStringExtensionNullableTest() {
         // TODO: test arrayStringExtensionNullable
     }
 
@@ -104,7 +104,7 @@ public class DefaultValueTest {
      * Test the property 'stringNullable'
      */
     @Test
-    public void stringNullableTest() {
+    void stringNullableTest() {
         // TODO: test stringNullable
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java

@@ -19,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for NumberPropertiesOnly
  */
-public class NumberPropertiesOnlyTest {
+class NumberPropertiesOnlyTest {
     private final NumberPropertiesOnly model = new NumberPropertiesOnly();
 
     /**
      * Model tests for NumberPropertiesOnly
      */
     @Test
-    public void testNumberPropertiesOnly() {
+    void testNumberPropertiesOnly() {
         // TODO: test NumberPropertiesOnly
     }
 
@@ -41,7 +41,7 @@ public class NumberPropertiesOnlyTest {
      * Test the property 'number'
      */
     @Test
-    public void numberTest() {
+    void numberTest() {
         // TODO: test number
     }
 
@@ -49,7 +49,7 @@ public class NumberPropertiesOnlyTest {
      * Test the property '_float'
      */
     @Test
-    public void _floatTest() {
+    void _floatTest() {
         // TODO: test _float
     }
 
@@ -57,7 +57,7 @@ public class NumberPropertiesOnlyTest {
      * Test the property '_double'
      */
     @Test
-    public void _doubleTest() {
+    void _doubleTest() {
         // TODO: test _double
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/PetTest.java

@@ -23,21 +23,21 @@ import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+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
     }
 
@@ -45,7 +45,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -53,7 +53,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -61,7 +61,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -69,7 +69,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -77,7 +77,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -85,7 +85,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/QueryTest.java

@@ -21,21 +21,21 @@ 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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Query
  */
-public class QueryTest {
+class QueryTest {
     private final Query model = new Query();
 
     /**
      * Model tests for Query
      */
     @Test
-    public void testQuery() {
+    void testQuery() {
         // TODO: test Query
     }
 
@@ -43,7 +43,7 @@ public class QueryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -51,7 +51,7 @@ public class QueryTest {
      * Test the property 'outcomes'
      */
     @Test
-    public void outcomesTest() {
+    void outcomesTest() {
         // TODO: test outcomes
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/StringEnumRefTest.java

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

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/TagTest.java

@@ -18,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+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
     }
 
@@ -40,7 +40,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -48,7 +48,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java

@@ -18,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for TestFormObjectMultipartRequestMarker
  */
-public class TestFormObjectMultipartRequestMarkerTest {
+class TestFormObjectMultipartRequestMarkerTest {
     private final TestFormObjectMultipartRequestMarker model = new TestFormObjectMultipartRequestMarker();
 
     /**
      * Model tests for TestFormObjectMultipartRequestMarker
      */
     @Test
-    public void testTestFormObjectMultipartRequestMarker() {
+    void testTestFormObjectMultipartRequestMarker() {
         // TODO: test TestFormObjectMultipartRequestMarker
     }
 
@@ -40,7 +40,7 @@ public class TestFormObjectMultipartRequestMarkerTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java

@@ -18,21 +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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
  */
-public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest {
+class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest {
     private final TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter model = new TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter();
 
     /**
      * Model tests for TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
      */
     @Test
-    public void testTestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter() {
+    void testTestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter() {
         // TODO: test TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
     }
 
@@ -40,7 +40,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterT
      * Test the property 'size'
      */
     @Test
-    public void sizeTest() {
+    void sizeTest() {
         // TODO: test size
     }
 
@@ -48,7 +48,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterT
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -56,7 +56,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterT
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -64,7 +64,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterT
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java

@@ -21,21 +21,21 @@ 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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
  */
-public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest {
+class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest {
     private final TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter model = new TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter();
 
     /**
      * Model tests for TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
      */
     @Test
-    public void testTestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() {
+    void testTestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() {
         // TODO: test TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
     }
 
@@ -43,7 +43,7 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest {
      * Test the property 'values'
      */
     @Test
-    public void valuesTest() {
+    void valuesTest() {
         // TODO: test values
     }