Skip to content

Commit 6f83577

Browse files
martin-mfgtimon-sbr
martin-mfg
authored and
timon-sbr
committed
update sample tests, fix Java tests (OpenAPITools#20300)
* replace removed forkMode * remove junit runner where it's not needed * update samples without skipping test files, but skip files named "FILES" * revert overwriting custom tests, add custom java tests to list * add one sample to CircleCI, fix various Java tests
1 parent 1292918 commit 6f83577

File tree

2,133 files changed

+12113
-8787
lines changed

Some content is hidden

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

2,133 files changed

+12113
-8787
lines changed

‎CI/circle_parallel.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ else
121121
(cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test)
122122
(cd samples/client/petstore/java/okhttp-gson && mvn integration-test)
123123
(cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test)
124+
(cd samples/client/petstore/java/okhttp-gson-dynamicOperations && mvn integration-test)
124125
(cd samples/client/petstore/java/resteasy && mvn integration-test)
125126
(cd samples/client/petstore/java-micronaut-client && mvn integration-test)
126127
(cd samples/client/petstore/java/apache-httpclient && mvn integration-test)

‎bin/utils/test_file_list.yaml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
sha256: b98a6043573332de4f049db50b36bce7b5fada8511769da97f6561066a0f8c5c
77
- filename: "samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools.Test/linux-logo.png"
88
sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
9-
# java okhttp gson test files
9+
# java test files
1010
- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
1111
sha256: 325fdd5d7e2c97790c0fb44f712ab7b2ba022d7e1a5b0056f47b07f342682b6d
1212
- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
@@ -15,3 +15,37 @@
1515
sha256: 8b1b8f2a2ad00ccb090873a94a5f73e328b98317d2ec715f53bd7a1accb2a023
1616
- filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java"
1717
sha256: a1f8a70bf7b0c382a8def5bacf7b1fb189e687fabb40235aa799001e0597f545
18+
- filename: "samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/api/AuthApiTest.java"
19+
sha256: 26f2dd90f9075e51add1cd7e88869a1e9345d9dbacf01199c1bf8a49395a8648
20+
- filename: "samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/api/AuthApiTest.java"
21+
sha256: b45d2ff04ad65e39a4d67a86a37d1a406e125df392f51ef0484d6c8da8b10454
22+
- filename: "samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/api/AuthApiTest.java"
23+
sha256: 761d101afddb8920f640c91741b5e7af56ebd753c80d537e0aaa4e1021887666
24+
- filename: "samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java"
25+
sha256: 04715cabbe9bd27ff98dd56e3db489ebc9ffbf98d9af104a6707b0a40ab4f8fe
26+
- filename: "samples/client/echo_api/java/resttemplate/src/test/java/org/openapitools/client/api/AuthApiTest.java"
27+
sha256: 38193bbad7f3eef087bc1474352e484178b14a2b8c0e0ba0cd4e4960516a14f9
28+
- filename: "samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java"
29+
sha256: 24c6a39a9d7327d397dc038c368a19c84f14ed96a69fe28d53719b3eaf0a725c
30+
- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/PetApiTest.java"
31+
sha256: 5e9f471d34310f94895751bb96cc79583376f043593c3a387c82077c70f8102f
32+
- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/model/MammalTest.java"
33+
sha256: 67a9e63e13ebddac21cb236aa015edce30f5d3bd8d6adcf50044cad00d48c45e
34+
- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/model/ZebraTest.java"
35+
sha256: 15eeb6d8a9a79d0f1930b861540d9c5780d6c49ea4fdb68269ac3e7ec481e142
36+
- filename: "samples/client/petstore/java/okhttp-gson-3.1/src/test/java/org/openapitools/client/api/PetApiTest.java"
37+
sha256: d8f7fff724f81e666daf115cc25f8347e1fda4e861aa30df0dae3fa50c91404c
38+
- filename: "samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/PetApiTest.java"
39+
sha256: 0cc079be64fe261b46f89976be2cbfad4fe5173dbe0d4b45303570299b0b5ecc
40+
- filename: "samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java"
41+
sha256: 3c41eb12d126f90392d97e3250b53ea9dce1663fb714a19339445b9da734d634
42+
- filename: "samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/PetApiTest.java"
43+
sha256: 68ed9228c99ecf2ff3842074242d3be7565da3b702b7f46008a5e119ef15c167
44+
- filename: "samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/test/java/org/openapitools/client/model/MySchemaNameCharactersTest.java"
45+
sha256: f0a82dd21d10f199bc403241fc9c7f4a8fa5e2d1646fd06f7941c2e528a1da45
46+
- filename: "samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/api/PetApiTest.java"
47+
sha256: 5e9f471d34310f94895751bb96cc79583376f043593c3a387c82077c70f8102f
48+
- filename: "samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/MammalTest.java"
49+
sha256: 67a9e63e13ebddac21cb236aa015edce30f5d3bd8d6adcf50044cad00d48c45e
50+
- filename: "samples/openapi3/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/ZebraTest.java"
51+
sha256: 15eeb6d8a9a79d0f1930b861540d9c5780d6c49ea4fdb68269ac3e7ec481e142

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</systemPropertyVariables>
7474
<argLine>-Xms512m -Xmx1500m</argLine>
7575
<parallel>methods</parallel>
76-
<forkMode>pertest</forkMode>
76+
<reuseForks>false</reuseForks>
7777
<useUnlimitedThreads>true</useUnlimitedThreads>
7878
</configuration>
7979
<dependencies>
@@ -337,12 +337,6 @@
337337
<version>${junit-version}</version>
338338
<scope>test</scope>
339339
</dependency>
340-
<dependency>
341-
<groupId>org.junit.platform</groupId>
342-
<artifactId>junit-platform-runner</artifactId>
343-
<version>${junit-platform-runner.version}</version>
344-
<scope>test</scope>
345-
</dependency>
346340
</dependencies>
347341
<properties>
348342
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -367,6 +361,5 @@
367361
<hibernate-validator-version>5.4.3.Final</hibernate-validator-version>
368362
{{/performBeanValidation}}
369363
<junit-version>5.10.2</junit-version>
370-
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
371364
</properties>
372365
</project>

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</systemPropertyVariables>
7474
<argLine>-Xms512m -Xmx1500m</argLine>
7575
<parallel>methods</parallel>
76-
<forkMode>pertest</forkMode>
76+
<reuseForks>false</reuseForks>
7777
<useUnlimitedThreads>true</useUnlimitedThreads>
7878
</configuration>
7979
<dependencies>
@@ -352,12 +352,6 @@
352352
<version>${junit-version}</version>
353353
<scope>test</scope>
354354
</dependency>
355-
<dependency>
356-
<groupId>org.junit.platform</groupId>
357-
<artifactId>junit-platform-runner</artifactId>
358-
<version>${junit-platform-runner.version}</version>
359-
<scope>test</scope>
360-
</dependency>
361355
</dependencies>
362356
<properties>
363357
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -389,6 +383,5 @@
389383
<hibernate-validator-version>5.4.3.Final</hibernate-validator-version>
390384
{{/performBeanValidation}}
391385
<junit-version>5.10.2</junit-version>
392-
<junit-platform-runner.version>1.10.0</junit-platform-runner.version>
393386
</properties>
394387
</project>

‎samples/client/echo_api/go/test/api_auth_test.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/echo_api/go/test/api_form_test.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/echo_api/go/test/api_header_test.go‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/echo_api/go/test/api_path_test.go‎

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/echo_api/go/test/api_query_test.go‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)