Skip to content

Commit 47abf82

Browse files
authored
[java] update rest-assured, retrofit2, vertx to use junit 5 (#19185)
* update rest assured to use junit 5 * regenerate samples * update junit from 4 to 5 for retrofit2, vertx * update vertx test template
1 parent 75cbebd commit 47abf82

447 files changed

Lines changed: 4512 additions & 4633 deletions

File tree

Some content is hidden

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

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {{invokerPackage}}.ApiClient;
88
import {{apiPackage}}.{{classname}};
99
import io.restassured.builder.RequestSpecBuilder;
1010
import io.restassured.filter.log.ErrorLoggingFilter;
11-
import org.junit.Before;
12-
import org.junit.Test;
13-
import org.junit.Ignore;
11+
import org.junit.jupiter.api.BeforeEach;
12+
import org.junit.jupiter.api.Disabled;
13+
import org.junit.jupiter.api.Test;
1414

1515
import java.time.LocalDate;
1616
import java.time.OffsetDateTime;
@@ -31,12 +31,12 @@ import static {{invokerPackage}}.{{#gson}}GsonObjectMapper.gson{{/gson}}{{#jacks
3131
/**
3232
* API tests for {{classname}}
3333
*/
34-
@Ignore
34+
@Disabled
3535
public class {{classname}}Test {
3636
3737
private {{classname}} api;
3838

39-
@Before
39+
@BeforeEach
4040
public void createApi() {
4141
api = ApiClient.api(ApiClient.Config.apiConfig().reqSpecSupplier(
4242
() -> new RequestSpecBuilder()

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,13 @@ ext {
104104
swagger_annotations_version = "2.2.15"
105105
{{/swagger2AnnotationLibrary}}
106106
rest_assured_version = "5.3.2"
107-
junit_version = "4.13.2"
107+
junit_version = "5.10.3"
108108
{{#jackson}}
109109
jackson_version = "2.17.1"
110110
jackson_databind_version = "2.17.1"
111111
{{#openApiNullable}}
112112
jackson_databind_nullable_version = "0.2.6"
113113
{{/openApiNullable}}
114-
jakarta_annotation_version = "1.3.5"
115114
{{/jackson}}
116115
{{#gson}}
117116
gson_version = "2.10.1"
@@ -121,6 +120,7 @@ ext {
121120
jodatime_version = "2.10.5"
122121
{{/joda}}
123122
okio_version = "3.6.0"
123+
jakarta_annotation_version = "1.3.5"
124124
}
125125

126126
dependencies {
@@ -163,5 +163,5 @@ dependencies {
163163
implementation "org.hibernate:hibernate-validator:6.0.19.Final"
164164
{{/performBeanValidation}}
165165
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
166-
testImplementation "junit:junit:$junit_version"
166+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
167167
}

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ lazy val root = (project in file(".")).
4343
"org.hibernate" % "hibernate-validator" % "6.0.19.Final" % "compile",
4444
{{/performBeanValidation}}
4545
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
46-
"junit" % "junit" % "4.13.2" % "test",
46+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
4747
"com.novocode" % "junit-interface" % "0.10" % "test"
4848
)
4949
)

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@
331331
{{/performBeanValidation}}
332332
<!-- test dependencies -->
333333
<dependency>
334-
<groupId>junit</groupId>
335-
<artifactId>junit</artifactId>
334+
<groupId>org.junit.jupiter</groupId>
335+
<artifactId>junit-jupiter-api</artifactId>
336336
<version>${junit-version}</version>
337337
<scope>test</scope>
338338
</dependency>
@@ -366,6 +366,6 @@
366366
<beanvalidation-version>3.0.2</beanvalidation-version>
367367
{{/useBeanValidation}}
368368
<okio-version>3.6.0</okio-version>
369-
<junit-version>4.13.2</junit-version>
369+
<junit-version>5.10.3</junit-version>
370370
</properties>
371371
</project>

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package {{package}};
33
import {{invokerPackage}}.ApiClient;
44
{{#imports}}import {{import}};
55
{{/imports}}
6-
import org.junit.Before;
7-
import org.junit.Test;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.Disabled;
8+
import org.junit.jupiter.api.Test;
89

910
import java.time.LocalDate;
1011
import java.time.OffsetDateTime;
@@ -25,7 +26,7 @@ public class {{classname}}Test {
2526
2627
private {{classname}} api;
2728

28-
@Before
29+
@BeforeEach
2930
public void setup() {
3031
api = new ApiClient().createService({{classname}}.class);
3132
}

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ ext {
112112
{{/usePlayWS}}
113113
jakarta_annotation_version = "1.3.5"
114114
swagger_annotations_version = "1.5.22"
115-
junit_version = "4.13.2"
115+
junit_version = "5.10.3"
116116
{{#useRxJava2}}
117117
rx_java_version = "2.1.1"
118118
{{/useRxJava2}}
@@ -162,5 +162,5 @@ dependencies {
162162
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
163163
{{/jackson}}
164164
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
165-
testImplementation "junit:junit:$junit_version"
165+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
166166
}

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ lazy val root = (project in file(".")).
3737
{{/joda}}
3838
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
3939
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
40-
"junit" % "junit" % "4.13.2" % "test",
40+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
4141
"com.novocode" % "junit-interface" % "0.11" % "test"
4242
)
4343
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
</dependency>
368368
<!-- test dependencies -->
369369
<dependency>
370-
<groupId>junit</groupId>
371-
<artifactId>junit</artifactId>
370+
<groupId>org.junit.jupiter</groupId>
371+
<artifactId>junit-jupiter-api</artifactId>
372372
<version>${junit-version}</version>
373373
<scope>test</scope>
374374
</dependency>
@@ -413,6 +413,6 @@
413413
<beanvalidation-version>3.0.2</beanvalidation-version>
414414
{{/useBeanValidation}}
415415
<oltu-version>1.0.1</oltu-version>
416-
<junit-version>4.13.2</junit-version>
416+
<junit-version>5.10.3</junit-version>
417417
</properties>
418418
</project>

modules/openapi-generator/src/main/resources/Java/libraries/vertx/api_test.mustache

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ package {{package}};
66

77
import {{invokerPackage}}.Configuration;
88

9-
import org.junit.Test;
10-
import org.junit.Ignore;
11-
import org.junit.BeforeClass;
12-
import org.junit.Rule;
13-
import org.junit.runner.RunWith;
9+
import org.junit.jupiter.api.BeforeAll;
10+
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Disabled;
12+
import org.junit.jupiter.api.Test;
1413

1514
import io.vertx.core.AsyncResult;
1615
import io.vertx.core.Handler;
@@ -31,24 +30,18 @@ import java.util.Map;
3130
/**
3231
* API tests for {{classname}}
3332
*/
34-
@RunWith(VertxUnitRunner.class)
35-
@Ignore
33+
@Disabled
3634
public class {{classname}}Test {
3735
3836
private {{classname}} api;
3937

40-
@Rule
41-
public RunTestOnContext rule = new RunTestOnContext();
42-
43-
@BeforeClass
38+
@BeforeAll
4439
public void setupApiClient() {
45-
JsonObject config = new JsonObject();
46-
Vertx vertx = rule.vertx();
47-
Configuration.setupDefaultApiClient(vertx, config);
48-
4940
api = new {{classname}}Impl();
5041
}
51-
{{#operations}}{{#operation}}
42+
43+
{{#operations}}
44+
{{#operation}}
5245
/**
5346
* {{summary}}
5447
* {{notes}}
@@ -66,5 +59,6 @@ public class {{classname}}Test {
6659
async.complete();
6760
});
6861
}
69-
{{/operation}}{{/operations}}
62+
{{/operation}}
63+
{{/operations}}
7064
}

modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ext {
3333
jackson_version = "2.17.1"
3434
jackson_databind_version = "2.17.1"
3535
vertx_version = "3.5.2"
36-
junit_version = "4.13.2"
36+
junit_version = "5.10.3"
3737
{{#openApiNullable}}
3838
jackson_databind_nullable_version = "0.2.6"
3939
{{/openApiNullable}}
@@ -56,6 +56,6 @@ dependencies {
5656
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
5757
{{/openApiNullable}}
5858
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
59-
testImplementation "junit:junit:$junit_version"
59+
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
6060
testImplementation "io.vertx:vertx-unit:$vertx_version"
6161
}

0 commit comments

Comments
 (0)