Merge pull request spullara#41 from gw0/bug-subblockcaching

Sam Pullara · Sam Pullara · commit 51cb337f7b6f · 2012-07-23T08:59:50.000-07:00
Added inheritance test with sub block replacement that fails while caching
diff --git a/compiler/src/test/java/com/github/mustachejava/ExtensionTest.java b/compiler/src/test/java/com/github/mustachejava/ExtensionTest.java
@@ -62,10 +62,29 @@ public void testParentReplace() throws MustacheException, IOException, Execution
     MustacheFactory c = new DefaultMustacheFactory(root);
     Mustache m = c.compile("replace.html");
     StringWriter sw = new StringWriter();
-    m.execute(sw, new Object() { String replace = "true"; });
+    m.execute(sw, new Object() { String replace = "false"; });
     assertEquals(getContents(root, "replace.txt"), sw.toString());
   }
 
+  @Test
+  public void testSubBlockCaching() throws MustacheException, IOException, ExecutionException, InterruptedException {
+    MustacheFactory c = new DefaultMustacheFactory(root);
+    Mustache m = c.compile("subblockchild1.html");
+    StringWriter sw = new StringWriter();
+    m.execute(sw, new Object() {});
+    assertEquals(getContents(root, "subblockchild1.txt"), sw.toString());
+    
+    m = c.compile("subblockchild2.html");
+    sw = new StringWriter();
+    m.execute(sw,  new Object() {});
+    assertEquals(getContents(root, "subblockchild2.txt"), sw.toString());
+    
+    m = c.compile("subblockchild1.html");
+    sw = new StringWriter();
+    m.execute(sw, new Object() {});
+    assertEquals(getContents(root, "subblockchild1.txt"), sw.toString());
+  }
+
   @Test
   public void testSubSub() throws MustacheException, IOException, ExecutionException, InterruptedException {
     MustacheFactory c = new DefaultMustacheFactory(root);
diff --git a/compiler/src/test/resources/subblockchild1.html b/compiler/src/test/resources/subblockchild1.html
@@ -0,0 +1,7 @@
+{{<subblocksuper}}
+
+{{$content}}
+first
+{{/content}}
+
+{{/subblocksuper}}
diff --git a/compiler/src/test/resources/subblockchild1.txt b/compiler/src/test/resources/subblockchild1.txt
@@ -0,0 +1,2 @@
+first
+
diff --git a/compiler/src/test/resources/subblockchild2.html b/compiler/src/test/resources/subblockchild2.html
@@ -0,0 +1,7 @@
+{{<subblocksuper}}
+
+{{$content}}
+second
+{{/content}}
+
+{{/subblocksuper}}
diff --git a/compiler/src/test/resources/subblockchild2.txt b/compiler/src/test/resources/subblockchild2.txt
@@ -0,0 +1,2 @@
+second
+
diff --git a/compiler/src/test/resources/subblocksuper.html b/compiler/src/test/resources/subblocksuper.html
@@ -0,0 +1,3 @@
+{{$base}}
+{{$content}}{{/content}}
+{{/base}}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{{$base}}`
	`2`	`+{{$content}}{{/content}}`
	`3`	`+{{/base}}`