freemarker-notifications mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ddek...@apache.org
Subject	[2/2] incubator-freemarker git commit: Converted test and example ftl files to camel case naming convention
Date	Thu, 13 Jul 2017 19:14:59 GMT
Converted test and example ftl files to camel case naming convention Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a7156790 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a7156790 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a7156790 Branch: refs/heads/3 Commit: a71567907df9c96dd78bf0944ed31ac6d415ccdd Parents: 15c6d38 Author: ddekany <ddekany@apache.org> Authored: Thu Jul 13 21:14:08 2017 +0200 Committer: ddekany <ddekany@apache.org> Committed: Thu Jul 13 21:14:40 2017 +0200 ---------------------------------------------------------------------- .../org/apache/freemarker/core/ast-builtins.ast \| 8 +- .../org/apache/freemarker/core/ast-builtins.ftl \| 4 +- .../apache/freemarker/core/ast-locations.ftl \| 4 +- .../org/apache/freemarker/core/ast-range.ast \| 8 +- .../org/apache/freemarker/core/ast-range.ftl \| 2 +- .../apache/freemarker/core/cano-builtins.ftl \| 4 +- .../freemarker/core/cano-builtins.ftl.out \| 4 +- .../core/cano-identifier-escaping.ftl \| 8 +- .../core/cano-identifier-escaping.ftl.out \| 4 +- .../templatesuite/templates/api-builtins.ftl \| 16 +- .../templates/boolean-formatting.ftl \| 24 +- .../templates/date-type-builtins.ftl \| 46 +-- .../templates/dateformat-iso-bi.ftl \| 228 +++++++------- .../templates/dateformat-iso-like.ftl \| 46 +-- .../templatesuite/templates/dateformat-java.ftl \| 16 +- .../templatesuite/templates/dateparsing.ftl \| 30 +- .../core/templatesuite/templates/escapes.ftl \| 22 +- .../templates/existence-operators.ftl \| 40 +-- .../templatesuite/templates/hashliteral.ftl \| 4 +- .../templates/identifier-escaping.ftl \| 8 +- .../core/templatesuite/templates/if.ftl \| 42 +-- .../core/templatesuite/templates/include2.ftl \| 12 +- .../templatesuite/templates/lastcharacter.ftl \| 2 +- .../core/templatesuite/templates/macros.ftl \| 4 +- .../core/templatesuite/templates/noparse.ftl \| 16 +- .../templatesuite/templates/number-format.ftl \| 4 +- .../templatesuite/templates/number-literal.ftl \| 2 +- .../templates/number-math-builtins.ftl \| 60 ++-- .../templatesuite/templates/number-to-date.ftl \| 22 +- .../templatesuite/templates/numerical-cast.ftl \| 2 +- .../templates/output-encoding1.ftl \| 8 +- .../templates/output-encoding2.ftl \| 6 +- .../templates/output-encoding3.ftl \| 6 +- .../core/templatesuite/templates/root.ftl \| 6 +- .../templates/sequence-builtins.ftl \| 240 +++++++-------- .../core/templatesuite/templates/setting.ftl \| 26 +- .../templatesuite/templates/specialvars.ftl \| 10 +- .../templates/string-builtin-coercion.ftl \| 14 +- .../string-builtins-regexps-matches.ftl \| 2 +- .../templates/string-builtins-regexps.ftl \| 6 +- .../templates/string-builtins1.ftl \| 60 ++-- .../templates/string-builtins2.ftl \| 184 ++++++------ .../templates/string-builtins3.ftl \| 296 +++++++++---------- .../templatesuite/templates/stringbimethods.ftl \| 8 +- .../templatesuite/templates/type-builtins.ftl \| 32 +- .../core/templatesuite/templates/url.ftl \| 6 +- .../core/templatesuite/templates/var-layers.ftl \| 8 +- .../core/templatesuite/templates/varargs.ftl \| 4 +- .../core/templatesuite/templates/variables.ftl \| 2 +- .../templatesuite/templates/varlayers_lib.ftl \| 6 +- .../templates/wsstripinheader_inc.ftl \| 2 +- .../templates/wstrip-in-header.ftl \| 2 +- .../templatesuite/templates/default-xmlns.ftl \| 2 +- .../templatesuite/templates/xml-fragment.ftl \| 8 +- .../templates/xml-ns_prefix-scope-lib.ftl \| 2 +- .../templates/xml-ns_prefix-scope-main.ftl \| 2 +- .../dom/templatesuite/templates/xmlns1.ftl \| 2 +- .../dom/templatesuite/templates/xmlns3.ftl \| 12 +- .../dom/templatesuite/templates/xmlns4.ftl \| 12 +- .../dom/templatesuite/templates/xmlns5.ftl \| 2 +- .../examples/AutoEscapingExample-convert.ftlh \| 8 +- .../examples/AutoEscapingExample-convert2.ftl \| 6 +- .../examples/AutoEscapingExample-infoBox.ftlh \| 2 +- .../examples/AutoEscapingExample-markup.ftlh \| 6 +- .../AutoEscapingExample-stringConcat.ftlh \| 2 +- .../AutoEscapingExample-stringLiteral2.ftlh \| 2 +- 66 files changed, 847 insertions(+), 847 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast index b8b696f..02f1a3b 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ast @@ -25,17 +25,17 @@ - content: "\n" // String ${...} // o.a.f.c.ASTDollarInterpolation - content: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?left_pad // o.a.f.c.BuiltInsForStringsBasic$padBI + - callee: ?leftPad // o.a.f.c.BuiltInsForStringsBasic$padBI - left-hand operand: x // o.a.f.c.ASTExpVariable - - right-hand operand: "left_pad" // String + - right-hand operand: "leftPad" // String - argument value: 5 // o.a.f.c.ASTExpNumberLiteral #text // o.a.f.c.ASTStaticText - content: "\n" // String ${...} // o.a.f.c.ASTDollarInterpolation - content: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?left_pad // o.a.f.c.BuiltInsForStringsBasic$padBI + - callee: ?leftPad // o.a.f.c.BuiltInsForStringsBasic$padBI - left-hand operand: x // o.a.f.c.ASTExpVariable - - right-hand operand: "left_pad" // String + - right-hand operand: "leftPad" // String - argument value: 5 // o.a.f.c.ASTExpNumberLiteral - argument value: "-" // o.a.f.c.ASTExpStringLiteral #text // o.a.f.c.ASTStaticText http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ftl index 74aee52..7051cc7 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-builtins.ftl @@ -17,7 +17,7 @@ under the License. --> ${x?trim} -${x?left_pad(5)} -${x?left_pad(5, '-')} +${x?leftPad(5)} +${x?leftPad(5, '-')} ${x?then('y', 'n')} ${x?switch(1, 11, 2, 22, 33)} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ftl index 99fa244..fbf6079 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-locations.ftl @@ -22,8 +22,8 @@ <#if exp><#else></#if> <#if exp>1<#else>1</#if> <#if exp>${1}2<#else>${1}2</#if> -<#if exp><#elseif exp></#if> -<#if exp><#elseif exp>1</#if> +<#if exp><#elseIf exp></#if> +<#if exp><#elseIf exp>1</#if> <#attempt><#recover></#attempt> <#attempt>1<#recover>1</#attempt> <#list s as i></#list> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast index 060934e..6fb5ab7 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ast @@ -116,14 +116,14 @@ - assignment operator: "=" // String - assignment source: .. // o.a.f.c.ASTExpRange - left-hand operand: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?index_of // o.a.f.c.BuiltInsForStringsBasic$index_ofBI + - callee: ?indexOf // o.a.f.c.BuiltInsForStringsBasic$index_ofBI - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: "index_of" // String + - right-hand operand: "indexOf" // String - argument value: "x" // o.a.f.c.ASTExpStringLiteral - right-hand operand: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?index_of // o.a.f.c.BuiltInsForStringsBasic$index_ofBI + - callee: ?indexOf // o.a.f.c.BuiltInsForStringsBasic$index_ofBI - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: "index_of" // String + - right-hand operand: "indexOf" // String - argument value: "y" // o.a.f.c.ASTExpStringLiteral - variable scope: "1" // Integer - namespace: null // Null http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ftl index cb55c8a..d11dc84 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/ast-range.ftl @@ -30,7 +30,7 @@ <#assign x = n?abs .. m?abs> -<#assign x = n?index_of('x') .. m?index_of('y')> +<#assign x = n?indexOf('x') .. m?indexOf('y')> <#assign x = n..m == o..p> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl index 74aee52..7051cc7 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl @@ -17,7 +17,7 @@ under the License. --> ${x?trim} -${x?left_pad(5)} -${x?left_pad(5, '-')} +${x?leftPad(5)} +${x?leftPad(5, '-')} ${x?then('y', 'n')} ${x?switch(1, 11, 2, 22, 33)} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out index 3c62974..63c87d6 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out @@ -17,7 +17,7 @@ * under the License. */ ${x?trim} -${x?left_pad(5)} -${x?left_pad(5, "-")} +${x?leftPad(5)} +${x?leftPad(5, "-")} ${x?then("y", "n")} ${x?switch(1, 11, 2, 22, 33)} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl index 75d52f1..9ce7403 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl @@ -20,7 +20,7 @@ <#local \.namespace = 123> <a-b>${data\-color}<#nested \.namespace></a-b><#t> </#macro> -<#macro "m-b2"></#macro> +<#macro m\-b2></#macro> <#macro "m/b2"></#macro> <@m\-a data\-color="red"; loop\-var, loopVar2>${loop\-var}</@> @@ -46,7 +46,7 @@ Switch: <#switch sw\-a> <#default>Fails </#switch> -<#escape \-x as \-x?upper_case>${'escaped'}</#escape> +<#escape \-x as \-x?upperCase>${'escaped'}</#escape> <#if false && sw\-a == 1> <#visit x\-y2 using x\-y1> @@ -57,7 +57,7 @@ Switch: <#switch sw\-a> <#assign @as@_a = 'as1'> ${@as@_a} -<#assign 'as-c' = 'as2'> +<#assign as\-c = 'as2'> ${.vars['as-c']} <#assign "as/b" = 'as3'> ${.vars["as/b"]} @@ -70,7 +70,7 @@ ${.vars['as"d']} <#macro dumpNS> <#list .namespace?keys?sort as k> - ${k} = <#local v = .namespace[k]><#if v?is_string>${v}<#else>...</#if><#lt> + ${k} = <#local v = .namespace[k]><#if v?isString>${v}<#else>...</#if><#lt> </#list> </#macro> <@dumpNS /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out index 17e2b4e..05dc62d 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out @@ -31,7 +31,7 @@ ${hash["--moz-prop"]} <#assign sw\-a = 1>Switch: <#switch sw\-a><#case 1>OK<#break/> <#default>Fails </#switch> -<#escape \-x as \-x?upper_case>${"escaped"}</#escape> +<#escape \-x as \-x?upperCase>${"escaped"}</#escape> <#if false && sw\-a == 1><#visit x\-y2 using x\-y1/><#recurse x\-y2 using x\-y1/><#import i\-a as i\-b/><#include i\-c/></#if> <#assign @as@_a = "as1">${@as@_a} @@ -40,5 +40,5 @@ ${hash["--moz-prop"]} <#assign "as'c" = "as4">${.vars["as'c"]} <#assign 'as"d' = "as5">${.vars['as"d']} -<#global g\-a = 1, g\-b = 2, g\-c = 3><#macro dumpNS><#list .namespace?keys?sort as k>${k} = <#local v = .namespace[k]><#if v?is_string>${v}<#else>...</#if> +<#global g\-a = 1, g\-b = 2, g\-c = 3><#macro dumpNS><#list .namespace?keys?sort as k>${k} = <#local v = .namespace[k]><#if v?isString>${v}<#else>...</#if> </#list></#macro><@dumpNS/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/api-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/api-builtins.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/api-builtins.ftl index 5a9e2d7..c7d1915 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/api-builtins.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/api-builtins.ftl @@ -30,11 +30,11 @@ </#list> <@assertEquals expected="1: a, 2: b, 3: c" actual=dump /> -<@assert test=map?has_api /> -<@assert test=list?has_api /> -<@assert test=set?has_api /> -<@assert test=!s?has_api /> -<@assert test=!1?has_api /> -<@assert test=!""?has_api /> -<@assert test=!{}?has_api /> -<@assert test=!true?has_api /> +<@assert test=map?hasApi /> +<@assert test=list?hasApi /> +<@assert test=set?hasApi /> +<@assert test=!s?hasApi /> +<@assert test=!1?hasApi /> +<@assert test=!""?hasApi /> +<@assert test=!{}?hasApi /> +<@assert test=!true?hasApi /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean-formatting.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean-formatting.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean-formatting.ftl index a521fe8..72dc253 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean-formatting.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/boolean-formatting.ftl @@ -21,22 +21,22 @@ <@assertFails message="true,false">${false}</@> <@assertFails message="true,false">${"" + true}</@> <@assertFails message="true,false">${"" + false}</@> -<@assertFails message="true,false">${true?upper_case}</@> -<@assertFails message="true,false">${false?upper_case}</@> +<@assertFails message="true,false">${true?upperCase}</@> +<@assertFails message="true,false">${false?upperCase}</@> <@assertEquals expected="true" actual=true?string /> <@assertEquals expected="false" actual=false?string /> <@assertEquals expected="true" actual=true?c /> <@assertEquals expected="false" actual=false?c /> <@assertEquals expected="t" actual=true?string('t', 'f') /> <@assertEquals expected="f" actual=false?string('t', 'f') /> -<#setting boolean_format = 'true,false'> +<#setting booleanFormat = 'true,false'> <@assertFails message="true,false">${true}</@> -<#setting boolean_format = 'ja,nein'> +<#setting booleanFormat = 'ja,nein'> <@assertEquals expected="ja" actual="" + true /> <@assertEquals expected="nein" actual="" + false /> -<@assertEquals expected="JA" actual=true?upper_case /> -<@assertEquals expected="NEIN" actual=false?upper_case /> +<@assertEquals expected="JA" actual=true?upperCase /> +<@assertEquals expected="NEIN" actual=false?upperCase /> <@assertEquals expected="ja" actual=true?string /> <@assertEquals expected="nein" actual=false?string /> <@assertEquals expected="true" actual=true?c /> @@ -44,7 +44,7 @@ <@assertEquals expected="t" actual=true?string('t', 'f') /> <@assertEquals expected="f" actual=false?string('t', 'f') /> -<#setting boolean_format = 'y,n'> +<#setting booleanFormat = 'y,n'> <#assign x = false> <#assign n = 123><#assign m = { x: 'foo', n: 'bar' }><@assertEquals actual=m['n'] + m['123'] expected='foobar' /> <@assertFails exception="UnexpectedTypeException">${m[false]}</@> @@ -55,14 +55,14 @@ <@assertEquals actual=booleanVsStringMethods.expectsBoolean(x) expected=false /> <@assertEquals actual=booleanVsStringMethods.expectsBoolean(booleanAndString) expected=true /> <@assertEquals actual=booleanVsStringMethods.overloaded(x) expected="boolean false" /> -<@assertEquals actual=123?upper_case expected="123" /> -<@assertEquals actual=true?upper_case expected="Y" /> +<@assertEquals actual=123?upperCase expected="123" /> +<@assertEquals actual=true?upperCase expected="Y" /> </#assign> -<#escape x as x?upper_case> +<#escape x as x?upperCase> <#assign x = true>${x} ${true} ${true?string} <#assign x = false>${x} ${false} ${false?string} -<#noescape><#assign x = true>${x} ${true} ${true?string}</#noescape> +<#noEscape><#assign x = true>${x} ${true} ${true?string}</#noEscape> </#escape> <#assign x = false>${x} ${false} ${false?string} <#assign x = true>${x} ${true} ${true?string} @@ -71,7 +71,7 @@ ${'str:' + x} ${'str:' + false} ${x?string('ja', 'nein')} ${true?string('ja', 'nein')} ${booleanAndString} ${booleanAndString?string} -<#setting boolean_format = 'y,n'> +<#setting booleanFormat = 'y,n'> <@assertEquals actual='true'?boolean expected=true /> <@assertEquals actual='false'?boolean expected=false /> <@assertEquals actual='y'?boolean expected=true /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/date-type-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/date-type-builtins.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/date-type-builtins.ftl index f05654b..d65571e 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/date-type-builtins.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/date-type-builtins.ftl @@ -16,32 +16,32 @@ specific language governing permissions and limitations under the License. --> -<#setting time_zone = "UTC"> +<#setting timeZone = "UTC"> -<@assert test=unknown?is_unknown_date_like /> -<@assert test=!timeOnly?is_unknown_date_like /> -<@assert test=!dateOnly?is_unknown_date_like /> -<@assert test=!dateTime?is_unknown_date_like /> +<@assert test=unknown?isUnknownDateLike /> +<@assert test=!timeOnly?isUnknownDateLike /> +<@assert test=!dateOnly?isUnknownDateLike /> +<@assert test=!dateTime?isUnknownDateLike /> -<@assert test=!unknown?is_date_only /> -<@assert test=!timeOnly?is_date_only /> -<@assert test=dateOnly?is_date_only /> -<@assert test=!dateTime?is_date_only /> +<@assert test=!unknown?isDateOnly /> +<@assert test=!timeOnly?isDateOnly /> +<@assert test=dateOnly?isDateOnly /> +<@assert test=!dateTime?isDateOnly /> -<@assert test=!unknown?is_time /> -<@assert test=timeOnly?is_time /> -<@assert test=!dateOnly?is_time /> -<@assert test=!dateTime?is_time /> +<@assert test=!unknown?isTime /> +<@assert test=timeOnly?isTime /> +<@assert test=!dateOnly?isTime /> +<@assert test=!dateTime?isTime /> -<@assert test=!unknown?is_datetime /> -<@assert test=!timeOnly?is_datetime /> -<@assert test=!dateOnly?is_datetime /> -<@assert test=dateTime?is_datetime /> +<@assert test=!unknown?isDatetime /> +<@assert test=!timeOnly?isDatetime /> +<@assert test=!dateOnly?isDatetime /> +<@assert test=dateTime?isDatetime /> <@assertFails message="isn't known if">${unknown?string.xs}</@> -<@assertEquals expected="2003-04-05T06:07:08Z" actual=unknown?datetime_if_unknown?string.xs /> -<@assertEquals expected="2003-04-05Z" actual=unknown?date_if_unknown?string.xs /> -<@assertEquals expected="06:07:08Z" actual=unknown?time_if_unknown?string.xs /> -<@assertEquals expected="2003-04-05T06:07:08Z" actual=dateTime?date_if_unknown?string.xs /> -<@assertEquals expected="2003-04-05" actual=dateOnly?time_if_unknown?string.xs /> -<@assertEquals expected="06:07:08" actual=timeOnly?date_if_unknown?string.xs /> \ No newline at end of file +<@assertEquals expected="2003-04-05T06:07:08Z" actual=unknown?datetimeIfUnknown?string.xs /> +<@assertEquals expected="2003-04-05Z" actual=unknown?dateIfUnknown?string.xs /> +<@assertEquals expected="06:07:08Z" actual=unknown?timeIfUnknown?string.xs /> +<@assertEquals expected="2003-04-05T06:07:08Z" actual=dateTime?dateIfUnknown?string.xs /> +<@assertEquals expected="2003-04-05" actual=dateOnly?timeIfUnknown?string.xs /> +<@assertEquals expected="06:07:08" actual=timeOnly?dateIfUnknown?string.xs /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-bi.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-bi.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-bi.ftl index 85fb028..5d60f71 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-bi.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-bi.ftl @@ -17,147 +17,147 @@ under the License. --> <#assign d = "2010-05-15 22:38:05:23 +0200"?datetime("yyyy-MM-dd HH:mm:ss:S Z")> -<#setting time_zone="GMT+02"> -<@assertEquals actual=d?iso_utc expected="2010-05-15T20:38:05Z" /> -<@assertEquals actual=d?iso_utc_ms expected="2010-05-15T20:38:05.023Z" /> -<@assertEquals actual=d?iso_utc_m expected="2010-05-15T20:38Z" /> -<@assertEquals actual=d?iso_utc_h expected="2010-05-15T20Z" /> -<@assertEquals actual=d?iso_utc_nz expected="2010-05-15T20:38:05" /> -<@assertEquals actual=d?iso_utc_ms_nz expected="2010-05-15T20:38:05.023" /> -<@assertEquals actual=d?iso_utc_m_nz expected="2010-05-15T20:38" /> -<@assertEquals actual=d?iso_utc_h_nz expected="2010-05-15T20" /> -<@assertEquals actual=d?iso_local expected="2010-05-15T22:38:05+02:00" /> -<@assertEquals actual=d?iso_local_ms expected="2010-05-15T22:38:05.023+02:00" /> -<@assertEquals actual=d?iso_local_m expected="2010-05-15T22:38+02:00" /> -<@assertEquals actual=d?iso_local_h expected="2010-05-15T22+02:00" /> -<@assertEquals actual=d?iso_local_nz expected="2010-05-15T22:38:05" /> -<@assertEquals actual=d?iso_local_ms_nz expected="2010-05-15T22:38:05.023" /> -<@assertEquals actual=d?iso_local_m_nz expected="2010-05-15T22:38" /> -<@assertEquals actual=d?iso_local_h_nz expected="2010-05-15T22" /> - -<@assertEquals actual=d?date?iso_utc expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_ms expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_m expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_h expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_ms_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_m_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_utc_h_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_ms expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_m expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_h expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_ms_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_m_nz expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_local_h_nz expected="2010-05-15" /> - -<@assertEquals actual=d?time?iso_utc expected="20:38:05Z" /> -<@assertEquals actual=d?time?iso_utc_ms expected="20:38:05.023Z" /> -<@assertEquals actual=d?time?iso_utc_m expected="20:38Z" /> -<@assertEquals actual=d?time?iso_utc_h expected="20Z" /> -<@assertEquals actual=d?time?iso_utc_nz expected="20:38:05" /> -<@assertEquals actual=d?time?iso_utc_ms_nz expected="20:38:05.023" /> -<@assertEquals actual=d?time?iso_utc_m_nz expected="20:38" /> -<@assertEquals actual=d?time?iso_utc_h_nz expected="20" /> -<@assertEquals actual=d?time?iso_local expected="22:38:05+02:00" /> -<@assertEquals actual=d?time?iso_local_ms expected="22:38:05.023+02:00" /> -<@assertEquals actual=d?time?iso_local_m expected="22:38+02:00" /> -<@assertEquals actual=d?time?iso_local_h expected="22+02:00" /> -<@assertEquals actual=d?time?iso_local_nz expected="22:38:05" /> -<@assertEquals actual=d?time?iso_local_ms_nz expected="22:38:05.023" /> -<@assertEquals actual=d?time?iso_local_m_nz expected="22:38" /> -<@assertEquals actual=d?time?iso_local_h_nz expected="22" /> +<#setting timeZone="GMT+02"> +<@assertEquals actual=d?isoUtc expected="2010-05-15T20:38:05Z" /> +<@assertEquals actual=d?isoUtcMs expected="2010-05-15T20:38:05.023Z" /> +<@assertEquals actual=d?isoUtcM expected="2010-05-15T20:38Z" /> +<@assertEquals actual=d?isoUtcH expected="2010-05-15T20Z" /> +<@assertEquals actual=d?isoUtcNZ expected="2010-05-15T20:38:05" /> +<@assertEquals actual=d?isoUtcMsNZ expected="2010-05-15T20:38:05.023" /> +<@assertEquals actual=d?isoUtcMNZ expected="2010-05-15T20:38" /> +<@assertEquals actual=d?isoUtcHNZ expected="2010-05-15T20" /> +<@assertEquals actual=d?isoLocal expected="2010-05-15T22:38:05+02:00" /> +<@assertEquals actual=d?isoLocalMs expected="2010-05-15T22:38:05.023+02:00" /> +<@assertEquals actual=d?isoLocalM expected="2010-05-15T22:38+02:00" /> +<@assertEquals actual=d?isoLocalH expected="2010-05-15T22+02:00" /> +<@assertEquals actual=d?isoLocalNZ expected="2010-05-15T22:38:05" /> +<@assertEquals actual=d?isoLocalMsNZ expected="2010-05-15T22:38:05.023" /> +<@assertEquals actual=d?isoLocalMNZ expected="2010-05-15T22:38" /> +<@assertEquals actual=d?isoLocalHNZ expected="2010-05-15T22" /> + +<@assertEquals actual=d?date?isoUtc expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcMs expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcM expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcH expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcMsNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcMNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoUtcHNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocal expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalMs expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalM expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalH expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalMsNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalMNZ expected="2010-05-15" /> +<@assertEquals actual=d?date?isoLocalHNZ expected="2010-05-15" /> + +<@assertEquals actual=d?time?isoUtc expected="20:38:05Z" /> +<@assertEquals actual=d?time?isoUtcMs expected="20:38:05.023Z" /> +<@assertEquals actual=d?time?isoUtcM expected="20:38Z" /> +<@assertEquals actual=d?time?isoUtcH expected="20Z" /> +<@assertEquals actual=d?time?isoUtcNZ expected="20:38:05" /> +<@assertEquals actual=d?time?isoUtcMsNZ expected="20:38:05.023" /> +<@assertEquals actual=d?time?isoUtcMNZ expected="20:38" /> +<@assertEquals actual=d?time?isoUtcHNZ expected="20" /> +<@assertEquals actual=d?time?isoLocal expected="22:38:05+02:00" /> +<@assertEquals actual=d?time?isoLocalMs expected="22:38:05.023+02:00" /> +<@assertEquals actual=d?time?isoLocalM expected="22:38+02:00" /> +<@assertEquals actual=d?time?isoLocalH expected="22+02:00" /> +<@assertEquals actual=d?time?isoLocalNZ expected="22:38:05" /> +<@assertEquals actual=d?time?isoLocalMsNZ expected="22:38:05.023" /> +<@assertEquals actual=d?time?isoLocalMNZ expected="22:38" /> +<@assertEquals actual=d?time?isoLocalHNZ expected="22" /> <#assign dStrange = "600-01-01 23:59:59:123 +0000"?datetime("yyyy-MM-dd HH:mm:ss:S Z")> -<@assertEquals actual=dStrange?iso_utc_ms expected="0600-01-03T23:59:59.123Z" /> +<@assertEquals actual=dStrange?isoUtcMs expected="0600-01-03T23:59:59.123Z" /> <#-- java.sql treatment --> -<@assertEquals actual=sqlDate?iso_local expected="2010-05-15" /> -<@assertEquals actual=sqlDate?iso_local_nz expected="2010-05-15" /> -<@assertEquals actual=sqlTime?iso_local_nz expected="22:38:05" /> -<@assertEquals actual=sqlTime?iso_utc_nz expected="20:38:05" /> +<@assertEquals actual=sqlDate?isoLocal expected="2010-05-15" /> +<@assertEquals actual=sqlDate?isoLocalNZ expected="2010-05-15" /> +<@assertEquals actual=sqlTime?isoLocalNZ expected="22:38:05" /> +<@assertEquals actual=sqlTime?isoUtcNZ expected="20:38:05" /> -<#setting time_zone="GMT+03"> <#-- should not mater --> +<#setting timeZone="GMT+03"> <#-- should not mater --> <@assertEquals actual=d?iso("UTC") expected="2010-05-15T20:38:05Z" /> -<@assertEquals actual=d?iso_ms("UTC") expected="2010-05-15T20:38:05.023Z" /> -<@assertEquals actual=d?iso_m("UTC") expected="2010-05-15T20:38Z" /> -<@assertEquals actual=d?iso_h("UTC") expected="2010-05-15T20Z" /> -<@assertEquals actual=d?iso_nz("UTC") expected="2010-05-15T20:38:05" /> -<@assertEquals actual=d?iso_ms_nz("UTC") expected="2010-05-15T20:38:05.023" /> -<@assertEquals actual=d?iso_m_nz("UTC") expected="2010-05-15T20:38" /> -<@assertEquals actual=d?iso_h_nz("UTC") expected="2010-05-15T20" /> +<@assertEquals actual=d?isoMs("UTC") expected="2010-05-15T20:38:05.023Z" /> +<@assertEquals actual=d?isoM("UTC") expected="2010-05-15T20:38Z" /> +<@assertEquals actual=d?isoH("UTC") expected="2010-05-15T20Z" /> +<@assertEquals actual=d?isoNZ("UTC") expected="2010-05-15T20:38:05" /> +<@assertEquals actual=d?isoMsNZ("UTC") expected="2010-05-15T20:38:05.023" /> +<@assertEquals actual=d?isoMNZ("UTC") expected="2010-05-15T20:38" /> +<@assertEquals actual=d?isoHNZ("UTC") expected="2010-05-15T20" /> <@assertEquals actual=d?iso("GMT+02") expected="2010-05-15T22:38:05+02:00" /> -<@assertEquals actual=d?iso_ms("GMT+02") expected="2010-05-15T22:38:05.023+02:00" /> -<@assertEquals actual=d?iso_m("GMT+02") expected="2010-05-15T22:38+02:00" /> -<@assertEquals actual=d?iso_h("GMT+02") expected="2010-05-15T22+02:00" /> -<@assertEquals actual=d?iso_nz("GMT+02") expected="2010-05-15T22:38:05" /> -<@assertEquals actual=d?iso_ms_nz("GMT+02") expected="2010-05-15T22:38:05.023" /> -<@assertEquals actual=d?iso_m_nz("GMT+02") expected="2010-05-15T22:38" /> -<@assertEquals actual=d?iso_h_nz("GMT+02") expected="2010-05-15T22" /> +<@assertEquals actual=d?isoMs("GMT+02") expected="2010-05-15T22:38:05.023+02:00" /> +<@assertEquals actual=d?isoM("GMT+02") expected="2010-05-15T22:38+02:00" /> +<@assertEquals actual=d?isoH("GMT+02") expected="2010-05-15T22+02:00" /> +<@assertEquals actual=d?isoNZ("GMT+02") expected="2010-05-15T22:38:05" /> +<@assertEquals actual=d?isoMsNZ("GMT+02") expected="2010-05-15T22:38:05.023" /> +<@assertEquals actual=d?isoMNZ("GMT+02") expected="2010-05-15T22:38" /> +<@assertEquals actual=d?isoHNZ("GMT+02") expected="2010-05-15T22" /> <@assertEquals actual=d?date?iso("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_ms("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_m("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_h("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_nz("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_ms_nz("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_m_nz("UTC") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_h_nz("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMs("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoM("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoH("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoNZ("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMsNZ("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMNZ("UTC") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoHNZ("UTC") expected="2010-05-15" /> <@assertEquals actual=d?date?iso("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_ms("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_m("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_h("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_nz("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_ms_nz("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_m_nz("GMT+02") expected="2010-05-15" /> -<@assertEquals actual=d?date?iso_h_nz("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMs("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoM("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoH("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoNZ("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMsNZ("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoMNZ("GMT+02") expected="2010-05-15" /> +<@assertEquals actual=d?date?isoHNZ("GMT+02") expected="2010-05-15" /> <@assertEquals actual=d?time?iso("UTC") expected="20:38:05Z" /> -<@assertEquals actual=d?time?iso_ms("UTC") expected="20:38:05.023Z" /> -<@assertEquals actual=d?time?iso_m("UTC") expected="20:38Z" /> -<@assertEquals actual=d?time?iso_h("UTC") expected="20Z" /> -<@assertEquals actual=d?time?iso_nz("UTC") expected="20:38:05" /> -<@assertEquals actual=d?time?iso_ms_nz("UTC") expected="20:38:05.023" /> -<@assertEquals actual=d?time?iso_m_nz("UTC") expected="20:38" /> -<@assertEquals actual=d?time?iso_h_nz("UTC") expected="20" /> +<@assertEquals actual=d?time?isoMs("UTC") expected="20:38:05.023Z" /> +<@assertEquals actual=d?time?isoM("UTC") expected="20:38Z" /> +<@assertEquals actual=d?time?isoH("UTC") expected="20Z" /> +<@assertEquals actual=d?time?isoNZ("UTC") expected="20:38:05" /> +<@assertEquals actual=d?time?isoMsNZ("UTC") expected="20:38:05.023" /> +<@assertEquals actual=d?time?isoMNZ("UTC") expected="20:38" /> +<@assertEquals actual=d?time?isoHNZ("UTC") expected="20" /> <@assertEquals actual=d?time?iso("GMT+02") expected="22:38:05+02:00" /> -<@assertEquals actual=d?time?iso_ms("GMT+02") expected="22:38:05.023+02:00" /> -<@assertEquals actual=d?time?iso_m("GMT+02") expected="22:38+02:00" /> -<@assertEquals actual=d?time?iso_h("GMT+02") expected="22+02:00" /> -<@assertEquals actual=d?time?iso_nz("GMT+02") expected="22:38:05" /> -<@assertEquals actual=d?time?iso_ms_nz("GMT+02") expected="22:38:05.023" /> -<@assertEquals actual=d?time?iso_m_nz("GMT+02") expected="22:38" /> -<@assertEquals actual=d?time?iso_h_nz("GMT+02") expected="22" /> +<@assertEquals actual=d?time?isoMs("GMT+02") expected="22:38:05.023+02:00" /> +<@assertEquals actual=d?time?isoM("GMT+02") expected="22:38+02:00" /> +<@assertEquals actual=d?time?isoH("GMT+02") expected="22+02:00" /> +<@assertEquals actual=d?time?isoNZ("GMT+02") expected="22:38:05" /> +<@assertEquals actual=d?time?isoMsNZ("GMT+02") expected="22:38:05.023" /> +<@assertEquals actual=d?time?isoMNZ("GMT+02") expected="22:38" /> +<@assertEquals actual=d?time?isoHNZ("GMT+02") expected="22" /> <@assertEquals actual=d?iso(javaUTC) expected="2010-05-15T20:38:05Z" /> <@assertEquals actual=d?iso(javaGMT02) expected="2010-05-15T22:38:05+02:00" /> <@assertEquals actual=d?iso(adaptedToStringScalar) expected="2010-05-15T22:38:05+02:00" /> <#assign d = "12:00:00:1 +0000"?time("HH:mm:ss:S Z")> -<@assertEquals actual=d?iso_utc_ms expected="12:00:00.001Z" /> +<@assertEquals actual=d?isoUtcMs expected="12:00:00.001Z" /> <#assign d = "12:00:00:10 +0000"?time("HH:mm:ss:S Z")> -<@assertEquals actual=d?iso_utc_ms expected="12:00:00.01Z" /> +<@assertEquals actual=d?isoUtcMs expected="12:00:00.01Z" /> <#assign d = "12:00:00:100 +0000"?time("HH:mm:ss:S Z")> -<@assertEquals actual=d?iso_utc_ms expected="12:00:00.1Z" /> +<@assertEquals actual=d?isoUtcMs expected="12:00:00.1Z" /> <#assign d = "12:00:00:0 +0000"?time("HH:mm:ss:S Z")> -<@assertEquals actual=d?iso_utc_ms expected="12:00:00Z" /> +<@assertEquals actual=d?isoUtcMs expected="12:00:00Z" /> -<#setting time_zone="GMT+02"> +<#setting timeZone="GMT+02"> <#assign d = "2010-05-15"?date("yyyy-MM-dd")> -<@assertEquals actual=d?iso_local expected="2010-05-15" /> -<@assertEquals actual=d?iso_utc expected="2010-05-14" /> +<@assertEquals actual=d?isoLocal expected="2010-05-15" /> +<@assertEquals actual=d?isoUtc expected="2010-05-14" /> -<#setting time_zone="GMT+02:30"> +<#setting timeZone="GMT+02:30"> <#assign d = "2010-05-15"?datetime("yyyy-MM-dd")> -<@assertEquals actual=d?iso_local expected="2010-05-15T00:00:00+02:30" /> +<@assertEquals actual=d?isoLocal expected="2010-05-15T00:00:00+02:30" /> -<#setting time_zone="America/New_York"> -<@assertEquals actual="2010-05-09 20:00 +0000"?datetime("yyyy-MM-dd HH:mm Z")?iso_local expected="2010-05-09T16:00:00-04:00" /> -<@assertEquals actual="2010-01-01 20:00 +0000"?datetime("yyyy-MM-dd HH:mm Z")?iso_local expected="2010-01-01T15:00:00-05:00" /> +<#setting timeZone="America/New_York"> +<@assertEquals actual="2010-05-09 20:00 +0000"?datetime("yyyy-MM-dd HH:mm Z")?isoLocal expected="2010-05-09T16:00:00-04:00" /> +<@assertEquals actual="2010-01-01 20:00 +0000"?datetime("yyyy-MM-dd HH:mm Z")?isoLocal expected="2010-01-01T15:00:00-05:00" /> <@assertFails>${d?iso("no such zone")}</@> -<#setting time_zone="GMT+02"> -<@assertEquals actual=sqlTime?iso_local expected="22:38:05" /> -<@assertEquals actual=sqlTime?iso_utc expected="20:38:05" /> +<#setting timeZone="GMT+02"> +<@assertEquals actual=sqlTime?isoLocal expected="22:38:05" /> +<@assertEquals actual=sqlTime?isoUtc expected="20:38:05" /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl index a5accaf..be4d31b 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-iso-like.ftl @@ -17,7 +17,7 @@ under the License. --> <#assign d = "2010-05-15 22:38:05:23 +0200"?datetime("yyyy-MM-dd HH:mm:ss:S Z")> -<#setting time_zone="GMT+02"> +<#setting timeZone="GMT+02"> <@assertEquals actual=d?string.xs expected="2010-05-15T22:38:05.023+02:00" /> <@assertEquals actual=d?string.iso expected="2010-05-15T22:38:05.023+02:00" /> <@assertEquals actual=d?string('xs') expected="2010-05-15T22:38:05.023+02:00" /> @@ -83,20 +83,20 @@ <@assertEquals actual=d?string.xs_ms expected="12:30:15.000+02:00" /> <@assertEquals actual=d?string.iso_ms expected="12:30:15.000+02:00" /> -<#setting time_zone="GMT+02"> +<#setting timeZone="GMT+02"> <#assign d = "2010-05-15"?date("yyyy-MM-dd")> <@assertEquals actual=d?string.xs expected="2010-05-15+02:00" /> <@assertEquals actual=d?string.iso expected="2010-05-15" /> -<#setting time_zone="GMT+00"> +<#setting timeZone="GMT+00"> <@assertEquals actual=d?string.xs expected="2010-05-14Z" /> <@assertEquals actual=d?string.iso expected="2010-05-14" /> -<#setting time_zone="GMT+02:30"> +<#setting timeZone="GMT+02:30"> <#assign d = "2010-05-15"?datetime("yyyy-MM-dd")> <@assertEquals actual=d?string.xs expected="2010-05-15T00:00:00+02:30" /> <@assertEquals actual=d?string.iso expected="2010-05-15T00:00:00+02:30" /> -<#setting time_zone="GMT-05"> +<#setting timeZone="GMT-05"> <#setting locale = "en_US"> <#assign d = "BC 0001-05-15"?date("G yyyy-MM-dd")> <#-- Tests that: (a) BC 1 isn't 0 like in ISO 8601; (b) No Julian calendar is used. --> @@ -104,46 +104,46 @@ <@assertEquals actual=d?string.iso expected="0000-05-13" /> <#assign dt = "2010-05-15T01:02:03"?datetime.xs> -<#setting datetime_format="xs"> +<#setting datetimeFormat="xs"> <@assertEquals actual=dt?string expected="2010-05-15T01:02:03-05:00" /> -<#setting datetime_format="xs u"> +<#setting datetimeFormat="xs u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetime_format="iso u"> +<#setting datetimeFormat="iso u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetime_format="xs fz"> +<#setting datetimeFormat="xs fz"> <@assertEquals actual=dt?string expected="2010-05-15T01:02:03-05:00" /> -<#setting datetime_format="xs fz u"> +<#setting datetimeFormat="xs fz u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03Z" /> -<#setting datetime_format="xs nz u"> +<#setting datetimeFormat="xs nz u"> <@assertEquals actual=dt?string expected="2010-05-15T06:02:03" /> -<#setting datetime_format="iso m nz"> +<#setting datetimeFormat="iso m nz"> <@assertEquals actual=dt?string expected="2010-05-15T01:02" /> <#assign d = dt?date> -<#setting date_format="xs"> +<#setting dateFormat="xs"> <@assertEquals actual=d?string expected="2010-05-15-05:00" /> -<#setting date_format="iso"> +<#setting dateFormat="iso"> <@assertEquals actual=d?string expected="2010-05-15" /> -<#setting date_format="xs fz"> +<#setting dateFormat="xs fz"> <@assertEquals actual=d?string expected="2010-05-15-05:00" /> -<#setting date_format="xs fz u"> +<#setting dateFormat="xs fz u"> <@assertEquals actual=d?string expected="2010-05-15Z" /> -<#setting date_format="iso fz u"> +<#setting dateFormat="iso fz u"> <@assertEquals actual=d?string expected="2010-05-15" /> -<#setting date_format="xs nz"> +<#setting dateFormat="xs nz"> <@assertEquals actual=d?string expected="2010-05-15" /> <#assign t = dt?time> <@assertEquals actual=d?string expected="2010-05-15" /> -<#setting time_format="xs"> +<#setting timeFormat="xs"> <@assertEquals actual=t?string expected="01:02:03-05:00" /> -<#setting time_format="iso_m"> +<#setting timeFormat="iso_m"> <@assertEquals actual=t?string expected="01:02-05:00" /> -<#setting time_format="xs fz"> +<#setting timeFormat="xs fz"> <@assertEquals actual=t?string expected="01:02:03-05:00" /> -<#setting time_format="xs nz"> +<#setting timeFormat="xs nz"> <@assertEquals actual=t?string expected="01:02:03" /> -<#setting time_format="iso nz ms"> +<#setting timeFormat="iso nz ms"> <@assertEquals actual=t?string expected="01:02:03.000" /> <@assertFails message="Use ?date, ?time, or ?datetime">${unknownDate?string.xs}</@> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl index 82001db..5d64c68 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateformat-java.ftl @@ -17,8 +17,8 @@ under the License. --> <#setting locale="en_US"> -<#setting time_zone="GMT"> -<#setting datetime_format=""> +<#setting timeZone="GMT"> +<#setting datetimeFormat=""> ${date} ${unknownDate?datetime} ${date?string} @@ -46,26 +46,26 @@ ${date?time?string.short} ${date?time?string.medium} ${date?time?string.long} <#setting locale="hu_hu"> -<#setting datetime_format="long_long"> +<#setting datetimeFormat="long_long"> ${date} <#setting locale="en_US"> -<#setting datetime_format="EEE, dd MMM yyyyy HH:mm:ss z"> +<#setting datetimeFormat="EEE, dd MMM yyyyy HH:mm:ss z"> ${date} ${unknownDate?string["EEE, dd MMM yyyy HH:mm:ss z"]} ${unknownDate?string("EEE, dd MMM yyyy HH:mm:ss z")} ${unknownDate?string.yyyy} -<#setting datetime_format="yyyy"> +<#setting datetimeFormat="yyyy"> <#assign s = date?string> ${s} -<#setting datetime_format="MM"> +<#setting datetimeFormat="MM"> ${s} <#-- Check ?string lazy evaluation bug was fixed: --> -<#setting datetime_format="yyyy"> +<#setting datetimeFormat="yyyy"> <#assign s = date?string> <#-- no ${s} --> -<#setting datetime_format="MM"> +<#setting datetimeFormat="MM"> ${s} <#assign s = date?string> ${s} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl index d830f95..c5155f0 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/dateparsing.ftl @@ -17,10 +17,10 @@ under the License. --> <#setting locale="en_US"> -<#setting time_zone="GMT"> -<#setting datetime_format="G yyyy-MM-dd HH:mm:ss.S Z"> -<#setting date_format="G yyyy-MM-dd Z"> -<#setting time_format="HH:mm:ss.S Z"> +<#setting timeZone="GMT"> +<#setting datetimeFormat="G yyyy-MM-dd HH:mm:ss.S Z"> +<#setting dateFormat="G yyyy-MM-dd Z"> +<#setting timeFormat="HH:mm:ss.S Z"> <@assertEquals expected="AD 1998-10-30 15:30:44.512 +0000" actual='AD 1998-10-30 19:30:44.512 +0400'?datetime?string /> <@assertEquals expected="AD 1998-10-29 +0000" actual='AD 1998-10-30 +0400'?date?string /> @@ -38,9 +38,9 @@ <@assertEquals expected="15:30:44.512 +0000" actual='19:30:44.512+04:00'?time.xs?string /> <#assign gmtStr='1998-10-30T19:30:44.512'?datetime.xs?string /> -<#setting time_zone="GMT+01:00"> +<#setting timeZone="GMT+01:00"> <#assign gmt01Str='1998-10-30T19:30:44.512'?datetime.xs?string /> -<#setting time_zone="default"> +<#setting timeZone="default"> <#assign defStr='1998-10-30T19:30:44.512'?datetime.xs?string /> <@assert test = gmtStr != gmt01Str /> <@assert test = defStr != gmtStr \|\| defStr != gmt01Str /> @@ -48,19 +48,19 @@ <#assign refDate = "AD 1998-10-30 +0000"?date> <#assign refTime = "15:30:44.512 +0000"?time> <#assign refDateTime = "AD 1998-10-30 15:30:44.512 +0000"?datetime> -<#setting time_zone="UTC"> +<#setting timeZone="UTC"> <#list ['xs', 'xs_nz', 'xs_fz', 'xs s', 'xs ms'] as format> - <#setting date_format=format> - <#setting time_format=format> - <#setting datetime_format=format> + <#setting dateFormat=format> + <#setting timeFormat=format> + <#setting datetimeFormat=format> <@assertEquals expected=refDate actual="1998-10-30Z"?date /> <@assertEquals expected=refTime actual="15:30:44.512Z"?time /> <@assertEquals expected=refDateTime actual="1998-10-30T15:30:44.512Z"?datetime /> </#list> <#list ['iso', 'iso_nz', 'iso_fz', 'iso m'] as format> - <#setting date_format=format> - <#setting time_format=format> - <#setting datetime_format=format> + <#setting dateFormat=format> + <#setting timeFormat=format> + <#setting datetimeFormat=format> <@assertEquals expected=refDate actual="1998-10-30"?date /> <@assertEquals expected=refDate actual="19981030"?date /> <@assertEquals expected=refTime actual="15:30:44,512Z"?time /> @@ -69,13 +69,13 @@ <@assertEquals expected=refDateTime actual="19981030T153044,512Z"?datetime /> </#list> -<#setting time_zone="GMT+01:00"> +<#setting timeZone="GMT+01:00"> <#assign refDateTime='1998-10-30T19:30:44.512'?datetime.xs /> <@assertEquals expected=refDateTime actual="1998-10-30T19:30:44.512"?datetime.xs /> <@assertEquals expected=refDateTime actual="1998-10-30T19:30:44.512"?datetime.iso /> <@assertEquals expected=refDateTime actual="1998-10-30T18:30:44.512"?datetime.xs_u /> <@assertEquals expected=refDateTime actual="1998-10-30T18:30:44.512"?datetime.iso_u /> -<#setting time_zone="UTC"> +<#setting timeZone="UTC"> <@assertEquals expected=refDateTime actual="1998-10-30T18:30:44.512"?datetime.xs /> <@assertEquals expected=refDateTime actual="1998-10-30T18:30:44.512"?datetime.iso /> <@assertEquals expected=refDateTime actual="1998-10-30T19:30:44.512+01:00"?datetime.xs /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/escapes.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/escapes.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/escapes.ftl index 20efc67..4ba28d9 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/escapes.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/escapes.ftl @@ -26,8 +26,8 @@ ${3} ${"x"} ${"y"} ${"z"} -<#noescape>${1}</#noescape> -<#noescape><#noescape>${1}</#noescape></#noescape> +<#noEscape>${1}</#noEscape> +<#noEscape><#noEscape>${1}</#noEscape></#noEscape> </#escape> ${1} ${2} @@ -43,27 +43,27 @@ ${"<&>"} --- <#assign x = "<Mooo>"> ${x} = <Mooo> -<#escape x as x?upper_case> +<#escape x as x?upperCase> ${x} = <MOOO> <#escape x as x?html> ${x} = <MOOO> - <#noescape> + <#noEscape> ${x} = <MOOO> - </#noescape> + </#noEscape> ${x} = <MOOO> </#escape> ${x} = <MOOO> - <#noescape> + <#noEscape> ${x} = <Mooo> <#escape x as x?html> ${x} = <Mooo> - <#noescape> + <#noEscape> ${x} = <Mooo> - </#noescape> + </#noEscape> ${x} = <Mooo> </#escape> ${x} = <Mooo> - </#noescape> + </#noEscape> ${x} = <MOOO> </#escape> <#escape az as ["red", "green", "blue"][az-1]> @@ -71,9 +71,9 @@ ${x} = <Mooo> </#escape> --- <#assign s = 'A&B'> -<#escape x as '<' + x?html + '>[' + x?lower_case + '](' + x + ')'> +<#escape x as '<' + x?html + '>[' + x?lowerCase + '](' + x + ')'> ${s} ${s + 2} - <#escape x as '{' + x?lower_case + '}' + x> + <#escape x as '{' + x?lowerCase + '}' + x> ${s} ${s + 2} </#escape> </#escape> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/existence-operators.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/existence-operators.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/existence-operators.ftl index 2f9bdce..d517557 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/existence-operators.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/existence-operators.ftl @@ -32,10 +32,10 @@ <@isNonFastIRE>${v}</@> <#-- To check that it isn't an IRE.FAST_INSTANCE --> <@assertEquals actual=v?exists expected=false /> <@assertEquals actual=(v)?exists expected=false /> -<@assertEquals actual=v?if_exists expected='' /> -<@assertEquals actual=(v)?if_exists expected='' /> -<@assertEquals actual=v?has_content expected=false /> -<@assertEquals actual=(v)?has_content expected=false /> +<@assertEquals actual=v?ifExists expected='' /> +<@assertEquals actual=(v)?ifExists expected='' /> +<@assertEquals actual=v?hasContent expected=false /> +<@assertEquals actual=(v)?hasContent expected=false /> <@assertEquals actual=v?default(w, '-') expected='-' /> <@assertEquals actual=v!w!'-' expected='-' /> @@ -52,10 +52,10 @@ <@assertEquals actual=(v)?default('-') expected=v /> <@assert test=v?exists /> <@assert test=(v)?exists /> - <@assertEquals actual=v?if_exists expected=v /> - <@assertEquals actual=(v)?if_exists expected=v /> - <@assert test=v?has_content /> - <@assert test=(v)?has_content /> + <@assertEquals actual=v?ifExists expected=v /> + <@assertEquals actual=(v)?ifExists expected=v /> + <@assert test=v?hasContent /> + <@assert test=(v)?hasContent /> </#list> <@assert test=!v?? /> <@assert test=!v?exists /> @@ -69,10 +69,10 @@ <@assertEquals actual=(u.v)?default('-') expected='-' /> <@isIRE>${u.v?exists}</@> <@assertEquals actual=(u.v)?exists expected=false /> -<@isIRE>${u.v?if_exists}</@> -<@assertEquals actual=(u.v)?if_exists expected='' /> -<@isIRE>${u.v?has_content}</@> -<@assertEquals actual=(u.v)?has_content expected=false /> +<@isIRE>${u.v?ifExists}</@> +<@assertEquals actual=(u.v)?ifExists expected='' /> +<@isIRE>${u.v?hasContent}</@> +<@assertEquals actual=(u.v)?hasContent expected=false /> <#assign u = { 'x': 'X' } > <@assertEquals actual=u.v!'-' expected='-' /> @@ -83,10 +83,10 @@ <@assertEquals actual=(u.v)?default('-') expected='-' /> <@assertEquals actual=u.v?exists expected=false /> <@assertEquals actual=(u.v)?exists expected=false /> -<@assertEquals actual=u.v?if_exists expected='' /> -<@assertEquals actual=(u.v)?if_exists expected='' /> -<@assertEquals actual=u.v?has_content expected=false /> -<@assertEquals actual=(u.v)?has_content expected=false /> +<@assertEquals actual=u.v?ifExists expected='' /> +<@assertEquals actual=(u.v)?ifExists expected='' /> +<@assertEquals actual=u.v?hasContent expected=false /> +<@assertEquals actual=(u.v)?hasContent expected=false /> <#assign u = { 'v': 'V' } > <@assertEquals actual=u.v!'-' expected='V' /> @@ -97,10 +97,10 @@ <@assertEquals actual=(u.v)?default('-') expected='V' /> <@assert test=u.v?exists /> <@assert test=(u.v)?exists /> -<@assertEquals actual=u.v?if_exists expected='V' /> -<@assertEquals actual=(u.v)?if_exists expected='V' /> -<@assert test=u.v?has_content /> -<@assert test=(u.v)?has_content /> +<@assertEquals actual=u.v?ifExists expected='V' /> +<@assertEquals actual=(u.v)?ifExists expected='V' /> +<@assert test=u.v?hasContent /> +<@assert test=(u.v)?hasContent /> <#list 1..4 as i> <#if i == 3><#assign x = 'X'></#if> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/hashliteral.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/hashliteral.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/hashliteral.ftl index 0a02a3a..dc3c972 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/hashliteral.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/hashliteral.ftl @@ -62,7 +62,7 @@ ${test.bar} ${test.test1} ${test.test45} -${test.hello?if_exists} +${test.hello?ifExists} ${test.bar} ${test.hash} @@ -72,7 +72,7 @@ ${test.newhash.temp} <p>Pathological case: zero item hash:</p> <#assign test = {}> -${test.test1?if_exists} +${test.test1?ifExists} <p>Hash of number literals:</p> <#assign test = {"1" : 2}> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/identifier-escaping.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/identifier-escaping.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/identifier-escaping.ftl index 9b39235..372994a 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/identifier-escaping.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/identifier-escaping.ftl @@ -20,7 +20,7 @@ <#local \.namespace = 123> <a-b>${data\-color}<#nested \.namespace></a-b><#t> </#macro> -<#macro "m-b2"></#macro> +<#macro m\-b2></#macro> <#macro "m/b2"></#macro> <@m\-a data\-color="red"; loop\-var>${loop\-var}</@> @@ -46,7 +46,7 @@ Switch: <#switch sw\-a> <#default>Fails </#switch> -<#escape \-x as \-x?upper_case>${'escaped'}</#escape> +<#escape \-x as \-x?upperCase>${'escaped'}</#escape> <#if false && sw\-a == 1> <#visit x\-y2 using x\-y1> @@ -57,7 +57,7 @@ Switch: <#switch sw\-a> <#assign @as@_a = 'as1'> ${@as@_a} -<#assign 'as-c' = 'as2'> +<#assign as\-c = 'as2'> ${.vars['as-c']} <#assign "as/b" = 'as3'> ${.vars["as/b"]} @@ -75,7 +75,7 @@ ${.vars['as"d']} <#macro dumpNS> <#list .namespace?keys?sort as k> - ${k} = <#local v = .namespace[k]><#if v?is_string>${v}<#else>...</#if><#lt> + ${k} = <#local v = .namespace[k]><#if v?isString>${v}<#else>...</#if><#lt> </#list> </#macro> <@dumpNS /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl index 97c3f4b..ca84253 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/if.ftl @@ -26,15 +26,15 @@ - <#if x == 1>good<#else>wrong</#if> - <#if x == 0>wrong<#else>good</#if> -- <#if x == 1>good<#elseif x == 2>wrong<#else>wrong</#if> -- <#if x == 1>good<#elseif x == 1>wrong<#else>wrong</#if> -- <#if x == 0>wrong<#elseif x == 1>good<#else>wrong</#if> -- <#if x == 0>wrong<#elseif x == 2>wrong<#else>good</#if> +- <#if x == 1>good<#elseIf x == 2>wrong<#else>wrong</#if> +- <#if x == 1>good<#elseIf x == 1>wrong<#else>wrong</#if> +- <#if x == 0>wrong<#elseIf x == 1>good<#else>wrong</#if> +- <#if x == 0>wrong<#elseIf x == 2>wrong<#else>good</#if> -- <#if x == 1>good<#elseif x == 1>wrong</#if> -- <#if x == 0>wrong<#elseif x == 1>good</#if> -- <#if x == 0>wrong<#elseif x == 2>wrong</#if>good -- <#if x == 0>wrong<#elseif x == 1><#else>wrong</#if>good +- <#if x == 1>good<#elseIf x == 1>wrong</#if> +- <#if x == 0>wrong<#elseIf x == 1>good</#if> +- <#if x == 0>wrong<#elseIf x == 2>wrong</#if>good +- <#if x == 0>wrong<#elseIf x == 1><#else>wrong</#if>good <#-- Same with pre-calculable results, just in case later the dead code will be optimized out: --> - <#if 1 == 1>good</#if> @@ -45,15 +45,15 @@ - <#if 1 == 1>good<#else>wrong</#if> - <#if 1 == 0>wrong<#else>good</#if> -- <#if 1 == 1>good<#elseif 1 == 2>wrong<#else>wrong</#if> -- <#if 1 == 1>good<#elseif 1 == 1>wrong<#else>wrong</#if> -- <#if 1 == 0>wrong<#elseif 1 == 1>good<#else>wrong</#if> -- <#if 1 == 0>wrong<#elseif 1 == 2>wrong<#else>good</#if> +- <#if 1 == 1>good<#elseIf 1 == 2>wrong<#else>wrong</#if> +- <#if 1 == 1>good<#elseIf 1 == 1>wrong<#else>wrong</#if> +- <#if 1 == 0>wrong<#elseIf 1 == 1>good<#else>wrong</#if> +- <#if 1 == 0>wrong<#elseIf 1 == 2>wrong<#else>good</#if> -- <#if 1 == 1>good<#elseif 1 == 1>wrong</#if> -- <#if 1 == 0>wrong<#elseif 1 == 1>good</#if> -- <#if 1 == 0>wrong<#elseif 1 == 2>wrong</#if>good -- <#if 1 == 0>wrong<#elseif 1 == 1><#else>wrong</#if>good +- <#if 1 == 1>good<#elseIf 1 == 1>wrong</#if> +- <#if 1 == 0>wrong<#elseIf 1 == 1>good</#if> +- <#if 1 == 0>wrong<#elseIf 1 == 2>wrong</#if>good +- <#if 1 == 0>wrong<#elseIf 1 == 1><#else>wrong</#if>good <#-- Varying branch choice of the same AST nodes: --> <#list [1, 2, 3, 4] as x> @@ -63,7 +63,7 @@ - <#if x == 1>is 1<#else>isn't 1</#if> - <#if x == 2>is 2<#else>isn't 2</#if> - <#if x == 3>is 3<#else>isn't 3</#if> -- Finally, it's: <#if x == 1>1<#elseif x == 2>2<#elseif x == 3>3<#else>4</#if> +- Finally, it's: <#if x == 1>1<#elseIf x == 2>2<#elseIf x == 3>3<#else>4</#if> </#list> <#-- nested --> @@ -73,16 +73,16 @@ 1: <#if (x > y)> > ${y} - <#elseif x == y> + <#elseIf x == y> == ${y} <#else> <= ${y} </#if> - <#elseif x == 2> + <#elseIf x == 2> 2: <#if (x > y)> > ${y} - <#elseif x == y> + <#elseIf x == y> == ${y} <#else> <= ${y} @@ -91,7 +91,7 @@ 3: <#if (x > y)> > ${y} - <#elseif x == y> + <#elseIf x == y> == ${y} <#else> <= ${y} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/include2.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/include2.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/include2.ftl index 5f3ccc3..54d16ce 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/include2.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/include2.ftl @@ -22,11 +22,11 @@ <#assign bTrue=true> <#assign bFalse=false> -<#include "include2-included.ftl" ignore_missing=true> -<#include "include2-included.ftl" ignore_missing=bTrue> -<#include "include2-included.ftl" ignore_missing=false> -<#include "include2-included.ftl" ignore_missing=bFalse> +<#include "include2-included.ftl" ignoreMissing=true> +<#include "include2-included.ftl" ignoreMissing=bTrue> +<#include "include2-included.ftl" ignoreMissing=false> +<#include "include2-included.ftl" ignoreMissing=bFalse> <@assertFails message="not found"><#include "missing.ftl"></@> -[<#include "missing.ftl" ignore_missing=true>] -[<#include "missing.ftl" ignore_missing=bTrue>] +[<#include "missing.ftl" ignoreMissing=true>] +[<#include "missing.ftl" ignoreMissing=bTrue>] http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/lastcharacter.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/lastcharacter.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/lastcharacter.ftl index a2ad295..26539b3 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/lastcharacter.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/lastcharacter.ftl @@ -26,6 +26,6 @@ ${message?capitalize?length} - ${message [1..] ? upper_case} + ${message [1..] ? upperCase} message: ${message ?capitalize[0..10]} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl index 9d8f456..3c8811a 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/macros.ftl @@ -31,7 +31,7 @@ <#assign urls = {"home" : "/home.html", "about" : "/about.html"}> <#assign images = {"home" : "/images/home.png", "about" : "/image/about-us.jpeg"}> <#assign preferences = {"showImages" : true}> -<#assign "español" = français><#macro français(url, image, alt)> +<#assign español = français><#macro français(url, image, alt)> <#local var = "Kilroy"> <a href="${url}"> <#if preferences.showImages> @@ -74,7 +74,7 @@ <p>Test "catch-all" macro parameter:</p> -<#macro "catch-all" foo bar...> +<#macro catch\-all foo bar...> foo=${foo} baz=[<#list bar?keys?sort as key>${key}=${bar[key]}<#if key_has_next>, </#if></#list>] </#macro> <#assign catchall = .namespace["catch-all"]> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl index f7f1be3..cbf4dc1 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/noparse.ftl @@ -21,7 +21,7 @@ <title>FreeMarker: NoParse Test</title> </head> <body> -<#noparse> +<#noParse> A simple test follows: @@ -31,31 +31,31 @@ A more rigorous test, showing that we're not faking it: ${message@#$%&} -</#noparse> +</#noParse> <#if message?exists> <p>Message exists! - <#noparse> + <#noParse> ...and even generates output! <#if message> Nested statements are ok, too. </#if> - </#noparse> + </#noParse> </p> </#if> Here's another edge case, this time, trying to output a <noparse> inside another <noparse> -<#noparse> +<#noParse> This is what the noparse instruction looks like: -<#nop</#noparse><#noparse>arse>This part of the template wont be parsed by the +<#nop</#noParse><#noParse>arse>This part of the template wont be parsed by the FreeMarker parser. Instead, it will be treated as verbatim text information, -and output as such.</#nop</#noparse><#noparse>arse> +and output as such.</#nop</#noParse><#noParse>arse> The rest of the template appears here. -</#noparse> +</#noParse> Simple. </body> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl index d060a44..4c8e627 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-format.ftl @@ -16,13 +16,13 @@ specific language governing permissions and limitations under the License. --> -<#setting number_format = ",##0.##"> +<#setting numberFormat = ",##0.##"> <#setting locale = "fr_FR"> ${1} ${1?c} ${1234567.886} ${1234567.886?c} -<#setting number_format = "0.00"> +<#setting numberFormat = "0.00"> ${1} ${1?c} ${1234567.886} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl index 2ca9e8b..334841d 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-literal.ftl @@ -43,7 +43,7 @@ "1" = "one", "12" = "twelve", "2one" = "two-one", - "one2" = "one-two", + one2 = "one-two", call = "org.apache.freemarker.core.templatesuite.models.SimpleTestMethod"?new() > http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl index 6dab082..19e37d5 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-math-builtins.ftl @@ -22,10 +22,10 @@ <@assertEquals actual=3.5?abs expected=3.5 /> <@assertEquals actual=(-3.5)?abs expected=3.5 /> -<@assert test=fNan?abs?is_nan /> -<@assert test=dNan?abs?is_nan /> -<@assert test=fNinf?abs?is_infinite /> -<@assert test=dPinf?abs?is_infinite /> +<@assert test=fNan?abs?isNan /> +<@assert test=dNan?abs?isNan /> +<@assert test=fNinf?abs?isInfinite /> +<@assert test=dPinf?abs?isInfinite /> <@assert test=fNinf lt 0 /> <@assert test=dPinf gt 0 /> <@assert test=fNinf?abs gt 0 /> @@ -49,30 +49,30 @@ <@assertEquals actual=bip?abs expected=5 /> <@assertEquals actual=bdp?abs expected=0.05 /> -<@assert test=!0?is_infinite /> -<@assert test=!fn?is_infinite /> -<@assert test=!dn?is_infinite /> -<@assert test=!ineg?is_infinite /> -<@assert test=!ln?is_infinite /> -<@assert test=!sn?is_infinite /> -<@assert test=!bn?is_infinite /> -<@assert test=!bin?is_infinite /> -<@assert test=!bdn?is_infinite /> -<@assert test=!fNan?is_infinite /> -<@assert test=!dNan?is_infinite /> -<@assert test=fNinf?is_infinite /> -<@assert test=dPinf?is_infinite /> +<@assert test=!0?isInfinite /> +<@assert test=!fn?isInfinite /> +<@assert test=!dn?isInfinite /> +<@assert test=!ineg?isInfinite /> +<@assert test=!ln?isInfinite /> +<@assert test=!sn?isInfinite /> +<@assert test=!bn?isInfinite /> +<@assert test=!bin?isInfinite /> +<@assert test=!bdn?isInfinite /> +<@assert test=!fNan?isInfinite /> +<@assert test=!dNan?isInfinite /> +<@assert test=fNinf?isInfinite /> +<@assert test=dPinf?isInfinite /> -<@assert test=!0?is_nan /> -<@assert test=!fn?is_nan /> -<@assert test=!dn?is_nan /> -<@assert test=!ineg?is_nan /> -<@assert test=!ln?is_nan /> -<@assert test=!sn?is_nan /> -<@assert test=!bn?is_nan /> -<@assert test=!bin?is_nan /> -<@assert test=!bdn?is_nan /> -<@assert test=fNan?is_nan /> -<@assert test=dNan?is_nan /> -<@assert test=!fNinf?is_nan /> -<@assert test=!dPinf?is_nan /> \ No newline at end of file +<@assert test=!0?isNan /> +<@assert test=!fn?isNan /> +<@assert test=!dn?isNan /> +<@assert test=!ineg?isNan /> +<@assert test=!ln?isNan /> +<@assert test=!sn?isNan /> +<@assert test=!bn?isNan /> +<@assert test=!bin?isNan /> +<@assert test=!bdn?isNan /> +<@assert test=fNan?isNan /> +<@assert test=dNan?isNan /> +<@assert test=!fNinf?isNan /> +<@assert test=!dPinf?isNan /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl index 403e033..91b29e0 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/number-to-date.ftl @@ -16,20 +16,20 @@ specific language governing permissions and limitations under the License. --> -${1305575275540?number_to_datetime?iso_utc_ms} == 2011-05-16T19:47:55.54Z -${1305575275540?number_to_date?iso_utc} == 2011-05-16 -${1305575275540?number_to_time?iso_utc_ms} == 19:47:55.54Z +${1305575275540?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z +${1305575275540?numberToDate?isoUtc} == 2011-05-16 +${1305575275540?numberToTime?isoUtcMs} == 19:47:55.54Z -${1305575275540?long?number_to_datetime?iso_utc_ms} == 2011-05-16T19:47:55.54Z -${1305575275540?double?number_to_datetime?iso_utc_ms} == 2011-05-16T19:47:55.54Z -${bigInteger?number_to_datetime?iso_utc_ms} == 2011-05-16T19:47:55.54Z -${bigDecimal?number_to_datetime?iso_utc_ms} == 2011-05-16T19:47:55.54Z -${1000?float?number_to_datetime?iso_utc} == 1970-01-01T00:00:01Z -${1000?int?number_to_datetime?iso_utc} == 1970-01-01T00:00:01Z -${0?byte?number_to_datetime?iso_utc} == 1970-01-01T00:00:00Z +${1305575275540?long?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z +${1305575275540?double?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z +${bigInteger?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z +${bigDecimal?numberToDatetime?isoUtcMs} == 2011-05-16T19:47:55.54Z +${1000?float?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z +${1000?int?numberToDatetime?isoUtc} == 1970-01-01T00:00:01Z +${0?byte?numberToDatetime?isoUtc} == 1970-01-01T00:00:00Z <#attempt> -${9999991305575275540?number_to_datetime?iso_utc} <#-- doesn't fit into long --> +${9999991305575275540?numberToDatetime?isoUtc} <#-- doesn't fit into long --> <#recover> failed </#attempt> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl index 221b61b..67e09ad 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/numerical-cast.ftl @@ -18,7 +18,7 @@ under the License. --> <#setting locale="en_US"> -<#setting number_format="0.#########"> +<#setting numberFormat="0.#########"> <#assign testlist= [ 0, 1, -1, 0.5, 1.5, -0.5, -1.5, 0.25, -0.25, 1.75, -1.75, http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl index da1128f..ec95d33 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding1.ftl @@ -16,14 +16,14 @@ specific language governing permissions and limitations under the License. --> -Output charset: ${.output_encoding?default("undefined")} -URL escaping charset: ${.url_escaping_charset?default("undefined")} +Output charset: ${.outputEncoding?default("undefined")} +URL escaping charset: ${.urlEscapingCharset?default("undefined")} <#assign s="a/%b"> -<#setting url_escaping_charset="UTF-16"> +<#setting urlEscapingCharset="UTF-16"> ${s?url} ${s?url} -<#setting url_escaping_charset="ISO-8859-1"> +<#setting urlEscapingCharset="ISO-8859-1"> ${s?url} ${s?url} ${s?url('UTF-16')} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl index 3a4f24d..c9a4f9f 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding2.ftl @@ -16,13 +16,13 @@ specific language governing permissions and limitations under the License. --> -Output charset: ${.output_encoding?default("undefined")} -URL escaping charset: ${.url_escaping_charset?default("undefined")} +Output charset: ${.outputEncoding?default("undefined")} +URL escaping charset: ${.urlEscapingCharset?default("undefined")} <#assign s="a/%b"> UTF-16: ${s?url} ISO-8859-1: ${s?url('ISO-8859-1')} UTF-16: ${s?url} -<#setting url_escaping_charset="ISO-8859-1"> +<#setting urlEscapingCharset="ISO-8859-1"> ISO-8859-1: ${s?url} ISO-8859-1: ${s?url} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl index 3a4f24d..c9a4f9f 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/output-encoding3.ftl @@ -16,13 +16,13 @@ specific language governing permissions and limitations under the License. --> -Output charset: ${.output_encoding?default("undefined")} -URL escaping charset: ${.url_escaping_charset?default("undefined")} +Output charset: ${.outputEncoding?default("undefined")} +URL escaping charset: ${.urlEscapingCharset?default("undefined")} <#assign s="a/%b"> UTF-16: ${s?url} ISO-8859-1: ${s?url('ISO-8859-1')} UTF-16: ${s?url} -<#setting url_escaping_charset="ISO-8859-1"> +<#setting urlEscapingCharset="ISO-8859-1"> ISO-8859-1: ${s?url} ISO-8859-1: ${s?url} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a7156790/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/root.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/root.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/root.ftl index e1bc7f3..d4ca2c3 100644 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/root.ftl +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/root.ftl @@ -28,16 +28,16 @@ <p>Access the same variable via the root variable (dot syntax):</p> -<p>${.data_model.message}</p> +<p>${.dataModel.message}</p> <p>Access the same variable via the root variable (bracket syntax):</p> -<p>${.data_model["message"]}</p> +<p>${.dataModel["message"]}</p> <p>Ensure that root lookups are unaffected by local variables:</p> <#macro test message> - ${.data_model.message} + ${.dataModel.message} ${message} </#macro>
Mime	Unnamed text/plain (inline, 8-Bit, 84901 bytes)
	View raw message