Prettify ExpectedNodeInterpreter

jasmith-hs · jasmith-hs · commit 31234163fbb2 · 2024-09-11T09:17:19.000-04:00
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*", "");
   }
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public String assertExpectedNonEagerOutput(String name) {`
`135`	`135`	`return output;`
`136`	`136`	`}`
`137`	`137`
`138`		`- private String prettify(String string) {`
	`138`	`+ static String prettify(String string) {`
`139`	`139`	`return string.replaceAll("([}%]})([^\\s])", "$1\\\\\n$2");`
`140`	`140`	`}`
`141`	`141`
`@@ -172,7 +172,7 @@ private String expected(String name) {`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`175`		`- private String simplify(String prettified) {`
	`175`	`+ static String simplify(String prettified) {`
`176`	`176`	`return prettified.replaceAll("\\\\\n\\s*", "");`
`177`	`177`	`}`
`178`	`178`