upgrade java native to junit5

OpenAPITools · May 8, 2024 · 9688399 · 9688399
1 parent 4441ab3
commit 9688399
Show file tree

Hide file tree

Showing 112 changed files with 414 additions and 414 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache
@@ -5,8 +5,8 @@ package {{package}};
 import {{invokerPackage}}.ApiException;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
 /**
  * API tests for {{classname}}
  */
-@Ignore
+@Disabled
 public class {{classname}}Test {
 
     private final {{classname}} api = new {{classname}}();

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
@@ -64,7 +64,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <loggerPath>conf/log4j.properties</loggerPath>
@@ -265,8 +265,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -293,7 +293,7 @@
         {{#hasFormParamsInSpec}}
         <httpmime-version>4.5.14</httpmime-version>
         {{/hasFormParamsInSpec}}
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/native/pom.xml b/samples/client/echo_api/java/native/pom.xml
@@ -57,7 +57,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <loggerPath>conf/log4j.properties</loggerPath>
@@ -242,8 +242,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -257,7 +257,7 @@
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <httpmime-version>4.5.14</httpmime-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java
diff --git a/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/AuthApiTest.java b/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/AuthApiTest.java
@@ -14,8 +14,8 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@
 /**
  * API tests for AuthApi
  */
-@Ignore
+@Disabled
 public class AuthApiTest {
 
     private final AuthApi api = new AuthApi();

diff --git a/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/BodyApiTest.java b/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/BodyApiTest.java
@@ -15,8 +15,8 @@
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +28,7 @@
 /**
  * API tests for BodyApi
  */
-@Ignore
+@Disabled
 public class BodyApiTest {
 
     private final BodyApi api = new BodyApi();

diff --git a/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/FormApiTest.java b/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/FormApiTest.java
@@ -14,8 +14,8 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,7 +27,7 @@
 /**
  * API tests for FormApi
  */
-@Ignore
+@Disabled
 public class FormApiTest {
 
     private final FormApi api = new FormApi();

diff --git a/.../client/echo_api/java/native/src/test/java/org/openapitools/client/api/HeaderApiTest.java b/.../client/echo_api/java/native/src/test/java/org/openapitools/client/api/HeaderApiTest.java
@@ -15,8 +15,8 @@
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +28,7 @@
 /**
  * API tests for HeaderApi
  */
-@Ignore
+@Disabled
 public class HeaderApiTest {
 
     private final HeaderApi api = new HeaderApi();

diff --git a/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/PathApiTest.java b/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/PathApiTest.java
@@ -15,8 +15,8 @@
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +28,7 @@
 /**
  * API tests for PathApi
  */
-@Ignore
+@Disabled
 public class PathApiTest {
 
     private final PathApi api = new PathApi();

diff --git a/...s/client/echo_api/java/native/src/test/java/org/openapitools/client/api/QueryApiTest.java b/...s/client/echo_api/java/native/src/test/java/org/openapitools/client/api/QueryApiTest.java
@@ -15,8 +15,8 @@
 
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +28,7 @@
 /**
  * API tests for QueryApi
  */
-@Ignore
+@Disabled
 public class QueryApiTest {
 
     private final QueryApi api = new QueryApi();

diff --git a/...echo_api/java/native/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java b/...echo_api/java/native/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**

diff --git a/...les/client/echo_api/java/native/src/test/java/org/openapitools/client/model/BirdTest.java b/...les/client/echo_api/java/native/src/test/java/org/openapitools/client/model/BirdTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**

diff --git a/...client/echo_api/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java b/...client/echo_api/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**

diff --git a/...lient/echo_api/java/native/src/test/java/org/openapitools/client/model/DataQueryTest.java b/...lient/echo_api/java/native/src/test/java/org/openapitools/client/model/DataQueryTest.java
@@ -22,9 +22,9 @@
 import java.util.ArrayList;
 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;
 
 
 /**

diff --git a/...nt/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/...nt/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java
@@ -24,9 +24,9 @@
 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;
 
 
 /**

diff --git a/...t/echo_api/java/native/src/test/java/org/openapitools/client/model/EnumStringRefTest.java b/...t/echo_api/java/native/src/test/java/org/openapitools/client/model/EnumStringRefTest.java
@@ -13,9 +13,9 @@
 
 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;
 
 
 /**

diff --git a/...api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/...api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
@@ -19,9 +19,9 @@
 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;
 
 
 /**

diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/PetTest.java
@@ -22,9 +22,9 @@
 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;
 
 
 /**

diff --git a/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/model/QueryTest.java b/...es/client/echo_api/java/native/src/test/java/org/openapitools/client/model/QueryTest.java
@@ -20,9 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 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;
 
 
 /**

diff --git a/...t/echo_api/java/native/src/test/java/org/openapitools/client/model/StringEnumRefTest.java b/...t/echo_api/java/native/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
@@ -13,9 +13,9 @@
 
 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;
 
 
 /**

diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/TagTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**

diff --git a/...src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java b/...src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
@@ -19,9 +19,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
-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

diff --git a/.../client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java b/.../client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**

diff --git a/...itools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java b/...itools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
@@ -20,9 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 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;
 
 
 /**

diff --git a/...itools/client/model/TestQueryStyleFormExplodeTrueObjectAllOfQueryObjectParameterTest.java b/...itools/client/model/TestQueryStyleFormExplodeTrueObjectAllOfQueryObjectParameterTest.java
@@ -18,9 +18,9 @@
 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;
 
 
 /**