upgrade microprofile to junit5

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

Hide file tree

Showing 54 changed files with 183 additions and 179 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache
@@ -4,9 +4,13 @@ package {{package}};
 
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+{{#generateSpringBootApplication}}
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+{{/generateSpringBootApplication}}
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
@@ -26,7 +30,7 @@ import java.util.Set;
  * API tests for {{classname}}
  */
 {{#generateSpringBootApplication}}
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringApplicationConfiguration(classes = SpringBootApplication.class)
 @WebAppConfiguration
 @IntegrationTest("server.port=0")
@@ -36,7 +40,7 @@ public class {{classname}}Test {
     private {{classname}} client;
     private String baseUrl = "http://localhost:9080";
 
-    @Before
+    @BeforeEach
     public void setup() throws MalformedURLException {
         {{#microprofile3}}
         // TODO initialize the client
@@ -69,7 +73,7 @@ public class {{classname}}Test {
         {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}org.apache.cxf.jaxrs.ext.multipart.Attachment {{paramName}} = null;{{/isFile}}
         {{/allParams}}
         //{{^vendorExtensions.x-java-is-response-void}}{{#microprofileMutiny}}Uni<{{{returnType}}}>{{/microprofileMutiny}}{{^microprofileMutiny}}{{{returnType}}}{{/microprofileMutiny}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
-        //{{#returnType}}assertNotNull(response);{{/returnType}}
+        //{{#returnType}}Assertions.assertNotNull(response);{{/returnType}}
 
 
     }

diff --git a/...s/openapi-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache b/...s/openapi-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache
@@ -18,7 +18,7 @@
         <kumuluzee-rest.version>1.2.3</kumuluzee-rest.version>
         <kumuluzee-rest-client.version>1.4.1</kumuluzee-rest-client.version>
         <cxf-rt-rs-extension-providers.version>3.2.6</cxf-rt-rs-extension-providers.version>
-        <junit-version>4.13</junit-version>
+        <junit-version>5.10.2</junit-version>
         <jersey-version>2.28</jersey-version>
     </properties>
 
@@ -70,8 +70,8 @@
             <version>${cxf-rt-rs-extension-providers.version}</version>
         </dependency>
         <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>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -58,10 +58,10 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-version}</version>
       <scope>test</scope>
     </dependency>
 {{#useBeanValidation}}
@@ -212,7 +212,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
-    <junit.version>4.13.2</junit.version>
+    <junit.version>5.10.2</junit.version>
     <logback.version>1.4.14</logback.version>
 {{#useBeanValidation}}
     <beanvalidation.version>3.0.2</beanvalidation.version>

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache
@@ -58,10 +58,10 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-version}</version>
       <scope>test</scope>
     </dependency>
 {{#useBeanValidation}}
@@ -205,7 +205,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
-    <junit.version>4.13.2</junit.version>
+    <junit.version>5.10.2</junit.version>
     <logback.version>1.4.14</logback.version>
 {{#useBeanValidation}}
     <beanvalidation.version>3.0.1</beanvalidation.version>

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml
@@ -56,10 +56,10 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-version}</version>
       <scope>test</scope>
     </dependency>
     <!-- Eclipse MicroProfile Rest Client -->
@@ -154,7 +154,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
-    <junit.version>4.13.2</junit.version>
+    <junit.version>5.10.2</junit.version>
     <logback.version>1.4.14</logback.version>
     <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.15.2</jackson.jaxrs.version>

diff --git a/...est-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java b/...est-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -16,9 +16,9 @@
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...t-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/StoreApiTest.java b/...t-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -14,9 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...st-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/UserApiTest.java b/...st-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -15,9 +15,9 @@
 
 import java.util.Date;
 import org.openapitools.client.model.User;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/CategoryTest.java b/...client-3.0-jackson-with-xml/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;
 
 /**
  * Model tests for Category

diff --git a/....0-jackson-with-xml/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/....0-jackson-with-xml/src/test/java/org/openapitools/client/model/ModelApiResponseTest.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;
 
 /**
  * Model tests for ModelApiResponse

diff --git a/...st-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/OrderTest.java b/...st-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -19,9 +19,9 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Date;
-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 Order

diff --git a/...rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/PetTest.java b/...rest-client-3.0-jackson-with-xml/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;
 
 /**
  * Model tests for Pet

diff --git a/...rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/TagTest.java b/...rest-client-3.0-jackson-with-xml/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;
 
 /**
  * Model tests for Tag

diff --git a/...est-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/UserTest.java b/...est-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/model/UserTest.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;
 
 /**
  * Model tests for User

diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml
@@ -56,10 +56,10 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-version}</version>
       <scope>test</scope>
     </dependency>
     <!-- Eclipse MicroProfile Rest Client -->
@@ -143,7 +143,7 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger.core.version>1.5.18</swagger.core.version>
     <jetty.version>9.2.9.v20150224</jetty.version>
-    <junit.version>4.13.2</junit.version>
+    <junit.version>5.10.2</junit.version>
     <logback.version>1.4.14</logback.version>
     <cxf.version>3.2.7</cxf.version>
     <jackson.jaxrs.version>2.15.2</jackson.jaxrs.version>

diff --git a/...profile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java b/...profile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -16,9 +16,9 @@
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...ofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java b/...ofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -14,9 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...rofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java b/...rofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -15,9 +15,9 @@
 
 import java.util.Date;
 import org.openapitools.client.model.User;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 

diff --git a/...ile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/model/CategoryTest.java b/...ile-rest-client-3.0-jackson/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;
 
 /**
  * Model tests for Category

diff --git a/...-client-3.0-jackson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/...-client-3.0-jackson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.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;
 
 /**
  * Model tests for ModelApiResponse

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

diff --git a/...oprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/model/PetTest.java b/...oprofile-rest-client-3.0-jackson/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;
 
 /**
  * Model tests for Pet

diff --git a/...oprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/model/TagTest.java b/...oprofile-rest-client-3.0-jackson/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;
 
 /**
  * Model tests for Tag

diff --git a/...profile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/model/UserTest.java b/...profile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/model/UserTest.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;
 
 /**
  * Model tests for User