upgrade apache-httpclient to junit5 (#18616)

OpenAPITools · May 9, 2024 · b67a019 · b67a019
1 parent 4441ab3
commit b67a019
Show file tree

Hide file tree

Showing 91 changed files with 350 additions and 353 deletions.
diff --git a/...s/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache b/...s/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache
@@ -5,9 +5,9 @@ package {{package}};
 import {{invokerPackage}}.ApiException;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * 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/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -91,7 +91,6 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -337,8 +336,8 @@
         </dependency>
         <!-- 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>
@@ -366,6 +365,6 @@
         {{#useBeanValidation}}
         <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useBeanValidation}}
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/apache-httpclient/pom.xml b/samples/client/echo_api/java/apache-httpclient/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.2.5</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -84,7 +84,6 @@
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -262,8 +261,8 @@
         </dependency>
         <!-- 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>
@@ -275,6 +274,6 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/...ent/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java b/...ent/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java
@@ -17,8 +17,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-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;
@@ -52,13 +52,13 @@ public void testEchoBodyPet() throws ApiException {
             photoUrls( Arrays.asList( new String[] { "http://a.com", "http://b.com" } ) ).category( new Category().id( 987L ).name( "new category" ) );
 
       final Pet p = bodyApi.testEchoBodyPet( queryObject );
-      Assert.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
       final Pet p2 = bodyApi.testEchoBodyPet( null );
-      Assert.assertNull( p2 );
+      Assertions.assertNull( p2 );
    }
 
    /**
@@ -72,7 +72,7 @@ public void testEchoBodyPet() throws ApiException {
    public void testEchoBodyPetResponseString() throws ApiException {
       // response is empty body
       final String p2 = bodyApi.testEchoBodyPetResponseString( null );
-      Assert.assertNull( p2 );
+      Assertions.assertNull( p2 );
    }
 
    /**
@@ -89,7 +89,7 @@ public void testQueryStyleFormExplodeTrueObjectTest() throws ApiException {
 
       final String response = api.testQueryStyleFormExplodeTrueObject( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "/query/style_form/explode_true/object?id=12345&name=Hello%20World&category=class%20Category%20%7B%0A%20%20%20%20id%3A%20987%0A%20%20%20%20name%3A%20new%20category%0A%7D&photoUrls=http%3A%2F%2Fa.com&photoUrls=http%3A%2F%2Fb.com",
             p.path );
    }
@@ -106,13 +106,13 @@ public void testQueryStyleDeepObjectExplodeTrueObject() throws ApiException {
       final Pet queryObject = 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" ) );
 
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com",
             queryObject.toUrlQueryString( "query_object" ) );
 
       final String response = api.testQueryStyleDeepObjectExplodeTrueObject( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals(
+      Assertions.assertEquals(
             "/query/style_deepObject/explode_true/object?query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com",
             p.path );
    }
@@ -132,7 +132,7 @@ public void testQueryStyleFormExplodeTrueObjectAllOfTest() throws ApiException {
 
       final String response = api.testQueryStyleFormExplodeTrueObjectAllOf( queryObject );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
+      Assertions.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
    }
 
    /**
@@ -149,7 +149,7 @@ public void testQueryStyleFormExplodeTrueArrayString() throws ApiException {
 
       final String response = api.testQueryStyleFormExplodeTrueArrayString( q );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
+      Assertions.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
    }
 
    /**
@@ -163,44 +163,44 @@ public void testQueryStyleFormExplodeTrueArrayString() throws ApiException {
    public void testQueryIntegerBooleanString() throws ApiException {
       final String response = api.testQueryIntegerBooleanString( 1, true, "Hello World" );
       final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
-      Assert.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
+      Assertions.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
    }
 
    @Test
    public void testArrayDefaultValues() {
       // test array default values
       final DefaultValue d = new DefaultValue();
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
-      Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
       // test addItem
       d.addArrayStringEnumDefaultItem( DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
 
       d.addArrayStringDefaultItem( "new item" );
-      Assert.assertEquals( d.getArrayStringDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
 
       d.addArrayIntegerDefaultItem( 5 );
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 3 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 3 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
 
    }
 
@@ -213,26 +213,26 @@ public void testDefaultValuesSerializationWithEmptyPayload() throws IOException
       final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
       } );
 
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
-      Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
-      Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
+      Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
             "{\"array_string_enum_ref_default\":[\"success\",\"failure\"],\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}" );
    }
 
@@ -245,23 +245,23 @@ public void testDefaultValuesSerializationWithJSONString() throws IOException {
       final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
       } );
 
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
 
-      Assert.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
 
-      Assert.assertEquals( d.getArrayStringDefault().size(), 1 );
-      Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
+      Assertions.assertEquals( d.getArrayStringDefault().size(), 1 );
+      Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
 
-      Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
-      Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
+      Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
 
-      Assert.assertNull( d.getArrayStringNullable() );
-      Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
+      Assertions.assertNull( d.getArrayStringNullable() );
+      Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
 
-      Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
+      Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
             "{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}" );
    }
 
@@ -274,9 +274,9 @@ public void testDefaultValuesSerializationWithIncorrectDefaultValues() throws IO
       try {
          final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
          } );
-         Assert.assertTrue( false ); // the test should not reach this line
+         Assertions.assertTrue( false ); // the test should not reach this line
       } catch ( final com.fasterxml.jackson.databind.exc.ValueInstantiationException e ) {
-         Assert.assertEquals( e.getMessage(),
+         Assertions.assertEquals( e.getMessage(),
                "Cannot construct instance of `org.openapitools.client.model.DefaultValue$ArrayStringEnumDefaultEnum`, problem: Unexpected value 'invalid'\n" +
                      " at [Source: (String)\"{ \"array_string_enum_default\": [\"invalid\"] }\"; line: 1, column: 33] (through reference chain: org.openapitools.client.model.DefaultValue[\"array_string_enum_default\"]->java.util.ArrayList[0])" );
       }

diff --git a/...cho_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java b/...cho_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java
@@ -14,9 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -59,10 +59,10 @@ public void testAuthHttpBearerTest() throws ApiException {
         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"));
     }
 }