diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
index 76c43913474e..483cf84422ad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -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 {
@@ -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"
}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
index 3e1de7399e1f..aa656c54f086 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache
@@ -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"
)
)
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index 80e6bc49d4dd..3674b48b9903 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -61,7 +61,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12
+ 2.22.2
@@ -71,7 +71,6 @@
-Xms512m -Xmx1500m
methods
- pertest
@@ -278,8 +277,14 @@
- junit
- junit
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -306,6 +311,7 @@
{{/useJakartaEe}}
2.9.10
1.0.0
- 4.13
+ 3.23.1
+ 5.10.2
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
index bc5c66425f89..98269df93e8d 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
@@ -138,8 +138,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -150,8 +150,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -198,7 +198,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.0.11.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
{{#useBeanValidation}}
2.0.2
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
index 5d41db46781b..ab482a0590aa 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -160,8 +160,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -172,8 +172,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -216,7 +216,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.13.0.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
{{#useJakartaEe}}
2.1.1
diff --git a/samples/client/echo_api/java/resteasy/build.gradle b/samples/client/echo_api/java/resteasy/build.gradle
index 62d43afabd02..e009dc7c4807 100644
--- a/samples/client/echo_api/java/resteasy/build.gradle
+++ b/samples/client/echo_api/java/resteasy/build.gradle
@@ -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 {
@@ -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"
}
diff --git a/samples/client/echo_api/java/resteasy/build.sbt b/samples/client/echo_api/java/resteasy/build.sbt
index 0c31d90292c0..f68a75caf0e2 100644
--- a/samples/client/echo_api/java/resteasy/build.sbt
+++ b/samples/client/echo_api/java/resteasy/build.sbt
@@ -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"
)
)
diff --git a/samples/client/echo_api/java/resteasy/pom.xml b/samples/client/echo_api/java/resteasy/pom.xml
index 99657b8eda7e..d4708d3830c1 100644
--- a/samples/client/echo_api/java/resteasy/pom.xml
+++ b/samples/client/echo_api/java/resteasy/pom.xml
@@ -54,7 +54,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12
+ 2.22.2
@@ -64,7 +64,6 @@
-Xms512m -Xmx1500m
methods
- pertest
@@ -240,8 +239,14 @@
- junit
- junit
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -255,6 +260,7 @@
1.3.5
2.9.10
1.0.0
- 4.13
+ 3.23.1
+ 5.10.2
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java
index 1ffbe4ace092..5f93aab9399e 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/CustomTest.java
@@ -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
@@ -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\""
- ));
+ );
}
}
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java
index 17e790b76173..6a7b7a4736ce 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/AuthApiTest.java
@@ -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;
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java
index 3d2102e4643b..a8d0edaa3f26 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java
@@ -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
@@ -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\""
- ));
+ );
}
/**
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java
index df8fae9511d6..564f7c35a4e5 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/FormApiTest.java
@@ -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;
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java
index 9132aeb9b781..1f2b0cbf479f 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/HeaderApiTest.java
@@ -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;
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java
index a48fb9c3bf3f..f2f6763b1215 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/PathApiTest.java
@@ -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;
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java
index a2bd6f65721b..c6df34a18c8b 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/QueryApiTest.java
@@ -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;
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java
index 3e82e9d75535..487f1889a98a 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/BirdTest.java
@@ -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
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
index 5b6a08fd6773..1a53a0d90983 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -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
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java
index d08082e114ed..78b52f08ac76 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DataQueryTest.java
@@ -23,9 +23,9 @@
import java.util.Arrays;
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for DataQuery
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java
index 843a43b28d72..bfbfeaf1dadf 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/DefaultValueTest.java
@@ -26,9 +26,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for DefaultValue
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
index 80e515fd707e..6cad1033030f 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/NumberPropertiesOnlyTest.java
@@ -19,9 +19,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for NumberPropertiesOnly
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
index 30e1991c7e32..e56a9b18d6e9 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
@@ -23,9 +23,9 @@
import java.util.List;
import org.openapitools.client.model.Category;
import org.openapitools.client.model.Tag;
-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 Pet
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java
index 3ae0ecb7b70d..f9affa7e6754 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/QueryTest.java
@@ -21,9 +21,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-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 Query
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
index 81bf17732bda..9c9ddedd8adf 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/StringEnumRefTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 StringEnumRef
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
index 073b7aca33c1..d74de216cfab 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
@@ -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 Tag
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
index cdb7c02c0fd8..d5d0fc51cc1d 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarkerTest.java
@@ -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 TestFormObjectMultipartRequestMarker
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
index 8ab39f47d766..d316ca8550ef 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.java
@@ -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 TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
diff --git a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
index f3e020346fa0..21cff973e258 100644
--- a/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
+++ b/samples/client/echo_api/java/resteasy/src/test/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.java
@@ -21,9 +21,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-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 TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle
index 19096d369546..bb1f0718903b 100644
--- a/samples/client/petstore/java/resteasy/build.gradle
+++ b/samples/client/petstore/java/resteasy/build.gradle
@@ -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 {
@@ -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"
}
diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt
index fa0bd87c5d7a..268c41cff69f 100644
--- a/samples/client/petstore/java/resteasy/build.sbt
+++ b/samples/client/petstore/java/resteasy/build.sbt
@@ -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"
)
)
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
index 619da34f6cdc..3d4831fc3ae0 100644
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -54,7 +54,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12
+ 2.22.2
@@ -64,7 +64,6 @@
-Xms512m -Xmx1500m
methods
- pertest
@@ -240,8 +239,14 @@
- junit
- junit
+ org.assertj
+ assertj-core
+ ${assertj-version}
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -255,6 +260,7 @@
1.3.5
2.9.10
1.0.0
- 4.13
+ 3.23.1
+ 5.10.2
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 9f3d3543c842..bfa256f1e32b 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -15,9 +15,9 @@
import org.openapitools.client.ApiException;
import org.openapitools.client.model.Client;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/DefaultApiTest.java
index 6e55220f09e3..a4c30f626ba8 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/DefaultApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/DefaultApiTest.java
@@ -15,9 +15,9 @@
import org.openapitools.client.ApiException;
import org.openapitools.client.model.FooGetDefaultResponse;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeApiTest.java
index ee35df281fbf..168aeba61642 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -27,9 +27,9 @@
import org.openapitools.client.model.OuterObjectWithEnumProperty;
import org.openapitools.client.model.Pet;
import org.openapitools.client.model.User;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index 4369000f256b..631ee0453c3c 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -15,9 +15,9 @@
import org.openapitools.client.ApiException;
import org.openapitools.client.model.Client;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/PetApiTest.java
index 6612ffc62839..494c91ba315f 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -16,9 +16,9 @@
import org.openapitools.client.ApiException;
import org.openapitools.client.model.ModelApiResponse;
import org.openapitools.client.model.Pet;
-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.io.File;
import java.io.FileWriter;
@@ -183,7 +183,7 @@ public void uploadFileTest() throws Exception {
fw.close();
file.deleteOnExit();
ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
- Assert.assertEquals((long)response.getCode(), 200);
+ Assertions.assertEquals((long)response.getCode(), 200);
}
/**
* uploads an image (required)
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
index f0456cb1998c..049b5387a8ee 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -15,9 +15,9 @@
import org.openapitools.client.ApiException;
import org.openapitools.client.model.Order;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/UserApiTest.java
index 6a405a0ae6fd..f4a9f3878228 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -16,9 +16,9 @@
import org.openapitools.client.ApiException;
import java.time.OffsetDateTime;
import org.openapitools.client.model.User;
-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;
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
index 29bc5ae96948..787d688e130c 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -20,9 +20,9 @@
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.HashMap;
import java.util.Map;
-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 AdditionalPropertiesClass
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
index dad0e9235de6..3f04e91bf130 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java
@@ -19,9 +19,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.SingleRefType;
-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 AllOfWithSingleRef
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AnimalTest.java
index da5609b5489d..f461e8aee76b 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -21,9 +21,9 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
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 Animal
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
index cbc199f15753..a58ead431986 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -22,9 +22,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-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 ArrayOfArrayOfNumberOnly
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
index 762f9d6dc334..02ec7e7c56b5 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -22,9 +22,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-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 ArrayOfNumberOnly
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayTestTest.java
index 20dc34a8c517..ab92570feca3 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -22,9 +22,9 @@
import java.util.Arrays;
import java.util.List;
import org.openapitools.client.model.ReadOnlyFirst;
-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 ArrayTest
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CapitalizationTest.java
index 4fd3728ab897..d6017d040975 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -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 Capitalization
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CatTest.java
index d591bdd30ef7..5a63409b79dd 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CatTest.java
@@ -22,9 +22,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.Animal;
-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 Cat
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
index 12de38c0c08d..d4909139f429 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -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
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
index 2616181bec30..a109c6f71758 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java
@@ -23,9 +23,9 @@
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.ParentWithNullable;
import org.openapitools.jackson.nullable.JsonNullable;
-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 ChildWithNullable
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClassModelTest.java
index d1936d85e815..7213ea0482b6 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -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 ClassModel
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClientTest.java
index 7aa0f5859ff1..94dc977fcb38 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClientTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -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 Client
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
index 65fd3cc0b760..ef13089e92aa 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
@@ -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 DeprecatedObject
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DogTest.java
index 744c8a406fe8..8e8013c6108a 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/DogTest.java
@@ -22,9 +22,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.Animal;
-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 Dog
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumArraysTest.java
index 694e4196138b..64a0a0adc232 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -21,9 +21,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-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 EnumArrays
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumClassTest.java
index 3f50e1bfb9ef..ae6973ba6378 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 EnumClass
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumTestTest.java
index 0a1fd0f4268b..a737a20f6c97 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -26,9 +26,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for EnumTest
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
index 88c1d374be69..1792f6169d92 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java
@@ -21,9 +21,9 @@
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-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 FakeBigDecimalMap200Response
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
index fb8827a1e88b..e346751e1b99 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -22,9 +22,9 @@
import java.util.Arrays;
import java.util.List;
import org.openapitools.client.model.ModelFile;
-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 FileSchemaTestClass
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
index cd15af86ee93..c1db998eb2d2 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
@@ -19,9 +19,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.Foo;
-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 FooGetDefaultResponse
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooTest.java
index 2a92367019b8..ece58545bfd3 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FooTest.java
@@ -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 Foo
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FormatTestTest.java
index 8a9d3adfc017..d5ee3bc731da 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -23,9 +23,9 @@
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
-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 FormatTest
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
index bf777b061ccd..b408ad1c4c04 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -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 HasOnlyReadOnly
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
index e96ffaa18f47..638820e3bb70 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
@@ -22,9 +22,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for HealthCheckResult
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MapTestTest.java
index 50e909f03811..cbe8b3bfddc4 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -20,9 +20,9 @@
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.HashMap;
import java.util.Map;
-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 MapTest
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
index b16858dc17e2..2c9924c2e73b 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -23,9 +23,9 @@
import java.util.Map;
import java.util.UUID;
import org.openapitools.client.model.Animal;
-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 MixedPropertiesAndAdditionalPropertiesClass
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
index dd90f6799d3e..b1bbea4045b1 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -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 Model200Response
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
index e63f2ae5e9ca..972a351b1295 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -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 ModelApiResponse
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelFileTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelFileTest.java
index 264249edc1c0..97053c1ebd8e 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelFileTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelFileTest.java
@@ -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 ModelFile
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelListTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelListTest.java
index 81fd2dcc6a6a..71a14983d090 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelListTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelListTest.java
@@ -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 ModelList
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelReturnTest.java
index 5840d4f8f0c9..cad3f081c54a 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -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 ModelReturn
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NameTest.java
index 9280c1715390..9dafc643a8bb 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NameTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NameTest.java
@@ -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 Name
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NullableClassTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NullableClassTest.java
index c79c6366f838..7d30912d4c86 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NullableClassTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NullableClassTest.java
@@ -30,9 +30,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for NullableClass
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
index 63b5bc0440e5..46d3b1b334d5 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -19,9 +19,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for NumberOnly
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
index 4203b62f784c..a58269e7c3b7 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
@@ -23,9 +23,9 @@
import java.util.Arrays;
import java.util.List;
import org.openapitools.client.model.DeprecatedObject;
-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 ObjectWithDeprecatedFields
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OrderTest.java
index e0fbb529af69..915233936f17 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -19,9 +19,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.time.OffsetDateTime;
-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 Order
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
index 840cf65c8d01..4106235863ab 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -19,9 +19,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for OuterComposite
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
index 5b9bae28ec6c..31fc4a3cab28 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 OuterEnumDefaultValue
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
index 731acbf905fd..41a2e5a97ce5 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 OuterEnumIntegerDefaultValue
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
index 234945cec0f1..2f25518a1b18 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 OuterEnumInteger
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumTest.java
index b312b11a09eb..4b4689794b92 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 OuterEnum
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
index 964d1281b214..569e16247e6c 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/OuterObjectWithEnumPropertyTest.java
@@ -19,9 +19,9 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.OuterEnumInteger;
-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 OuterObjectWithEnumProperty
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
index bdd46008b13d..828d360428ed 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ParentWithNullableTest.java
@@ -25,9 +25,9 @@
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.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Model tests for ParentWithNullable
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
index ca23198fbf18..51c0563373c4 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/PetTest.java
@@ -26,9 +26,9 @@
import java.util.Set;
import org.openapitools.client.model.Category;
import org.openapitools.client.model.Tag;
-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 Pet
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
index b356d6993c53..e98895945790 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -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 ReadOnlyFirst
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
index 920d02c930c8..bdcda63a5129 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SingleRefTypeTest.java
@@ -13,9 +13,9 @@
package org.openapitools.client.model;
-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 SingleRefType
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
index 8eb0b1bd2694..3fe4051508d0 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -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 SpecialModelName
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
index 6dc0868167c5..ef31f21248b0 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TagTest.java
@@ -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 Tag
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
index 819a1e7fa9df..8e5a4ba75d27 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequestTest.java
@@ -20,9 +20,9 @@
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.HashMap;
import java.util.Map;
-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 TestInlineFreeformAdditionalPropertiesRequest
diff --git a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/UserTest.java
index b029d279409c..819e2d8f7610 100644
--- a/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/UserTest.java
+++ b/samples/client/petstore/java/resteasy/src/test/java/org/openapitools/client/model/UserTest.java
@@ -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 User
diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
index cb7d71acdfde..b2b276f2377b 100644
--- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml
@@ -153,8 +153,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -165,8 +165,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -207,7 +207,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.13.0.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
1.3.5
2.0.2
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml
index 99c9881b888b..ccd1d916afb6 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml
@@ -131,8 +131,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -143,8 +143,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -189,7 +189,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.0.11.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
2.0.2
1.3.5
diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
index 2c9e53d49f90..87766d3d78fd 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
@@ -131,8 +131,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -143,8 +143,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -189,7 +189,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.0.11.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
2.0.2
1.3.5
diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
index 13bcbc03e357..acae0f547e69 100644
--- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
@@ -131,8 +131,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -143,8 +143,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -189,7 +189,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.0.11.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
2.0.2
1.3.5
diff --git a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml
index 88e39654293f..afd4d8e81dce 100644
--- a/samples/server/petstore/jaxrs-resteasy/java8/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/java8/pom.xml
@@ -153,8 +153,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -165,8 +165,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -207,7 +207,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.13.0.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
1.3.5
2.0.2
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
index ad8ca97ed485..ccaaff51bb9b 100644
--- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml
@@ -153,8 +153,8 @@ for this project used jakarta.validation-api -->
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-api
${junit-version}
test
@@ -165,8 +165,8 @@ for this project used jakarta.validation-api -->
test
- junit
- junit
+ junit-jupiter-api
+ org.junit.jupiter
snakeyaml
@@ -207,7 +207,7 @@ for this project used jakarta.validation-api -->
9.2.9.v20150224
3.13.0.Final
1.6.3
- 4.13.2
+ 5.10.2
4.0.4
1.3.5
2.0.2