Prettify ExpectedNodeInterpreter

HubSpot · Sep 6, 2024 · 41cc648 · 41cc648
1 parent d34d5ec
commit 41cc648
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedNodeInterpreter.java
@@ -26,17 +26,20 @@ public ExpectedNodeInterpreter(JinjavaInterpreter interpreter, Tag tag, String p
   public String assertExpectedOutput(String name) {
     TagNode tagNode = (TagNode) fixture(name);
     String output = tag.interpret(tagNode, interpreter);
-    assertThat(output.trim()).isEqualTo(expected(name).trim());
+    assertThat(ExpectedTemplateInterpreter.prettify(output.trim()))
+      .isEqualTo(ExpectedTemplateInterpreter.prettify(expected(name).trim()));
     return output;
   }
 
   public Node fixture(String name) {
     try {
       return new TreeParser(
         interpreter,
-        Resources.toString(
-          Resources.getResource(String.format("%s/%s.jinja", path, name)),
-          StandardCharsets.UTF_8
+        ExpectedTemplateInterpreter.simplify(
+          Resources.toString(
+            Resources.getResource(String.format("%s/%s.jinja", path, name)),
+            StandardCharsets.UTF_8
+          )
         )
       )
         .buildTree()
@@ -49,9 +52,11 @@ public Node fixture(String name) {
 
   public String expected(String name) {
     try {
-      return Resources.toString(
-        Resources.getResource(String.format("%s/%s.expected.jinja", path, name)),
-        StandardCharsets.UTF_8
+      return ExpectedTemplateInterpreter.simplify(
+        Resources.toString(
+          Resources.getResource(String.format("%s/%s.expected.jinja", path, name)),
+          StandardCharsets.UTF_8
+        )
       );
     } catch (IOException e) {
       throw new RuntimeException(e);

diff --git a/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java b/src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java
@@ -135,7 +135,7 @@ public String assertExpectedNonEagerOutput(String name) {
     return output;
   }
 
-  private String prettify(String string) {
+  static String prettify(String string) {
     return string.replaceAll("([}%]})([^\\s])", "$1\\\\\n$2");
   }
 
@@ -172,7 +172,7 @@ private String expected(String name) {
     }
   }
 
-  private String simplify(String prettified) {
+  static String simplify(String prettified) {
     return prettified.replaceAll("\\\\\n\\s*", "");
   }