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 resteasy to junit5 #18615

Merged
merged 5 commits into from
May 10, 2024
Merged

upgrade resteasy to junit5 #18615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ef7bfd
upgrade resteasy to junit5
thorstenhirsch May 8, 2024
99d8aa5
fix echo_api tests
thorstenhirsch May 9, 2024
4f1f8cf
updated gradle/sbt/pom and generated samples with bin/generate-sample…
thorstenhirsch May 9, 2024
d69d833
fix xml syntax error
thorstenhirsch May 9, 2024
7d88f1e
forgot to run generate-samples.sh
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: 4 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ ext {
jakarta_annotation_version = "1.3.5"
threetenbp_version = "2.9.10"
resteasy_version = "4.5.11.Final"
junit_version = "4.13"
assertj_version = "3.23.1"
junit_version = "5.10.2"
}

dependencies {
Expand All @@ -124,5 +125,6 @@ dependencies {
{{/openApiNullable}}
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.assertj:assertj-core:$assertj_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ lazy val root = (project in file(".")).
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"junit" % "junit" % "4.13" % "test",
"org.assertj" % "assertj-core" % "3.23.1" % "test",
"junit" % "junit" % "5.10.2" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
16 changes: 11 additions & 5 deletions modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<property>
Expand All @@ -71,7 +71,6 @@
</systemPropertyVariables>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -278,8 +277,14 @@
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -306,6 +311,7 @@
{{/useJakartaEe}}
<threetenbp-version>2.9.10</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.13</junit-version>
<assertj-version>3.23.1</assertj-version>
<junit-version>5.10.2</junit-version>
</properties>
</project>
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ for this project used jakarta.validation-api -->
</exclusions>
</dependency>
<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 @@ -150,8 +150,8 @@ for this project used jakarta.validation-api -->
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
<artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>snakeyaml</artifactId>
Expand Down Expand Up @@ -198,7 +198,7 @@ for this project used jakarta.validation-api -->
<jetty-version>9.2.9.v20150224</jetty-version>
<resteasy-version>3.0.11.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
<servlet-api-version>4.0.4</servlet-api-version>
{{#useBeanValidation}}
<beanvalidation-version>2.0.2</beanvalidation-version>
Expand Down
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ for this project used jakarta.validation-api -->
</exclusions>
</dependency>
<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 @@ -172,8 +172,8 @@ for this project used jakarta.validation-api -->
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
<artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>snakeyaml</artifactId>
Expand Down Expand Up @@ -216,7 +216,7 @@ for this project used jakarta.validation-api -->
<jetty-version>9.2.9.v20150224</jetty-version>
<resteasy-version>3.13.0.Final</resteasy-version>
<slf4j-version>1.6.3</slf4j-version>
<junit-version>4.13.2</junit-version>
<junit-version>5.10.2</junit-version>
<servlet-api-version>4.0.4</servlet-api-version>
{{#useJakartaEe}}
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
Expand Down
6 changes: 4 additions & 2 deletions samples/client/echo_api/java/resteasy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ ext {
jakarta_annotation_version = "1.3.5"
threetenbp_version = "2.9.10"
resteasy_version = "4.5.11.Final"
junit_version = "4.13"
assertj_version = "3.23.1"
junit_version = "5.10.2"
}

dependencies {
Expand All @@ -120,5 +121,6 @@ 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.assertj:assertj-core:$assertj_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
}
3 changes: 2 additions & 1 deletion samples/client/echo_api/java/resteasy/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ lazy val root = (project in file(".")).
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
"junit" % "junit" % "4.13" % "test",
"org.assertj" % "assertj-core" % "3.23.1" % "test",
"junit" % "junit" % "5.10.2" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)
16 changes: 11 additions & 5 deletions samples/client/echo_api/java/resteasy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<property>
Expand All @@ -64,7 +64,6 @@
</systemPropertyVariables>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -240,8 +239,14 @@
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -255,6 +260,7 @@
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<threetenbp-version>2.9.10</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.13</junit-version>
<assertj-version>3.23.1</assertj-version>
<junit-version>5.10.2</junit-version>
</properties>
</project>
30 changes: 10 additions & 20 deletions samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,18 @@
*/


package org.openapitools.client.api;
package org.openapitools.client;

import org.openapitools.client.ApiException;
import java.io.File;
import org.openapitools.client.model.Pet;
import org.openapitools.client.model.Tag;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.openapitools.client.api.BodyApi;
import org.openapitools.client.api.EchoServerResponseParser;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* API tests
Expand Down Expand Up @@ -62,12 +52,12 @@ public void testBodyMultipartFormdataSingleBinaryTest() throws ApiException, IOE
api.testBodyMultipartFormdataSingleBinary(myFile);

EchoServerResponseParser parser =
new EchoServerResponseParser(response);
new org.openapitools.client.api.EchoServerResponseParser(response);

String contentDisposition = parser.headers.get("Content-Disposition");

assertThat(contentDisposition, containsString(
assertThat(contentDisposition).contains(
"form-data; name=\"my-file\"; filename=\"test.txt\""
));
);
}
}
6 changes: 3 additions & 3 deletions .../client/echo_api/java/resteasy/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 @@ -14,9 +14,9 @@
package org.openapitools.client.api;

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

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand Down
24 changes: 7 additions & 17 deletions .../client/echo_api/java/resteasy/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,26 +13,16 @@

package org.openapitools.client.api;

import org.junit.jupiter.api.Test;
import org.openapitools.client.ApiException;
import java.io.File;
import org.openapitools.client.model.Pet;
import org.openapitools.client.model.Tag;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.Assert;
import org.openapitools.client.api.EchoServerResponseParser;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;

/**
* API tests for BodyApi
Expand Down Expand Up @@ -117,9 +107,9 @@ public void testBodyMultipartFormdataSingleBinaryTest()

String contentDisposition = parser.headers.get("Content-Disposition");

assertThat(contentDisposition, containsString(
assertThat(contentDisposition).contains(
"form-data; name=\"my-file\"; filename=\"test.txt\""
));
);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions .../client/echo_api/java/resteasy/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 @@ -14,9 +14,9 @@
package org.openapitools.client.api;

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

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand Down
6 changes: 3 additions & 3 deletions ...lient/echo_api/java/resteasy/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 @@ -15,9 +15,9 @@

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

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand Down
6 changes: 3 additions & 3 deletions .../client/echo_api/java/resteasy/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 @@ -15,9 +15,9 @@

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

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand Down
6 changes: 3 additions & 3 deletions ...client/echo_api/java/resteasy/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 @@ -21,9 +21,9 @@
import org.openapitools.client.model.StringEnumRef;
import org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter;
import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Assertions;

import java.time.LocalDate;
import java.time.OffsetDateTime;
Expand Down
6 changes: 3 additions & 3 deletions ...s/client/echo_api/java/resteasy/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 @@ -18,9 +18,9 @@
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.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Model tests for Bird
Expand Down
6 changes: 3 additions & 3 deletions ...ient/echo_api/java/resteasy/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 @@ -18,9 +18,9 @@
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.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Model tests for Category
Expand Down
Loading
Loading