fix echo_api tests

OpenAPITools · May 9, 2024 · 99d8aa5 · 99d8aa5
1 parent 1ef7bfd
commit 99d8aa5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 37 deletions.
diff --git a/samples/client/echo_api/java/resteasy/build.gradle b/samples/client/echo_api/java/resteasy/build.gradle
@@ -104,7 +104,7 @@ ext {
     jakarta_annotation_version = "1.3.5"
     threetenbp_version = "2.9.10"
     resteasy_version = "4.5.11.Final"
-    junit_version = "4.13"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -120,5 +120,7 @@ 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"
+    // assertj for tests
+    testImplementation "org.assertj:assertj-core:3.23.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
 }
diff --git a/samples/client/echo_api/java/resteasy/pom.xml b/samples/client/echo_api/java/resteasy/pom.xml
@@ -238,6 +238,12 @@
             <scope>provided</scope>
         </dependency>
         <!-- test dependencies -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.23.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

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
@@ -11,27 +11,17 @@
  */
 
 
-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.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Assertions;
+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.MatcherAssertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -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/.../client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java b/.../client/echo_api/java/resteasy/src/test/java/org/openapitools/client/api/BodyApiTest.java
@@ -13,25 +13,15 @@
 
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
-import java.io.File;
-import org.openapitools.client.model.Pet;
-import org.openapitools.client.model.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Assertions;
+import org.openapitools.client.ApiException;
+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.MatcherAssertions.assertThat;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -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\""
-        ));
+        );
     }
 
     /**