Skip to content

Commit b67a019

Browse files
thorstenhirschthorstenhirsch
authored
upgrade apache-httpclient to junit5 (#18616)
1 parent 4441ab3 commit b67a019

File tree

91 files changed

+350
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+350
-353
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package {{package}};
55
import {{invokerPackage}}.ApiException;
66
{{#imports}}import {{import}};
77
{{/imports}}
8-
import org.junit.Test;
9-
import org.junit.Ignore;
10-
import org.junit.Assert;
8+
import org.junit.jupiter.api.Assertions;
9+
import org.junit.jupiter.api.Disabled;
10+
import org.junit.jupiter.api.Test;
1111

1212
import java.time.LocalDate;
1313
import java.time.OffsetDateTime;
@@ -19,7 +19,7 @@ import java.util.Map;
1919
/**
2020
* API tests for {{classname}}
2121
*/
22-
@Ignore
22+
@Disabled
2323
public class {{classname}}Test {
2424
2525
private final {{classname}} api = new {{classname}}();

‎modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache

+4-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>
8282
<artifactId>maven-surefire-plugin</artifactId>
83-
<version>3.0.0-M7</version>
83+
<version>3.2.5</version>
8484
<configuration>
8585
<systemPropertyVariables>
8686
<property>
@@ -91,7 +91,6 @@
9191
<argLine>-Xms512m -Xmx1500m</argLine>
9292
<parallel>methods</parallel>
9393
<threadCount>10</threadCount>
94-
<forkMode>pertest</forkMode>
9594
</configuration>
9695
</plugin>
9796
<plugin>
@@ -337,8 +336,8 @@
337336
</dependency>
338337
<!-- test dependencies -->
339338
<dependency>
340-
<groupId>junit</groupId>
341-
<artifactId>junit</artifactId>
339+
<groupId>org.junit.jupiter</groupId>
340+
<artifactId>junit-jupiter-api</artifactId>
342341
<version>${junit-version}</version>
343342
<scope>test</scope>
344343
</dependency>
@@ -366,6 +365,6 @@
366365
{{#useBeanValidation}}
367366
<beanvalidation-version>3.0.2</beanvalidation-version>
368367
{{/useBeanValidation}}
369-
<junit-version>4.13.2</junit-version>
368+
<junit-version>5.10.2</junit-version>
370369
</properties>
371370
</project>

‎samples/client/echo_api/java/apache-httpclient/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<plugin>
7474
<groupId>org.apache.maven.plugins</groupId>
7575
<artifactId>maven-surefire-plugin</artifactId>
76-
<version>3.0.0-M7</version>
76+
<version>3.2.5</version>
7777
<configuration>
7878
<systemPropertyVariables>
7979
<property>
@@ -84,7 +84,6 @@
8484
<argLine>-Xms512m -Xmx1500m</argLine>
8585
<parallel>methods</parallel>
8686
<threadCount>10</threadCount>
87-
<forkMode>pertest</forkMode>
8887
</configuration>
8988
</plugin>
9089
<plugin>
@@ -262,8 +261,8 @@
262261
</dependency>
263262
<!-- test dependencies -->
264263
<dependency>
265-
<groupId>junit</groupId>
266-
<artifactId>junit</artifactId>
264+
<groupId>org.junit.jupiter</groupId>
265+
<artifactId>junit-jupiter-api</artifactId>
267266
<version>${junit-version}</version>
268267
<scope>test</scope>
269268
</dependency>
@@ -275,6 +274,6 @@
275274
<jackson-databind-version>2.15.2</jackson-databind-version>
276275
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
277276
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
278-
<junit-version>4.13.2</junit-version>
277+
<junit-version>5.10.2</junit-version>
279278
</properties>
280279
</project>

‎samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java

+62-62
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.util.Arrays;
1818
import java.util.Collections;
1919

20-
import org.junit.Assert;
21-
import org.junit.Test;
20+
import org.junit.jupiter.api.Assertions;
21+
import org.junit.jupiter.api.Test;
2222
import org.openapitools.client.api.BodyApi;
2323
import org.openapitools.client.api.QueryApi;
2424
import org.openapitools.client.model.Category;
@@ -52,13 +52,13 @@ public void testEchoBodyPet() throws ApiException {
5252
photoUrls( Arrays.asList( new String[] { "http://a.com", "http://b.com" } ) ).category( new Category().id( 987L ).name( "new category" ) );
5353

5454
final Pet p = bodyApi.testEchoBodyPet( queryObject );
55-
Assert.assertNotNull( p );
56-
Assert.assertEquals( "Hello World", p.getName() );
57-
Assert.assertEquals( Long.valueOf( 12345L ), p.getId() );
55+
Assertions.assertNotNull( p );
56+
Assertions.assertEquals( "Hello World", p.getName() );
57+
Assertions.assertEquals( Long.valueOf( 12345L ), p.getId() );
5858

5959
// response is empty body
6060
final Pet p2 = bodyApi.testEchoBodyPet( null );
61-
Assert.assertNull( p2 );
61+
Assertions.assertNull( p2 );
6262
}
6363

6464
/**
@@ -72,7 +72,7 @@ public void testEchoBodyPet() throws ApiException {
7272
public void testEchoBodyPetResponseString() throws ApiException {
7373
// response is empty body
7474
final String p2 = bodyApi.testEchoBodyPetResponseString( null );
75-
Assert.assertNull( p2 );
75+
Assertions.assertNull( p2 );
7676
}
7777

7878
/**
@@ -89,7 +89,7 @@ public void testQueryStyleFormExplodeTrueObjectTest() throws ApiException {
8989

9090
final String response = api.testQueryStyleFormExplodeTrueObject( queryObject );
9191
final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
92-
Assert.assertEquals(
92+
Assertions.assertEquals(
9393
"/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",
9494
p.path );
9595
}
@@ -106,13 +106,13 @@ public void testQueryStyleDeepObjectExplodeTrueObject() throws ApiException {
106106
final Pet queryObject = new Pet().id( 12345L ).name( "Hello World" ).
107107
photoUrls( Arrays.asList( new String[] { "http://a.com", "http://b.com" } ) ).category( new Category().id( 987L ).name( "new category" ) );
108108

109-
Assert.assertEquals(
109+
Assertions.assertEquals(
110110
"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",
111111
queryObject.toUrlQueryString( "query_object" ) );
112112

113113
final String response = api.testQueryStyleDeepObjectExplodeTrueObject( queryObject );
114114
final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
115-
Assert.assertEquals(
115+
Assertions.assertEquals(
116116
"/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",
117117
p.path );
118118
}
@@ -132,7 +132,7 @@ public void testQueryStyleFormExplodeTrueObjectAllOfTest() throws ApiException {
132132

133133
final String response = api.testQueryStyleFormExplodeTrueObjectAllOf( queryObject );
134134
final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
135-
Assert.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
135+
Assertions.assertEquals( "/query/style_form/explode_true/object/allOf?id=3487&outcomes=SKIPPED&outcomes=FAILURE&text=Hello%20World", p.path );
136136
}
137137

138138
/**
@@ -149,7 +149,7 @@ public void testQueryStyleFormExplodeTrueArrayString() throws ApiException {
149149

150150
final String response = api.testQueryStyleFormExplodeTrueArrayString( q );
151151
final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
152-
Assert.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
152+
Assertions.assertEquals( "/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path );
153153
}
154154

155155
/**
@@ -163,44 +163,44 @@ public void testQueryStyleFormExplodeTrueArrayString() throws ApiException {
163163
public void testQueryIntegerBooleanString() throws ApiException {
164164
final String response = api.testQueryIntegerBooleanString( 1, true, "Hello World" );
165165
final org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser( response );
166-
Assert.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
166+
Assertions.assertEquals( "/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path );
167167
}
168168

169169
@Test
170170
public void testArrayDefaultValues() {
171171
// test array default values
172172
final DefaultValue d = new DefaultValue();
173-
Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
174-
Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
175-
Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
173+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
174+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
175+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
176176

177-
Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
178-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
179-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
177+
Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
178+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
179+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
180180

181-
Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
182-
Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
183-
Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
181+
Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
182+
Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
183+
Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
184184

185-
Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
186-
Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
187-
Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
185+
Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
186+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
187+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
188188

189-
Assert.assertNull( d.getArrayStringNullable() );
190-
Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
189+
Assertions.assertNull( d.getArrayStringNullable() );
190+
Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
191191

192192
// test addItem
193193
d.addArrayStringEnumDefaultItem( DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
194-
Assert.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
195-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
194+
Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 3 );
195+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 2 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
196196

197197
d.addArrayStringDefaultItem( "new item" );
198-
Assert.assertEquals( d.getArrayStringDefault().size(), 3 );
199-
Assert.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
198+
Assertions.assertEquals( d.getArrayStringDefault().size(), 3 );
199+
Assertions.assertEquals( d.getArrayStringDefault().get( 2 ), "new item" );
200200

201201
d.addArrayIntegerDefaultItem( 5 );
202-
Assert.assertEquals( d.getArrayIntegerDefault().size(), 3 );
203-
Assert.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
202+
Assertions.assertEquals( d.getArrayIntegerDefault().size(), 3 );
203+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 2 ), Integer.valueOf( 5 ) );
204204

205205
}
206206

@@ -213,26 +213,26 @@ public void testDefaultValuesSerializationWithEmptyPayload() throws IOException
213213
final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
214214
} );
215215

216-
Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
217-
Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
218-
Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
216+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 2 );
217+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.SUCCESS );
218+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 1 ), StringEnumRef.FAILURE );
219219

220-
Assert.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
221-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
222-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
220+
Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 2 );
221+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS );
222+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 1 ), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE );
223223

224-
Assert.assertEquals( d.getArrayStringDefault().size(), 2 );
225-
Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
226-
Assert.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
224+
Assertions.assertEquals( d.getArrayStringDefault().size(), 2 );
225+
Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
226+
Assertions.assertEquals( d.getArrayStringDefault().get( 1 ), "skipped" );
227227

228-
Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
229-
Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
230-
Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
228+
Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
229+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
230+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
231231

232-
Assert.assertNull( d.getArrayStringNullable() );
233-
Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
232+
Assertions.assertNull( d.getArrayStringNullable() );
233+
Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
234234

235-
Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
235+
Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
236236
"{\"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\":[]}" );
237237
}
238238

@@ -245,23 +245,23 @@ public void testDefaultValuesSerializationWithJSONString() throws IOException {
245245
final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
246246
} );
247247

248-
Assert.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
249-
Assert.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
248+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().size(), 1 );
249+
Assertions.assertEquals( d.getArrayStringEnumRefDefault().get( 0 ), StringEnumRef.UNCLASSIFIED );
250250

251-
Assert.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
252-
Assert.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
251+
Assertions.assertEquals( d.getArrayStringEnumDefault().size(), 1 );
252+
Assertions.assertEquals( d.getArrayStringEnumDefault().get( 0 ), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED );
253253

254-
Assert.assertEquals( d.getArrayStringDefault().size(), 1 );
255-
Assert.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
254+
Assertions.assertEquals( d.getArrayStringDefault().size(), 1 );
255+
Assertions.assertEquals( d.getArrayStringDefault().get( 0 ), "failure" );
256256

257-
Assert.assertEquals( d.getArrayIntegerDefault().size(), 2 );
258-
Assert.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
259-
Assert.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
257+
Assertions.assertEquals( d.getArrayIntegerDefault().size(), 2 );
258+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 0 ), Integer.valueOf( 1 ) );
259+
Assertions.assertEquals( d.getArrayIntegerDefault().get( 1 ), Integer.valueOf( 3 ) );
260260

261-
Assert.assertNull( d.getArrayStringNullable() );
262-
Assert.assertEquals( d.getArrayString(), Collections.emptyList() );
261+
Assertions.assertNull( d.getArrayStringNullable() );
262+
Assertions.assertEquals( d.getArrayString(), Collections.emptyList() );
263263

264-
Assert.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
264+
Assertions.assertEquals( apiClient.getObjectMapper().writeValueAsString( d ),
265265
"{\"array_string_enum_ref_default\":[\"unclassified\"],\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}" );
266266
}
267267

@@ -274,9 +274,9 @@ public void testDefaultValuesSerializationWithIncorrectDefaultValues() throws IO
274274
try {
275275
final DefaultValue d = apiClient.getObjectMapper().readValue( str, new TypeReference<DefaultValue>() {
276276
} );
277-
Assert.assertTrue( false ); // the test should not reach this line
277+
Assertions.assertTrue( false ); // the test should not reach this line
278278
} catch ( final com.fasterxml.jackson.databind.exc.ValueInstantiationException e ) {
279-
Assert.assertEquals( e.getMessage(),
279+
Assertions.assertEquals( e.getMessage(),
280280
"Cannot construct instance of `org.openapitools.client.model.DefaultValue$ArrayStringEnumDefaultEnum`, problem: Unexpected value 'invalid'\n" +
281281
" 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])" );
282282
}

‎samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
package org.openapitools.client.api;
1515

1616
import org.openapitools.client.ApiException;
17-
import org.junit.Test;
18-
import org.junit.Ignore;
19-
import org.junit.Assert;
17+
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.Disabled;
19+
import org.junit.jupiter.api.Assertions;
2020

2121
import java.time.LocalDate;
2222
import java.time.OffsetDateTime;
@@ -59,10 +59,10 @@ public void testAuthHttpBearerTest() throws ApiException {
5959
String response;
6060
api.getApiClient().setBearerToken("fixed token");
6161
response = api.testAuthHttpBearer();
62-
Assert.assertTrue(response.contains("Authorization: Bearer fixed token"));
62+
Assertions.assertTrue(response.contains("Authorization: Bearer fixed token"));
6363

6464
api.getApiClient().setBearerToken(() -> "dynamic token");
6565
response = api.testAuthHttpBearer();
66-
Assert.assertTrue(response.contains("Authorization: Bearer dynamic token"));
66+
Assertions.assertTrue(response.contains("Authorization: Bearer dynamic token"));
6767
}
6868
}

0 commit comments

Comments
 (0)