http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns4.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns4.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns4.ftl new file mode 100644 index 0000000..e97bfc0 --- /dev/null +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns4.ftl @@ -0,0 +1,70 @@ +<#ftl ns_prefixes = {"x" : "http://x";, "y" : "http://y"}> +<#-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<#recurse doc > + +<#macro book> + <html> + <head> + <title><#recurse .node["x:title"]></title> + </head> + <body> + <h1><#recurse .node["x:title"]></h1> + <#recurse> + </body> + </html> +</#macro> + +<#macro chapter> + <h2><#recurse .node["y:title"]></h2> + <#recurse> +</#macro> + +<#macro 'x:chapter'> + <h2><#recurse .node["y:title"]></h2> + <#recurse> +</#macro> + +<#macro para> + <p><#recurse> +</#macro> + +<#macro 'x:para'> + <p><#recurse> +</#macro> + +<#macro 'y:para'> + <p><#recurse> +</#macro> + +<#macro "x:title"> + <#-- + We have handled this element imperatively, + so we do nothing here. + --> +</#macro> + +<#macro "y:title"> + <#-- + We have handled this element imperatively, + so we do nothing here. + --> +</#macro> + +<#macro @text>${.node?html}</#macro> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns5.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns5.ftl b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns5.ftl new file mode 100644 index 0000000..edc3b4a --- /dev/null +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/templates/xmlns5.ftl @@ -0,0 +1,28 @@ +<#ftl ns_prefixes = {"D": "http://y.com";, "xx" : "http://x.com"}> +<#-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<#assign r = doc["N:root"]> +${r["N:t1"][0]?default('-')} = No NS +${r["xx:t2"][0]?default('-')} = x NS +${r["t3"][0]?default('-')} = y NS +${r["xx:t4"][0]?default('-')} = x NS +${r["//t1"][0]?default('-')} = No NS +${r["//t2"][0]?default('-')} = - +${r["//t3"][0]?default('-')} = - +${r["//t4"][0]?default('-')} = - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml new file mode 100644 index 0000000..866da69 --- /dev/null +++ b/freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/testcases.xml @@ -0,0 +1,211 @@ +<?xml version="1.0" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<!DOCTYPE testCases [ + <!ELEMENT testCases (setting?, testCase*)> + <!ELEMENT testCase (setting?)> + <!ATTLIST testCase + name CDATA #REQUIRED + template CDATA #IMPLIED + expected CDATA #IMPLIED + noOutput CDATA #IMPLIED + > + <!-- The default of `template` is "${name?keep_before('[#endTN]')}.ftl" --> + <!-- The default of `expected` is "${name}.txt" --> + <!-- The default of `noOutput` is false --> + + <!ELEMENT setting EMPTY> + <!ATTLIST setting + auto_import CDATA #IMPLIED + source_encoding CDATA #IMPLIED + locale CDATA #IMPLIED + object_wrapper CDATA #IMPLIED + output_encoding CDATA #IMPLIED + output_dir CDATA #IMPLIED + new_builtin_class_resolver CDATA #IMPLIED + url_escaping_charset CDATA #IMPLIED + incompatible_improvements CDATA #IMPLIED + time_zone CDATA #IMPLIED + api_builtin_enabled CDATA #IMPLIED + > +]> +<!-- +Note that for the incompatible_improvements setting you can specify a list of versions, for example: +<setting incompatible_improvements="min, 3.0.5, max" /> +--> + +<testCases> + <setting source_encoding="UTF-8" output_encoding="UTF-8" /> + + <testCase name="api-builtins" noOutput="true"> + <setting api_builtin_enabled="true" /> + </testCase> + <testCase name="arithmetic" /> + <testCase name="assignments" noOutput="true" /> + <testCase name="boolean" /> + <testCase name="charset-in-header" /> + <testCase name="comment" /> + <testCase name="comparisons" /> + <testCase name="compress" /> + <testCase name="then-builtin" noOutput="true" /> + <testCase name="dateformat-java" /> + <testCase name="dateformat-iso-like" noOutput="true" /> + <testCase name="dateformat-iso-bi" noOutput="true" /> + <testCase name="dateparsing" noOutput="true" /> + <testCase name="default"/> + <testCase name="default-object-wrapper"> + <setting api_builtin_enabled="true" /> + </testCase> + <testCase name="default-xmlns" /> + <testCase name="encoding-builtins" /> + <testCase name="escapes" /> + <testCase name="hashliteral" /> + <testCase name="identifier-non-ascii" /> + <testCase name="identifier-escaping" /> + <testCase name="import"> + <setting auto_import="import_lib.ftl as my"/> + </testCase> + <testCase name="include" /> + <testCase name="include2"> + <setting source_encoding="utf-8" /> + </testCase> + <testCase name="interpret"/> + <testCase name="iterators"/> + <testCase name="lastcharacter"/> + <testCase name="list[#endTN]-simpleTemplateModels" expected="list.txt"> + <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list[#endTN]-collectionAdapter" expected="list.txt"> + <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list2[#endTN]-simpleTemplateModels" expected="list2.txt"> + <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list2[#endTN]-collectionAdapter" expected="list2.txt"> + <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list3[#endTN]-simpleTemplateModels" expected="list3.txt"> + <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list3[#endTN]-collectionAdapter" expected="list3.txt"> + <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="list-bis" /> + <testCase name="list-bis[#endTN]-collectionAdapter" expected="list-bis.txt"> + <setting object_wrapper="DefaultObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="listhash" /> + <testCase name="listhashliteral" /> + <testCase name="listliteral" /> + <testCase name="localization" > + <setting locale="en_AU"/> + </testCase> + <testCase name="loopvariable" /> + <testCase name="macros"/> + <testCase name="macros2"/> + <testCase name="macros-return"/> + <testCase name="multimodels"/> + <testCase name="nested" /> + <testCase name="newlines1" /> + <testCase name="newlines2" /> + <testCase name="noparse" /> + <testCase name="number-format" /> + <testCase name="number-literal" > + <setting locale="fr_FR"/> + </testCase> + <testCase name="numerical-cast" /> + <testCase name="output-encoding1"/> + <testCase name="output-encoding2"> + <setting output_encoding="UTF-16"/> + </testCase> + <testCase name="output-encoding3"> + <setting output_encoding="ISO-8859-1" url_escaping_charset="UTF-16" /> + </testCase> + <testCase name="precedence"/> + <testCase name="range" noOutput="true" /> + <testCase name="recover" /> + <testCase name="root" /> + <testCase name="setting" noOutput="true" /> + <testCase name="sequence-builtins[#endTN]-with-SimpleTemplateModel" expected="sequence-builtins.txt"> + <setting object_wrapper="org.apache.freemarker.core.templatesuite.models.SimpleMapAndCollectionObjectWrapper(3.0.0)" /> + </testCase> + <testCase name="sequence-builtins[#endTN]-with-DefaultObjectWrapper" expected="sequence-builtins.txt"> + <setting object_wrapper="default"/> + </testCase> + <testCase name="sequence-builtins[#endTN]-with-DefaultObjectWrapper-collAdapters" expected="sequence-builtins.txt"> + <setting object_wrapper="DefaultObjectWrapper(3.0.0)"/> + </testCase> + <testCase name="simplehash-char-key" noOutput="true" /> + <testCase name="existence-operators" noOutput="true" /> + <testCase name="string-builtins1" /> + <testCase name="string-builtins2" /> + <testCase name="string-builtins3" noOutput="true" /> + <testCase name="string-builtins-regexps" /> + <testCase name="string-builtins-regexps-matches" /> + <testCase name="stringbimethods" /> + <testCase name="stringliteral"/> + <testCase name="if" /> + <testCase name="switch" /> + <testCase name="switch-builtin" noOutput="true" /> + <testCase name="transforms"/> + <testCase name="type-builtins" /> + <testCase name="date-type-builtins" noOutput="true" /> + <testCase name="url" noOutput="true" /> + <testCase name="var-layers"/> + <testCase name="variables"/> + <testCase name="whitespace-trim"/> + <testCase name="wstrip-in-header"/> + <testCase name="xml-fragment" /> + <testCase name="xmlns1" /> + <testCase name="xmlns2" template="xmlns1.ftl" expected="xmlns1.txt" /> + <testCase name="xmlns3" /> + <testCase name="xmlns4" /> + <testCase name="xmlns5" /> + <testCase name="xml-ns_prefix-scope" template="xml-ns_prefix-scope-main.ftl" /> + <testCase name="hashconcat"/> + <testCase name="new-defaultresolver" /> + <testCase name="new-unrestricted" template="new-defaultresolver.ftl" expected="new-defaultresolver.txt"> + <setting new_builtin_class_resolver="unrestricted"/> + </testCase> + <testCase name="new-allowsnothing" template="new-defaultresolver.ftl"> + <setting new_builtin_class_resolver="allows_nothing"/> + </testCase> + <testCase name="new-optin"> + <setting new_builtin_class_resolver=" + allowed_classes: org.apache.freemarker.core.templatesuite.models.NewTestModel, + trusted_templates: subdir/new-optin.ftl, subdir/subsub/*" + /> + </testCase> + <testCase name="specialvars"> + <setting locale="en_US" output_encoding="utf-8" url_escaping_charset="iso-8859-1"/> + </testCase> + <testCase name="number-to-date" /> + <testCase name="varargs" /> + <testCase name="boolean-formatting" /> + <testCase name="number-math-builtins" noOutput="true" /> + <testCase name="string-builtin-coercion" noOutput="true" /> + + <testCase name="overloaded-methods[#endTN]-inc-dow" noOutput="true"> + <setting object_wrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperInc"/> + </testCase> + <testCase name="overloaded-methods[#endTN]-desc-dow" noOutput="true"> + <setting object_wrapper="org.apache.freemarker.core.model.impl.DefaultObjectWrapperDesc"/> + </testCase> +</testCases> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/arithmetic.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/arithmetic.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/arithmetic.txt deleted file mode 100644 index 33a7186..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/arithmetic.txt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Arithmetic Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Perform a number assignment:</p> - - -3.234 -2.00 -0.6172500000000000000000000000000000000000 -1.620089104901 -1.6201 - -<P>Display a number with at least 3 digits after the decimal point</P> - -1234.000 - -<p>Now use numbers in assignment</p> - - -1257.77 - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean-formatting.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean-formatting.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean-formatting.txt deleted file mode 100644 index 0bab0bc..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean-formatting.txt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Y Y Y -N N N -y y y -n n n -y y y -n n n -str:n str:n -nein ja -theStringValue theStringValue - - - - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean.txt deleted file mode 100644 index 8dc1290..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/boolean.txt +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Boolean Values Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - - -<p>Now perform scalar boolean tests:</p> - -<p> - b is true.<br /> -</p> - -<p> This makes sense.<br /> -</p> - -<p> - boolean3 succeeded.<br /> -</p> - -<p> - boolean4 succeeded.<br /> -</p> - -<p> - boolean4 || boolean5 succeeded.<br /> -</p> - -<p> - boolean5 || boolean4 || boolean5 succeeded.<br /> -</p> - -<p> boolean4 && boolean5 failed.<br /> -</p> - -<p>Now test list models:</p> - -<p> - list1 succeeded.<br /> -</p> - -<p> - list2 succeeded.<br /> -</p> - -<p>Test hash models:</p> - -<p> - hash1 succeeded: Hello, world.<br /> -</p> - -<p> - hash2 succeeded.<br /> -</p> - -<p>Test not operator:</p> - -<p> - Not boolean1 succeeded -</p> - -<p> - Not boolean1 succeeded -</p> - -<p> Not boolean2 failed -</p> - -<p> Not boolean2 failed -</p> - -<p> - Message is "Hello, world!" -</p> - -<p> Message is "Hello, world!" -</p> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/charset-in-header.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/charset-in-header.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/charset-in-header.txt deleted file mode 100644 index 4532027..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/charset-in-header.txt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<head> - <meta http-equiv="Content-type" content="text/html; charset=UTF-8"> -</head> -<body> -éáÅű -õÃûà -ÅÅűŰ -</body> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comment.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comment.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comment.txt deleted file mode 100644 index d5902e3..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comment.txt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Comment Test</title> -</head> -<body> - <p>Message exists! - </p> - -a b -a b - -6 -7 -8 -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comparisons.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comparisons.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comparisons.txt deleted file mode 100644 index 8d9d372..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/comparisons.txt +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Numeric Operations Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - -<p>Start with the increment operator:</p> -<p>a1 = 0</p> -<p>a1 = 1</p> -<p>a1 = 2</p> - -<p>Now the decrement operator:</p> -<p>a2 = 5</p> -<p>a2 = 4</p> -<p>a2 = 3</p> -<p>a2 = 2</p> -<p>a2 = 1</p> -<p>a2 = 0</p> -<p>a2 = -1</p> - -<p>Now the add operator:</p> -<p>op1 = 5, op2 = 3, op3 = 8</p> -<p>op3 = 11</p> - -<p>And the subtract operator:</p> -<p>op1 = 5, op2 = 3, op3 = 2</p> -<p>op3 = -1</p> - -<p>The comparison operators:</p> - <p>Item is: 0</p> - <p>Item is less than five.</p> - <p>Item is less than or equals to seven.</p> - <p>Item is: 1</p> - <p>Item is less than five.</p> - <p>Item is less than or equals to seven.</p> - <p>Item is: 2</p> - <p>Item is less than five.</p> - <p>Item is less than or equals to seven.</p> - <p>Item is: 3</p> - <p>Item is less than five.</p> - <p>Item is less than or equals to seven.</p> - <p>Item is greater than two.</p> - <p>Item is: 4</p> - <p>Item is less than five.</p> - <p>Item is less than or equals to seven.</p> - <p>Item is greater than two.</p> - <p>Item is: 5</p> - <p>Item is less than or equals to seven.</p> - <p>Item is greater than two.</p> - <p>Item is: 6</p> - <p>Item is less than or equals to seven.</p> - <p>Item is greater than two.</p> - <p>Item is: 7</p> - <p>Item is less than or equals to seven.</p> - <p>Item is greater than two.</p> - <p>Item is: 8</p> - <p>Item is greater than two.</p> - <p>Item is: 9</p> - <p>Item is greater than two.</p> - <p>Item is: 10</p> - <p>Item is greater than two.</p> - <p>Item is greater than or equal to ten.</p> - <p>Item is: 11</p> - <p>Item is greater than two.</p> - <p>Item is greater than or equal to ten.</p> - <p>Item is: 12</p> - <p>Item is greater than two.</p> - <p>Item is greater than or equal to ten.</p> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/compress.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/compress.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/compress.txt deleted file mode 100644 index 43c7eed..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/compress.txt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Compress Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - -<p>This is the same message, using the "compress" tag:</p> -<p>Hello, world!</p> -<p>This is the same message, using the "StandardCompress" transform model:</p> -<p>Hello, world!</p> -<p>This multi-line message should be compressed to a single line.</p> - -<p>An example where the first character is not whitespace but the second character is:</p> -<p>x y</p> - -<p>The end.</p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/dateformat-java.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/dateformat-java.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/dateformat-java.txt deleted file mode 100644 index 9180262..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/dateformat-java.txt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Nov 15, 2002 2:54:13 PM -Nov 15, 2002 2:54:13 PM -Nov 15, 2002 2:54:13 PM -Nov 15, 2002 2:54:13 PM -11/15/02 2:54 PM -Nov 15, 2002 2:54:13 PM -November 15, 2002 2:54:13 PM GMT -11/15/02 2:54 PM -11/15/02 2:54:13 PM -11/15/02 2:54:13 PM GMT -Nov 15, 2002 2:54 PM -Nov 15, 2002 2:54:13 PM -Nov 15, 2002 2:54:13 PM GMT -November 15, 2002 2:54 PM -November 15, 2002 2:54:13 PM -November 15, 2002 2:54:13 PM GMT -Nov 15, 2002 -Nov 15, 2002 -11/15/02 -Nov 15, 2002 -November 15, 2002 -2:54:13 PM -2:54:13 PM -2:54 PM -2:54:13 PM -2:54:13 PM GMT -2002. november 15. 14:54:13 GMT -Fri, 15 Nov 02002 14:54:13 GMT -Fri, 15 Nov 2002 14:54:13 GMT -Fri, 15 Nov 2002 14:54:13 GMT -2002 - -2002 -2002 - -2002 -11 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-object-wrapper.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-object-wrapper.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-object-wrapper.txt deleted file mode 100644 index e015315..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-object-wrapper.txt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -array-0 -array-1 -2 -array-0 -array-1 -list-0 -list-1 -list-2 -3 -not empty -list-0 -value -objValue -foo-value -hasfoo -nobaz -bar-value-0 -foo-value -overloaded-int-1 -overloaded-String-String -Message -1974-11-14 -static-method -static-overloaded-int-1 -static-overloaded-String-String -static-final-field -static-field -ONEx -TWOx -THREEx -true -false -false -42 -1 -m - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-xmlns.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-xmlns.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-xmlns.txt deleted file mode 100644 index 3a52c46..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default-xmlns.txt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -No NS = No NS -x NS = x NS -y NS = y NS -x NS = x NS - -true - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default.txt deleted file mode 100644 index fd48463..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/default.txt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -foo - -luck - - -0 - - UNDEFINED is undefined. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/encoding-builtins.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/encoding-builtins.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/encoding-builtins.txt deleted file mode 100644 index ccfe5c8..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/encoding-builtins.txt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -FreeMarker: Encoding built-in tests - -html: [&<>"'{}\a/] -xml: [&<>"'{}\a/] -xhtml: [&<>"'{}\a/] -rtf: [&<>"'\{\}\\a/] -html: [a&a<a>a"a'a{a}a\] -xml: [a&a<a>a"a'a{a}a\] -xhtml: [a&a<a>a"a'a{a}a\] -rtf: [a&a<a>a"a'a\{a\}a\\] -html: [<<<<<] -xml: [<<<<<] -xhtml: [<<<<<] -rtf: [\{\{\{\{\{] -html: [] -xml: [] -xhtml: [] -rtf: [] -html: [a] -xml: [a] -xhtml: [a] -rtf: [a] -html: [&] -xml: [&] -xhtml: [&] -rtf: [\{] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/escapes.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/escapes.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/escapes.txt deleted file mode 100644 index c0a5440..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/escapes.txt +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -a -b -c -a -b -c -a -1 -a -b -c -<&> -&lt;&amp;&gt; -<&> ---- -<Mooo> = <Mooo> - <MOOO> = <MOOO> - <MOOO> = <MOOO> - <MOOO> = <MOOO> - <MOOO> = <MOOO> - <MOOO> = <MOOO> - <Mooo> = <Mooo> - <Mooo> = <Mooo> - <Mooo> = <Mooo> - <Mooo> = <Mooo> - <Mooo> = <Mooo> - <MOOO> = <MOOO> - red green blue ---- - <A&B>[a&b](A&B) <A&B2>[a&b2](A&B2) - <{a&b}A&B>[{a&b}a&b]({a&b}A&B) <{a&b2}A&B2>[{a&b2}a&b2]({a&b2}A&B2) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception.txt deleted file mode 100644 index 0ea4395..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception.txt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Exception Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world! <br /> -freemarker.template.TemplateModelException: Throwing from ExceptionModel! - at freemarker.test.templatesuite.models.ExceptionModel.getAsString(ExceptionModel.java:57) - at freemarker.template.compiler.Expression.getStringValue(Expression.java:65) - at freemarker.template.compiler.DollarVariable.process(DollarVariable.java:62) - at freemarker.template.compiler.NestedTemplateElements.process(NestedTemplateElements.java:76) - at freemarker.template.Template.process(Template.java:266) - at freemarker.template.Template.process(Template.java:289) - at freemarker.test.TestException.runTest(TestException.java:91) - at junit.framework.TestCase.runBare(TestCase.java:140) - at junit.framework.TestResult$1.protect(TestResult.java:106) - at junit.framework.TestResult.runProtected(TestResult.java:124) - at junit.framework.TestResult.run(TestResult.java:109) - at junit.framework.TestCase.run(TestCase.java:131) - at junit.framework.TestSuite.runTest(TestSuite.java:173) - at junit.framework.TestSuite.run(TestSuite.java:168) - at junit.swingui.TestRunner$17.run(TestRunner.java:644) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception2.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception2.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception2.txt deleted file mode 100644 index bf441d3..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception2.txt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Exception Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world! <br /> -<!-- Template Error: Couldn't get value of variable test: Couldn't read string value of test: freemarker.template.TemplateModelException: Throwing from ExceptionModel! - at freemarker.test.templatesuite.models.ExceptionModel.getAsString(ExceptionModel.java:42) - at freemarker.template.expression.Variable.getValue(Variable.java:69) - at freemarker.template.instruction.VariableInstruction.process(VariableInstruction.java:55) - at freemarker.template.compiler.TemplateArrayList.process(TemplateArrayList.java:69) - at freemarker.template.Template.process(Template.java:226) - at freemarker.test.TestException2.runTest(TestException2.java:83) - at junit.framework.TestCase.runBare(TestCase.java:140) - at junit.framework.TestResult$1.protect(TestResult.java:106) - at junit.framework.TestResult.runProtected(TestResult.java:124) - at junit.framework.TestResult.run(TestResult.java:109) - at junit.framework.TestCase.run(TestCase.java:131) - at junit.framework.TestSuite.runTest(TestSuite.java:173) - at junit.framework.TestSuite.run(TestSuite.java:168) - at junit.swingui.TestRunner$17.run(TestRunner.java:644) - --> -</p> - -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception3.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception3.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception3.txt deleted file mode 100644 index 6089e87..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exception3.txt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html><head></head><body bgcolor="#ffffff"> -Template Compilation Error: Identifier expected at line 10. -</body></html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exthash.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exthash.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exthash.txt deleted file mode 100644 index acb1f78..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/exthash.txt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Extended Hash Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - -<p>A hash set of 8 animals follows:</p> - -<p> - elephant, - - cat, - - zebra, - - dog, - - aardvark, - - kiwi, - - squirrel, - - gecko. -</p> - -<p>The first animal is an elephant, and the last is a -gecko.</p> - -<p>A hash set of 8 digits follows:<p> - -<p> - six, - - four, - - eight, - - five, - - one, - - two, - - seven, - - three. -</p> - -<p>The zebra number is eight.</p> - -<p>The end.</p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashconcat.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashconcat.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashconcat.txt deleted file mode 100644 index 9736322..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashconcat.txt +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -a: - a = 1 - b = 2 - c = 3 - X = 4 - --- - 1 - 2 - 3 - 4 - --- - -B: - d = 10 - e = 20 - f = 30 - X = 40 - --- - 10 - 20 - 30 - 40 - --- - -a + B: - a = 1 - b = 2 - c = 3 - X = 40 - d = 10 - e = 20 - f = 30 - --- - 1 - 2 - 3 - 40 - 10 - 20 - 30 - --- - -B + a: - d = 10 - e = 20 - f = 30 - X = 4 - a = 1 - b = 2 - c = 3 - --- - 10 - 20 - 30 - 4 - 1 - 2 - 3 - --- - -a + a: - a = 1 - b = 2 - c = 3 - X = 4 - --- - 1 - 2 - 3 - 4 - --- - -{} + a: - a = 1 - b = 2 - c = 3 - X = 4 - --- - 1 - 2 - 3 - 4 - --- - -a + {}: - a = 1 - b = 2 - c = 3 - X = 4 - --- - 1 - 2 - 3 - 4 - --- - -{} + {}: - --- - --- - -a + b + {} + b + {} + a: - a = 1 - b = 2 - c = 3 - X = 4 - d = 10 - e = 20 - f = 30 - --- - 1 - 2 - 3 - 4 - 10 - 20 - 30 - --- - - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashliteral.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashliteral.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashliteral.txt deleted file mode 100644 index 3af1052..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/hashliteral.txt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Hash Literal Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - -<p>Now perform a hash assignment:</p> - - -test23 -Hello, world! -hello all -1 - -<p>Now update the assignment and repeat:</p> - - -test23 -Hello, world! -hello all - -1 - -<p>Now reassign the list and repeat:</p> - - -test23 -Hello, world! - - -1 -Temporary -Temporary -Temporary - -<p>Pathological case: zero item hash:</p> - - - -<p>Hash of number literals:</p> -2 - -<p>Hash concatenation:</p> -a => 1 -b => 3 -c => 4 - -<p>Empty hash concatenation:</p> -foo, bar - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/helloworld.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/helloworld.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/helloworld.txt deleted file mode 100644 index b1072fd..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/helloworld.txt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Exec Model Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world! -</p> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-escaping.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-escaping.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-escaping.txt deleted file mode 100644 index 1c62bd5..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-escaping.txt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -<a-b>red123</a-b> - -f-a works - -dash-dash-dash etc. -dash-dash-dash etc. -propVal -propVal - -List: 123 - -Switch: OK -ESCAPED - - -as1 -as2 -as3 -as4 -as5 - -<catchAll x=1 y=2 a:b.c=5 data-foo=4 z=3 /> - ----.: = dash-dash-dash etc. -@as@_a = as1 -as/b = as3 -as'c = as4 -as"d = as5 -as-c = as2 -catchAll = ... -dumpNS = ... -f-a = ... -hash = ... -ls:a = ... -m/b2 = ... -m-a = ... -m-b2 = ... -sw-a = ... \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-non-ascii.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-non-ascii.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-non-ascii.txt deleted file mode 100644 index 8a8d04f..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/identifier-non-ascii.txt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Korean Keyboard http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/if.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/if.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/if.txt deleted file mode 100644 index 7c9d1d8..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/if.txt +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -- good -- good -- good -- good - -- good -- good - -- good -- good -- good -- good - -- good -- good -- good -- good - -- good -- good -- good -- good - -- good -- good - -- good -- good -- good -- good - -- good -- good -- good -- good - -- 1 -- -- -- is 1 -- isn't 2 -- isn't 3 -- Finally, it's: 1 -- -- 2 -- -- isn't 1 -- is 2 -- isn't 3 -- Finally, it's: 2 -- -- -- 3 -- isn't 1 -- isn't 2 -- is 3 -- Finally, it's: 3 -- -- -- -- isn't 1 -- isn't 2 -- isn't 3 -- Finally, it's: 4 - - 1: - == 1 - 1: - <= 2 - 1: - <= 3 - 2: - > 1 - 2: - == 2 - 2: - <= 3 - 3: - > 1 - 3: - > 2 - 3: - == 3 - End - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/import.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/import.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/import.txt deleted file mode 100644 index b51a4f4..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/import.txt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ --- --- - - [email protected] - Test bar. - Email: [email protected] - [email protected] - Test bar. - Email: [email protected] - Email in the root: [email protected] - [email protected] - Test bar. - Email: [email protected] - Email in the root: [email protected] - [email protected] [email protected] - -foobarfoobar \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt deleted file mode 100644 index c72d69c..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include.txt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Include Instruction Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -Hello, world! - - <p>Message exists! - -<p>Test normal includes:</p> -<p>A test of included files:</p> - - <p>Message exists!:<br /> - Hello, world!</p> - - Can you see me? - -assigning from included template -I'm here, mon! - -Kilroy - Can you see me? Kilroy - -<p>Test subdir includes:</p> -<p>This is include-subdir.ftl</p> -<p>Testing including from same directory</p> -<p>This is include-subdir2.ftl</p> -<p>Testing including from relative parent</p> -<p>A test of included files:</p> - - <p>Message exists!:<br /> - Hello, world!</p> - - Can you see me? -<p>Testing including from loader root</p> -<p>A test of included files:</p> - - <p>Message exists!:<br /> - Hello, world!</p> - - Can you see me? -<p>Testing including through acquisition</p> -<p>This is include-subdir2.ftl</p> -</body> -</html> - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt deleted file mode 100644 index b7c43a9..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/include2.txt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -A próba -A próba - -A próba -A próba -A próba -A próba - -[] -[] http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/interpret.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/interpret.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/interpret.txt deleted file mode 100644 index fe862e6..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/interpret.txt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -abcdef -abcdef -abcdef - -M \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt deleted file mode 100644 index fb44def..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/iterators.txt +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: List Iterator Test</title> -</head> -<body> - -<p>A simple test follows:</p> - -<p>Hello, world!</p> - -<p>Now iterate over a list:</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>Now iterate again:</p> - -<p>0. one</p> -<p>1. two</p> -<p>2. three</p> -<p>3. four</p> -<p>4. five</p> - -<p>Iterate over a list in a hash:</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -<p>one</p> -<p>two</p> -<p>three</p> -<p>four</p> -<p>five</p> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/lastcharacter.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/lastcharacter.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/lastcharacter.txt deleted file mode 100644 index dbe5fd0..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/lastcharacter.txt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -<html> -<head> -<title>FreeMarker: Last Character Test</title> -</head> -<body> - -<p>A simple test follows:</p> - - 13 - - ELLO, WORLD! - - message: Hello, Worl http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list-bis.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list-bis.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list-bis.txt deleted file mode 100644 index 3b9b76d..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list-bis.txt +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - 0: a [0:A, 1:B, 2:C] - 1: b [0:A, 1:B, 2:C] - 2: c [0:A, 1:B, 2:C] - - 0: a 0a/0A, 0a/1B, 0a/2C - 1: b 1b/0A, 1b/1B, 1b/2C - 2: c 2c/0A, 2c/1B, 2c/2C - -0:a, 1:b, 2:c -1. a; 2. b; 3. c; - -a, b, c -a, b, c - -A, b, c. - -true/false false/true true/false - - <td class="oddRow">a</td> - <td class="evenRow">b</td> - <td class="oddRow">c</td> - - <td class="rowOdd">a</td> - <td class="rowEven">b</td> - <td class="rowOdd">c</td> - - <td class="R">a</td> - <td class="G">b</td> - <td class="B">c</td> - <td class="R">d</td> - <td class="G">e</td> - <td class="B">f</td> - <td class="R">g</td> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list.txt deleted file mode 100644 index 05373bd..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list.txt +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Size: 4 -Items: @0 aardvark, @1 bear, @2 cat, @3 dog. - -Size: 1 -Items: @0 aardvark. - -Size: 0 -Items: - -Size: 3 -Items: @0 11, @1 22, @2 33. - -Size: 3 -Items: @0 11, @1 22, @2 33. - -Size: 3 -Items: @0 11, @1 22, @2 33. - -Size: failed -Items: @0 11, @1 22, @2 33. - -Size: 0 -Items: - -Size: 0 -Items: - -Size: 0 -Items: - -Size: failed -Items: - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list2.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list2.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list2.txt deleted file mode 100644 index cb9e6d4..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list2.txt +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -=== [aardvark, bear, cat, dog] === - --- List+sep: - aardvark, - bear, - cat, - dog --- List+else: - aardvark - bear - cat - dog --- List+items: - [ - aardvark - bear - cat - dog - ] --- List+items+else: - [ - aardvark - bear - cat - dog - ] --- List+items+sep+else: - [ - aardvark, - bear, - cat, - dog - ] --- - -=== [aardvark] === - --- List+sep: - aardvark --- List+else: - aardvark --- List+items: - [ - aardvark - ] --- List+items+else: - [ - aardvark - ] --- List+items+sep+else: - [ - aardvark - ] --- - -=== [] === - --- List+sep: --- List+else: - Empty! --- List+items: --- List+items+else: - Empty! --- List+items+sep+else: - Empty! --- - -=== [11, 22, 33] === - --- List+sep: - 11, - 22, - 33 --- List+else: - 11 - 22 - 33 --- List+items: - [ - 11 - 22 - 33 - ] --- List+items+else: - [ - 11 - 22 - 33 - ] --- List+items+sep+else: - [ - 11, - 22, - 33 - ] --- - -=== [11, 22, 33] === - --- List+sep: - 11, - 22, - 33 --- List+else: - 11 - 22 - 33 --- List+items: - [ - 11 - 22 - 33 - ] --- List+items+else: - [ - 11 - 22 - 33 - ] --- List+items+sep+else: - [ - 11, - 22, - 33 - ] --- - -=== [11, 22, 33] === - --- List+sep: - 11, - 22, - 33 --- List+else: - 11 - 22 - 33 --- List+items: - [ - 11 - 22 - 33 - ] --- List+items+else: - [ - 11 - 22 - 33 - ] --- List+items+sep+else: - [ - 11, - 22, - 33 - ] --- - -=== [] === - --- List+sep: --- List+else: - Empty! --- List+items: --- List+items+else: - Empty! --- List+items+sep+else: - Empty! --- - -=== [] === - --- List+sep: --- List+else: - Empty! --- List+items: --- List+items+else: - Empty! --- List+items+sep+else: - Empty! --- - -=== [] === - --- List+sep: --- List+else: - Empty! --- List+items: --- List+items+else: - Empty! --- List+items+sep+else: - Empty! --- - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list3.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list3.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list3.txt deleted file mode 100644 index 26fc60d..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/list3.txt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -[ - [(11@0, 11@0), (11@0, 22@1), (11@0, 33@2)], - [(22@1, 11@0), (22@1, 22@1), (22@1, 33@2)], - [(33@2, 11@0), (33@2, 22@1), (33@2, 33@2)] -] - - - <p>2 hits: - <div class="hits"> - <div class="hit">a</div> - <div class="hit">b</div> - </div> - - <p>2 hits: - <div class="hits"> - <div class="hitOther">a</div> - <div class="hitOther">b</div> - </div> - - <p>2 hits: - <div class="hits"> - ... - </div> - - <p>Nothing. - -11, 22, ... -[11, 22, ...] - -1, 2, 3 -1 /*first*/, 2, 3 -[1, 2, 3] -1 -1 -[1] -Empty -Empty -Empty - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt deleted file mode 100644 index e251238..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -Non-empty maps: - - Map: - - [ - k1 = v1 - 2 = v2 - k3 = v3 - null = v4 - Y = v5 - N = null - ] - - [ - k1 = v1; // @0=@0; odd=odd; Y=Y - 2 = v2; // @1=@1; even=even; Y=Y - k3 = v3; // @2=@2; odd=odd; Y=Y - null = v4; // @3=@3; even=even; Y=Y - Y = v5; // @4=@4; odd=odd; Y=Y - N = null // @5=@5; even=even; N=N - ] - - { - [ - k1 = v1; // @0=@0; odd=odd; Y=Y - 2 = v2; // @1=@1; even=even; Y=Y - k3 = v3; // @2=@2; odd=odd; Y=Y - null = v4; // @3=@3; even=even; Y=Y - Y = v5; // @4=@4; odd=odd; Y=Y - N = null // @5=@5; even=even; N=N - ] - } - - Map: - - [ - k1 = v1 - 2 = v2 - k3 = v3 - null = v4 - Y = v5 - N = null - ] - - [ - k1 = v1; // @0=@0; odd=odd; Y=Y - 2 = v2; // @1=@1; even=even; Y=Y - k3 = v3; // @2=@2; odd=odd; Y=Y - null = v4; // @3=@3; even=even; Y=Y - Y = v5; // @4=@4; odd=odd; Y=Y - N = null // @5=@5; even=even; N=N - ] - - { - [ - k1 = v1; // @0=@0; odd=odd; Y=Y - 2 = v2; // @1=@1; even=even; Y=Y - k3 = v3; // @2=@2; odd=odd; Y=Y - null = v4; // @3=@3; even=even; Y=Y - Y = v5; // @4=@4; odd=odd; Y=Y - N = null // @5=@5; even=even; N=N - ] - } - - Map: - - [ - k1 = 11 - k2 = 22 - ] - - [ - k1 = 11; // @0=@0; odd=odd; Y=Y - k2 = 22 // @1=@1; even=even; N=N - ] - - { - [ - k1 = 11; // @0=@0; odd=odd; Y=Y - k2 = 22 // @1=@1; even=even; N=N - ] - } - - -Empty maps: - - Map: - - [ - ] - - [ - Empty - ] - - { - Empty - } - - Map: - - [ - ] - - [ - Empty - ] - - { - Empty - } - - Map: - - [ - ] - - [ - Empty - ] - - { - Empty - } - - - a @ 0, 1 - aa = 11 @ 0 // inside a @ 0, 1 - a @ 0, 1 - -- - b @ 1, 2 - ba = 21 @ 0 // inside b @ 1, 2 - bb = 22 @ 1 // inside b @ 1, 2 - b @ 1, 2 - -- - c @ 2, 0 - c @ 2, 0 - -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4b75ea93/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt b/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt deleted file mode 100644 index 937f0ea..0000000 --- a/freemarker-core-test/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - KVPs: - a = 3 - b = 2 - - Keys: - a - b - - Values: - 3 - 2 - - KVPs: - - Keys: - - Values: -
