Merge pull request #25544 from Postremus/fix-windows-filetestcase-tes…

…tfiles Fix FileTestCase.testFiles on windows with core.autocrlf input
quarkusio · May 13, 2022 · c34043b · c34043b
2 parents 035447b + f380ae9
commit c34043b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 34 deletions.
diff --git a/...oyment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java b/...oyment/src/test/java/io/quarkus/resteasy/reactive/server/test/providers/FileTestCase.java
@@ -22,15 +22,6 @@
 
 public class FileTestCase {
 
-    private final static String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut\n"
-            +
-            "enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor\n"
-            +
-            "in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident,\n"
-            +
-            " sunt in culpa qui officia deserunt mollit anim id est laborum.\n" +
-            "\n" +
-            "";
     private static final String FILE = "src/test/resources/lorem.txt";
 
     @TestHTTPResource
@@ -43,13 +34,7 @@ public class FileTestCase {
 
     @Test
     public void testFiles() throws Exception {
-        // adjusting expected file size for Windows, whose git checkout will adjust line separators
-        String content;
-        if (System.lineSeparator().length() == 2) {
-            content = LOREM.replace("\n", System.lineSeparator());
-        } else {
-            content = LOREM;
-        }
+        String content = Files.readString(Path.of(FILE));
         String contentLength = String.valueOf(content.length());
         RestAssured.get("/providers/file/file")
                 .then()
@@ -90,7 +75,7 @@ public void testFiles() throws Exception {
                 .then()
                 .statusCode(200)
                 .header(HttpHeaders.CONTENT_LENGTH, "10")
-                .body(Matchers.equalTo(LOREM.substring(20, 30)));
+                .body(Matchers.equalTo(content.substring(20, 30)));
     }
 
     @Test

diff --git a/...x/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java b/...x/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/providers/FileTestCase.java
@@ -17,15 +17,6 @@
 
 public class FileTestCase {
 
-    private final static String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut\n"
-            +
-            "enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor\n"
-            +
-            "in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident,\n"
-            +
-            " sunt in culpa qui officia deserunt mollit anim id est laborum.\n" +
-            "\n" +
-            "";
     private static final String FILE = "src/test/resources/lorem.txt";
 
     @RegisterExtension
@@ -35,13 +26,8 @@ public class FileTestCase {
 
     @Test
     public void testFiles() throws Exception {
-        // adjusting expected file size for Windows, whose git checkout will adjust line separators
-        String content;
-        if (System.lineSeparator().length() == 2) {
-            content = LOREM.replace("\n", System.lineSeparator());
-        } else {
-            content = LOREM;
-        }
+
+        String content = Files.readString(Path.of(FILE));
         String contentLength = String.valueOf(content.length());
         RestAssured.get("/providers/file/file")
                 .then()
@@ -77,7 +63,7 @@ public void testFiles() throws Exception {
                 .then()
                 .statusCode(200)
                 .header(HttpHeaders.CONTENT_LENGTH, "10")
-                .body(Matchers.equalTo(LOREM.substring(20, 30)));
+                .body(Matchers.equalTo(content.substring(20, 30)));
     }
 
     @Test