upgrade microprofile to junit5 (OpenAPITools#18669)

* upgrade microprofile to junit5 * re-generate samples * fix junit(DOT)version * update tests for java microprofile server * update samples * update * update * update * update --------- Co-authored-by: Thorsten Hirsch <[email protected]>
renatomameli · May 17, 2024 · cde5995 · cde5995
1 parent bdc8a6e
commit cde5995
Show file tree

Hide file tree

Showing 64 changed files with 712 additions and 809 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,9 +58,9 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
@@ -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,9 +58,9 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
@@ -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,9 +56,9 @@
     </plugins>
   </build>
   <dependencies>
-   <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
@@ -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.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
@@ -40,7 +40,7 @@ public class PetApiTest {
     private PetApi client;
     private String baseUrl = "http://localhost:9080";
 
-    @Before
+    @BeforeEach
     public void setup() throws MalformedURLException {
         // TODO initialize the client
     }
@@ -59,7 +59,7 @@ public void addPetTest() {
         // TODO: test validations
         Pet pet = null;
         //Pet response = api.addPet(pet);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -78,7 +78,7 @@ public void deletePetTest() {
         Long petId = null;
         String apiKey = null;
         //api.deletePet(petId, apiKey);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -96,7 +96,7 @@ public void findPetsByStatusTest() {
         // TODO: test validations
         List<String> status = null;
         //List<Pet> response = api.findPetsByStatus(status);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -114,7 +114,7 @@ public void findPetsByTagsTest() {
         // TODO: test validations
         List<String> tags = null;
         //List<Pet> response = api.findPetsByTags(tags);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -132,7 +132,7 @@ public void getPetByIdTest() {
         // TODO: test validations
         Long petId = null;
         //Pet response = api.getPetById(petId);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -150,7 +150,7 @@ public void updatePetTest() {
         // TODO: test validations
         Pet pet = null;
         //Pet response = api.updatePet(pet);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -170,7 +170,7 @@ public void updatePetWithFormTest() {
         String name = null;
         String status = null;
         //api.updatePetWithForm(petId, name, status);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -190,7 +190,7 @@ public void uploadFileTest() {
         String additionalMetadata = null;
         org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null;
         //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }

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.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
@@ -38,7 +38,7 @@ public class StoreApiTest {
     private StoreApi client;
     private String baseUrl = "http://localhost:9080";
 
-    @Before
+    @BeforeEach
     public void setup() throws MalformedURLException {
         // TODO initialize the client
     }
@@ -57,7 +57,7 @@ public void deleteOrderTest() {
         // TODO: test validations
         String orderId = null;
         //api.deleteOrder(orderId);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -74,7 +74,7 @@ public void deleteOrderTest() {
     public void getInventoryTest() {
         // TODO: test validations
         //Map<String, Integer> response = api.getInventory();
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -92,7 +92,7 @@ public void getOrderByIdTest() {
         // TODO: test validations
         Long orderId = null;
         //Order response = api.getOrderById(orderId);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -110,7 +110,7 @@ public void placeOrderTest() {
         // TODO: test validations
         Order order = null;
         //Order response = api.placeOrder(order);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }

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.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
@@ -39,7 +39,7 @@ public class UserApiTest {
     private UserApi client;
     private String baseUrl = "http://localhost:9080";
 
-    @Before
+    @BeforeEach
     public void setup() throws MalformedURLException {
         // TODO initialize the client
     }
@@ -58,7 +58,7 @@ public void createUserTest() {
         // TODO: test validations
         User user = null;
         //api.createUser(user);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -76,7 +76,7 @@ public void createUsersWithArrayInputTest() {
         // TODO: test validations
         List<User> user = null;
         //api.createUsersWithArrayInput(user);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -94,7 +94,7 @@ public void createUsersWithListInputTest() {
         // TODO: test validations
         List<User> user = null;
         //api.createUsersWithListInput(user);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -112,7 +112,7 @@ public void deleteUserTest() {
         // TODO: test validations
         String username = null;
         //api.deleteUser(username);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -130,7 +130,7 @@ public void getUserByNameTest() {
         // TODO: test validations
         String username = null;
         //User response = api.getUserByName(username);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -149,7 +149,7 @@ public void loginUserTest() {
         String username = null;
         String password = null;
         //String response = api.loginUser(username, password);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -166,7 +166,7 @@ public void loginUserTest() {
     public void logoutUserTest() {
         // TODO: test validations
         //api.logoutUser();
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }
@@ -185,7 +185,7 @@ public void updateUserTest() {
         String username = null;
         User user = null;
         //api.updateUser(username, user);
-        //assertNotNull(response);
+        //Assertions.assertNotNull(response);
 
 
     }