Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Java][webclient] update junit to 5.x #18741

Merged
merged 10 commits into from
May 23, 2024
Merged

[Java][webclient] update junit to 5.x #18741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d694ec2
webclient: update junit to 5.x
wing328 May 23, 2024
ad67d42
update samples
wing328 May 23, 2024
eb85e1a
update samples
wing328 May 23, 2024
aca02e1
update samples
wing328 May 23, 2024
88dc7c6
update samples
wing328 May 23, 2024
ecb6d25
update samples
wing328 May 23, 2024
da8a2eb
clean up
wing328 May 23, 2024
ff131ab
update samples
wing328 May 23, 2024
0a8ee0c
update pom plugin version
wing328 May 23, 2024
f10bc04
update tests
wing328 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ package {{package}};

{{#imports}}import {{import}};
{{/imports}}
import org.junit.Test;
import org.junit.Ignore;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -21,7 +22,7 @@ import jakarta.validation.Valid;
/**
* API tests for {{classname}}
*/
@Ignore
@Disabled
public class {{classname}}Test {

private final {{classname}} api = new {{classname}}();
Expand All @@ -34,10 +35,11 @@ public class {{classname}}Test {
*/
@Test
public void {{operationId}}Test() {
// uncomment below to test the function
{{#allParams}}
{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.AbstractResource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.AbstractResource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}} = null;
//{{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.AbstractResource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.AbstractResource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}} = null;
{{/allParams}}
{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}){{^vendorExtensions.x-webclient-blocking}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#uniqueItems}}.collect(Collectors.toSet()){{/uniqueItems}}{{^uniqueItems}}.collectList(){{/uniqueItems}}.block(){{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}.block(){{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/vendorExtensions.x-webclient-blocking}};
//{{#returnType}}{{#isResponseFile}}{{#useAbstractionForFiles}}org.springframework.core.io.Resource{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{.}}}{{/useAbstractionForFiles}}{{/isResponseFile}}{{^isResponseFile}}{{{.}}}{{/isResponseFile}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}){{^vendorExtensions.x-webclient-blocking}}{{#vendorExtensions.x-webclient-return-except-list-of-string}}{{#uniqueItems}}.collect(Collectors.toSet()){{/uniqueItems}}{{^uniqueItems}}.collectList(){{/uniqueItems}}.block(){{/vendorExtensions.x-webclient-return-except-list-of-string}}{{^vendorExtensions.x-webclient-return-except-list-of-string}}.block(){{/vendorExtensions.x-webclient-return-except-list-of-string}}{{/vendorExtensions.x-webclient-blocking}};

// TODO: test validations
}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ ext {
{{#joda}}
jodatime_version = "2.9.9"
{{/joda}}
junit_version = "4.13.2"
junit_version = "5.10.2"
}

dependencies {
Expand All @@ -176,5 +176,5 @@ dependencies {
{{/joda}}
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.13.0</version>
<configuration>
{{#useJakartaEe}}
<source>17</source>
Expand All @@ -58,7 +58,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -153,8 +153,8 @@

<!-- 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>
Expand Down Expand Up @@ -184,7 +184,7 @@
<reactor-version>3.4.34</reactor-version>
<reactor-netty-version>1.0.39</reactor-netty-version>
{{/useJakartaEe}}
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
{{#joda}}
<jodatime-version>2.9.9</jodatime-version>
{{/joda}}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/others/java/webclient-useAbstractionForFiles/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ext {
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.6"
junit_version = "4.13.2"
junit_version = "5.10.2"
}

dependencies {
Expand All @@ -134,5 +134,5 @@ dependencies {
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}
10 changes: 5 additions & 5 deletions samples/client/others/java/webclient-useAbstractionForFiles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -112,8 +112,8 @@

<!-- 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>
Expand All @@ -127,6 +127,6 @@
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<reactor-version>3.4.34</reactor-version>
<reactor-netty-version>1.0.39</reactor-netty-version>
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
</properties>
</project>
10 changes: 6 additions & 4 deletions ...ent-useAbstractionForFiles/src/test/java/org/openapitools/client/api/ResourceApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
package org.openapitools.client.api;

import java.io.File;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -26,7 +27,7 @@
/**
* API tests for ResourceApi
*/
@Ignore
@Disabled
public class ResourceApiTest {

private final ResourceApi api = new ResourceApi();
Expand All @@ -39,7 +40,8 @@ public class ResourceApiTest {
*/
@Test
public void resourceInResponseTest() {
org.springframework.core.io.Resource response = api.resourceInResponse().block();
// uncomment below to test the function
//org.springframework.core.io.Resource response = api.resourceInResponse().block();

// TODO: test validations
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/java/webclient-jakarta/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ext {
jackson_version = "2.13.4"
jackson_databind_version = "2.13.4.2"
jackson_databind_nullable_version = "0.2.6"
junit_version = "4.13.2"
junit_version = "5.10.2"
}

dependencies {
Expand All @@ -134,5 +134,5 @@ dependencies {
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}
10 changes: 5 additions & 5 deletions samples/client/petstore/java/webclient-jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>3.13.0</version>
<configuration>
<source>17</source>
<target>17</target>
Expand All @@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -112,8 +112,8 @@

<!-- 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>
Expand All @@ -127,6 +127,6 @@
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<reactor-version>3.5.12</reactor-version>
<reactor-netty-version>1.1.13</reactor-netty-version>
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
</properties>
</project>
12 changes: 7 additions & 5 deletions .../java/webclient-jakarta/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
package org.openapitools.client.api;

import org.openapitools.client.model.Client;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -26,7 +27,7 @@
/**
* API tests for AnotherFakeApi
*/
@Ignore
@Disabled
public class AnotherFakeApiTest {

private final AnotherFakeApi api = new AnotherFakeApi();
Expand All @@ -39,8 +40,9 @@ public class AnotherFakeApiTest {
*/
@Test
public void call123testSpecialTagsTest() {
Client client = null;
Client response = api.call123testSpecialTags(client).block();
// uncomment below to test the function
//Client client = null;
//Client response = api.call123testSpecialTags(client).block();

// TODO: test validations
}
Expand Down
10 changes: 6 additions & 4 deletions ...tore/java/webclient-jakarta/src/test/java/org/openapitools/client/api/DefaultApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
package org.openapitools.client.api;

import org.openapitools.client.model.FooGetDefaultResponse;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -26,7 +27,7 @@
/**
* API tests for DefaultApi
*/
@Ignore
@Disabled
public class DefaultApiTest {

private final DefaultApi api = new DefaultApi();
Expand All @@ -39,7 +40,8 @@ public class DefaultApiTest {
*/
@Test
public void fooGetTest() {
FooGetDefaultResponse response = api.fooGet().block();
// uncomment below to test the function
//FooGetDefaultResponse response = api.fooGet().block();

// TODO: test validations
}
Expand Down
Loading
Loading