Revert a change to assertBodyFile.

We can't really know when to trim, and if there are body args, it won't trim the resulting rendered template anyway.

We could add more methods, but it will sort of have to be up to the caller if they want to trim or not.

Author: robotdan

build.savant

@@ -29,7 +29,7 @@ logbackVersion = "1.4.14"
 slf4jVersion = "2.0.13"
 testngVersion = "7.8.0"
 
-project(group: "org.primeframework", name: "prime-mvc", version: "4.33.0", licenses: ["ApacheV2_0"]) {
+project(group: "org.primeframework", name: "prime-mvc", version: "4.33.1", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       // Dependency resolution order:

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>org.primeframework</groupId>
   <artifactId>prime-mvc</artifactId>
-  <version>4.33.0</version>
+  <version>4.33.1</version>
   <packaging>jar</packaging>
 
   <name>FusionAuth App</name>

src/test/java/org/primeframework/mvc/GlobalTest.java

@@ -684,7 +684,7 @@ public Object[][] get_freemarker_escape_parameters() {
   public void get_fullFormWithAllAttributes() throws Exception {
     simulator.test("/user/full-form")
              .get()
-             .assertBodyFile(Path.of("src/test/resources/html/full-form.html"));
+             .assertBody(Files.readString(Path.of("src/test/resources/html/full-form.html")).trim());
   }
 
   @Test
@@ -889,7 +889,7 @@ public void get_message_callback() throws Exception {
   public void get_metrics() throws Exception {
     simulator.test("/user/full-form")
              .get()
-             .assertBodyFile(Path.of("src/test/resources/html/full-form.html"));
+             .assertBody(Files.readString(Path.of("src/test/resources/html/full-form.html")).trim());
 
     Map<String, Timer> timers = metricRegistry.getTimers();
     assertEquals(timers.get("prime-mvc.[/user/full-form].requests").getCount(), 1);
@@ -1322,7 +1322,7 @@ public void get_wellKnownDotPrefixed() throws Exception {
 
   @Test
   public void hacked() {
-    // Make sure we don't invoke 'freemarker.template.utility.Execute"
+    // Make sure we don't invoke "freemarker.template.utility.Execute"
     simulator.test("/hacked")
              .get()
              .assertStatusCode(500)

src/test/java/org/primeframework/mvc/test/RequestResult.java

@@ -385,8 +385,7 @@ public RequestResult assertBodyDoesNotContainMessagesFromKeys(String... keys) {
    */
   public RequestResult assertBodyFile(Path path, Object... values) throws IOException {
     if (values.length == 0) {
-      var body = Files.readString(path).trim();
-      return assertBody(body);
+      return assertBody(Files.readString(path));
     }
     return assertBody(BodyTools.processTemplateForAssertion(path, values));
   }