upgrade java native to junit5 (#18617)

* upgrade java native to junit5 * upgrade build.gradle, optimize imports * upgrade gradle, re-generate samples * migrate api_test.mustache and petstore tests of native-async & native-jakarta
OpenAPITools · May 10, 2024 · 854e521 · 854e521
1 parent 29cfa33
commit 854e521
Show file tree

Hide file tree

Showing 214 changed files with 686 additions and 837 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/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
@@ -74,7 +74,7 @@ ext {
     {{/swagger2AnnotationLibrary}}
     jackson_version = "2.14.1"
     jakarta_annotation_version = "1.3.5"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
     {{#hasFormParamsInSpec}}
     httpmime_version = "4.5.13"
     {{/hasFormParamsInSpec}}
@@ -97,7 +97,7 @@ dependencies {
     {{#hasFormParamsInSpec}}
     implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
     {{/hasFormParamsInSpec}}
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }
 
 // Use spotless plugin to automatically format code, remove unused import, etc

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/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/api_test.mustache
@@ -3,8 +3,8 @@ package {{package}};
 import {{invokerPackage}}.ApiClient;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/samples/client/echo_api/java/native/build.gradle b/samples/client/echo_api/java/native/build.gradle
@@ -68,7 +68,7 @@ artifacts {
 ext {
     jackson_version = "2.14.1"
     jakarta_annotation_version = "1.3.5"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
     httpmime_version = "4.5.13"
 }
 
@@ -81,7 +81,7 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:0.2.1"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
     implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }
 
 // Use spotless plugin to automatically format code, remove unused import, etc

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
@@ -13,21 +13,15 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,22 +13,16 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,21 +13,15 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,22 +13,16 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,22 +13,16 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.StringEnumRef;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,22 +13,16 @@
 
 package org.openapitools.client.api;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Ignore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 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
@@ -13,14 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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.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
@@ -13,14 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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.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
@@ -13,14 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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.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
@@ -13,18 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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 java.time.OffsetDateTime;
-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.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
@@ -13,20 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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 java.util.ArrayList;
-import java.util.List;
-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.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,7 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+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
@@ -13,15 +13,7 @@
 
 package org.openapitools.client.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-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 java.math.BigDecimal;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 /**