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

upgrade java native to junit5 #18617

Merged
merged 4 commits into from
May 10, 2024
Merged

upgrade java native to junit5 #18617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e42f5e5
upgrade java native to junit5
thorstenhirsch May 8, 2024
7d61921
upgrade build.gradle, optimize imports
thorstenhirsch May 9, 2024
5e6a2b4
upgrade gradle, re-generate samples
thorstenhirsch May 9, 2024
5c4d14e
migrate api_test.mustache and petstore tests of native-async & native…
thorstenhirsch May 9, 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
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package {{package}};
import {{invokerPackage}}.ApiException;
{{#imports}}import {{import}};
{{/imports}}
import org.junit.Test;
import org.junit.Ignore;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

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

private final {{classname}} api = new {{classname}}();
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ext {
{{/swagger2AnnotationLibrary}}
jackson_version = "2.14.1"
jakarta_annotation_version = "1.3.5"
junit_version = "4.13.2"
junit_version = "5.10.2"
{{#hasFormParamsInSpec}}
httpmime_version = "4.5.13"
{{/hasFormParamsInSpec}}
Expand All @@ -97,7 +97,7 @@ dependencies {
{{#hasFormParamsInSpec}}
implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
{{/hasFormParamsInSpec}}
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}

// Use spotless plugin to automatically format code, remove unused import, etc
Expand Down
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<loggerPath>conf/log4j.properties</loggerPath>
Expand Down Expand Up @@ -265,8 +265,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 @@ -293,7 +293,7 @@
{{#hasFormParamsInSpec}}
<httpmime-version>4.5.14</httpmime-version>
{{/hasFormParamsInSpec}}
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
<spotless.version>2.27.2</spotless.version>
</properties>
</project>
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/retrofit/api_test.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package {{package}};
import {{invokerPackage}}.ApiClient;
{{#imports}}import {{import}};
{{/imports}}
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
4 changes: 2 additions & 2 deletions samples/client/echo_api/java/native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ artifacts {
ext {
jackson_version = "2.14.1"
jakarta_annotation_version = "1.3.5"
junit_version = "4.13.2"
junit_version = "5.10.2"
httpmime_version = "4.5.13"
}

Expand All @@ -81,7 +81,7 @@ dependencies {
implementation "org.openapitools:jackson-databind-nullable:0.2.1"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
testImplementation "junit:junit:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}

// Use spotless plugin to automatically format code, remove unused import, etc
Expand Down
8 changes: 4 additions & 4 deletions samples/client/echo_api/java/native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.2.5</version>
<configuration>
<systemPropertyVariables>
<loggerPath>conf/log4j.properties</loggerPath>
Expand Down Expand Up @@ -242,8 +242,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 @@ -257,7 +257,7 @@
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<httpmime-version>4.5.14</httpmime-version>
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
<spotless.version>2.27.2</spotless.version>
</properties>
</project>
156 changes: 78 additions & 78 deletions samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions ...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/AuthApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,15 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for AuthApi
*/
@Ignore
@Disabled
public class AuthApiTest {

private final AuthApi api = new AuthApi();
Expand Down
12 changes: 3 additions & 9 deletions ...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/BodyApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,16 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.openapitools.client.model.Pet;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for BodyApi
*/
@Ignore
@Disabled
public class BodyApiTest {

private final BodyApi api = new BodyApi();
Expand Down
12 changes: 3 additions & 9 deletions ...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/FormApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,15 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for FormApi
*/
@Ignore
@Disabled
public class FormApiTest {

private final FormApi api = new FormApi();
Expand Down
12 changes: 3 additions & 9 deletions .../client/echo_api/java/native/src/test/java/org/openapitools/client/api/HeaderApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,16 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.openapitools.client.model.StringEnumRef;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for HeaderApi
*/
@Ignore
@Disabled
public class HeaderApiTest {

private final HeaderApi api = new HeaderApi();
Expand Down
12 changes: 3 additions & 9 deletions ...es/client/echo_api/java/native/src/test/java/org/openapitools/client/api/PathApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,16 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.openapitools.client.model.StringEnumRef;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for PathApi
*/
@Ignore
@Disabled
public class PathApiTest {

private final PathApi api = new PathApi();
Expand Down
12 changes: 3 additions & 9 deletions ...s/client/echo_api/java/native/src/test/java/org/openapitools/client/api/QueryApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,16 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import org.openapitools.client.model.Pet;
import org.junit.Test;
import org.junit.Ignore;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


/**
* API tests for QueryApi
*/
@Ignore
@Disabled
public class QueryApiTest {

private final QueryApi api = new QueryApi();
Expand Down
9 changes: 1 addition & 8 deletions ...echo_api/java/native/src/test/java/org/openapitools/client/model/BirdAndCategoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
9 changes: 1 addition & 8 deletions ...les/client/echo_api/java/native/src/test/java/org/openapitools/client/model/BirdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
9 changes: 1 addition & 8 deletions ...client/echo_api/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
13 changes: 1 addition & 12 deletions ...lient/echo_api/java/native/src/test/java/org/openapitools/client/model/DataQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.client.model.Query;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
15 changes: 1 addition & 14 deletions ...nt/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.jackson.nullable.JsonNullable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.openapitools.jackson.nullable.JsonNullable;
import java.util.NoSuchElementException;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
4 changes: 1 addition & 3 deletions ...t/echo_api/java/native/src/test/java/org/openapitools/client/model/EnumStringRefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

package org.openapitools.client.model;

import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
10 changes: 1 addition & 9 deletions ...api/java/native/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,7 @@

package org.openapitools.client.model;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.math.BigDecimal;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Test;


/**
Expand Down
Loading
Loading