You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/10/04 21:17:12 UTC
[08/16] incubator-freemarker git commit: Some more markup string
literal interpolation tests
Some more markup string literal interpolation tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/83a30d5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/83a30d5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/83a30d5a
Branch: refs/heads/2.3
Commit: 83a30d5ae03b76ef637cda926ed13009e8fc0294
Parents: 75fab1f
Author: ddekany <dd...@apache.org>
Authored: Sun Oct 4 13:58:20 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Sun Oct 4 13:58:20 2015 +0200
----------------------------------------------------------------------
.../core/StringLiteralInterpolationTest.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83a30d5a/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/StringLiteralInterpolationTest.java b/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
index b7bfeee..fc66013 100644
--- a/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
+++ b/src/test/java/freemarker/core/StringLiteralInterpolationTest.java
@@ -111,6 +111,19 @@ public class StringLiteralInterpolationTest extends TemplateTest {
assertOutput("${\"${1000}, ${2000}\"}", "1.00*10<sup>3</sup>, 2.00*10<sup>3</sup>");
assertOutput("${\"& ${'x'}, ${2000}\"}", "& x, 2.00*10<sup>3</sup>");
assertOutput("${\"& ${'x'}, #{2000}\"}", "& x, 2000");
+
+ assertOutput("${\"${2000}\"?isMarkupOutput?c}", "true");
+ assertOutput("${\"x ${2000}\"?isMarkupOutput?c}", "true");
+ assertOutput("${\"${2000} x\"?isMarkupOutput?c}", "true");
+ assertOutput("${\"#{2000}\"?isMarkupOutput?c}", "false");
+ assertOutput("${\"${'x'}\"?isMarkupOutput?c}", "false");
+ assertOutput("${\"x ${'x'}\"?isMarkupOutput?c}", "false");
+ assertOutput("${\"${'x'} x\"?isMarkupOutput?c}", "false");
+
+ addToDataModel("rtf", RTFOutputFormat.INSTANCE.fromMarkup("\\p"));
+ assertOutput("${\"${rtf}\"?isMarkupOutput?c}", "true");
+ assertErrorContains("${\"${1000}${rtf}\"}", TemplateException.class, "HTML", "RTF", "onversion");
+ assertErrorContains("x${\"${1000}${rtf}\"}", TemplateException.class, "HTML", "RTF", "onversion");
}
}