FREEMARKER-63: Fixed failing test. (Now the test suite passes.)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/126c5069 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/126c5069 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/126c5069 Branch: refs/heads/3 Commit: 126c506984ea1e006b719ebb3ae92a4207c4c9f2 Parents: 52a5f9e Author: ddekany <[email protected]> Authored: Sun Jul 30 15:57:46 2017 +0200 Committer: ddekany <[email protected]> Committed: Sun Jul 30 15:57:46 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/freemarker/core/DirectiveCallPlaceTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/126c5069/freemarker-core-test/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java index 37cd2b6..94cd199 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/DirectiveCallPlaceTest.java @@ -110,12 +110,11 @@ public class DirectiveCallPlaceTest extends TemplateTest { @Override public void execute(TemplateModel[] args, final CallPlace callPlace, Writer out, final Environment env) throws TemplateException, IOException { - if (callPlace.hasNestedContent()) { + if (!callPlace.hasNestedContent()) { return; } final String convertedText; - if (callPlace.isNestedOutputCacheable()) { try { convertedText = (String) callPlace.getOrCreateCustomData( @@ -135,7 +134,7 @@ public class DirectiveCallPlaceTest extends TemplateTest { convertedText = convertBodyText(callPlace, env); } - env.getOut().write(convertedText); + out.write(convertedText); } @Override
