freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [02/51] [abbrv] [partial] incubator-freemarker git commit: Restructured project so that freemarker-test-utils depends on freemarker-core (and hence can provide common classes for testing templates, and can use utility classes defined in the core). As a c
Date Mon, 15 May 2017 21:23:18 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhash.txt
deleted file mode 100644
index e251238..0000000
--- a/freemarker-core/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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listhashliteral.txt
deleted file mode 100644
index 937f0ea..0000000
--- a/freemarker-core/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:
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listliteral.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listliteral.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listliteral.txt
deleted file mode 100644
index 2048ac5..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/listliteral.txt
+++ /dev/null
@@ -1,75 +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 Literal Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-<p>Now perform a list assignment:</p>
-
-
-The list contains 5 items.
-
-<p>test1</p>
-<p>test23</p>
-<p>test45</p>
-<p>Hello, world!</p>
-<p>hello</p>
-
-<p>Now update the assignment and repeat:</p>
-
-
-<p>test1</p>
-<p>test23</p>
-<p>test45</p>
-<p>Hello, world!</p>
-<p>hello</p>
-
-<p>Now reassign the list and repeat:</p>
-
-
-<p>bar</p>
-<p>Temporary</p>
-<p>test1</p>
-<p>test23</p>
-
-<p>Silly, but necessary tests, for one and zero element lists:</p>
-
-
-<p>Hello, world</p>
-
-<p>Zero item test:</p>
-
-
-
-<p>Dumb test for number literals -- these weren't working as expected:</p>
-
-
-<p>1</p>
-<p>2</p>
-<p>3</p>
-<p>5</p>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/localization.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/localization.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/localization.txt
deleted file mode 100644
index bd3c87d..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/localization.txt
+++ /dev/null
@@ -1,32 +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: Localization Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-<p>G'day, mate!</p>
-
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/logging.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/logging.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/logging.txt
deleted file mode 100644
index 4fa6b2a..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/logging.txt
+++ /dev/null
@@ -1,27 +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: Logging Test</title>
-</head>
-<body>
-
-A simple test follows:
-
-ERROR [org.apache.freemarker.core.Template]: message is not a TemplateHashModel, it's a freemarker.template.SimpleScalar.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/loopvariable.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/loopvariable.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/loopvariable.txt
deleted file mode 100644
index 25c20ac..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/loopvariable.txt
+++ /dev/null
@@ -1,54 +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.
- */
----
-  2
-  -     L1 1
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-  -     L1 2
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-  -     L1 3
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-*
-  1
-  -     L1 1
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-  -     L1 2
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-  -     L1 3
-  -       L2 1: 1; 2; 3; 
-  -       L2 2: 1; 2; 3; 
-*
-*
----
-  1 0.5
-  2 1
-  3 1.5
-  4 2 Last!
-123.4
----
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros-return.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros-return.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros-return.txt
deleted file mode 100644
index 5aa47ff..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros-return.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.
- */
-m{
-m{
-m{
-b{
-m:b{
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros.txt
deleted file mode 100644
index 680a08e..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros.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: Function Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-<p>Now perform function tests:</p>
-
-
-<p>Function is defined, now let's call it:</p>
-
-    <a href="/home.html">
-        <img src="/images/home.png" border="0" alt="Home">
-    </a>
-    Kilroy was here.
-
-<p>Again, but with different parameters:</p>
-
-    <a href="/about.html">
-        <img src="/image/about-us.jpeg" border="0" alt="About Us">
-    </a>
-    Kilroy was here.
-
-   Good.
-
-<p>A recursive function call:</p>
-
-
-    0
-    1
-    2
-    3
-
-<p>Test "catch-all" macro parameter:</p>
-
-
-foo=a baz=[]
-foo=a baz=[bar=b]
-foo=a baz=[bar=b, baz=c]
-
-
-Hello World! Today is Monday.
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros2.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros2.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros2.txt
deleted file mode 100644
index 1b4e007..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/macros2.txt
+++ /dev/null
@@ -1,22 +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.
- */
-1 1
-2 2
-4
-m3 with d="4" Failed!

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/multimodels.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/multimodels.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/multimodels.txt
deleted file mode 100644
index 54ec68d..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/multimodels.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: Test of Multiple Model implementations</title>
-</head>
-<body>
-
-<p>Let's begin with a simple model:</p>
-<p>Hello, world!</p>
-
-<p>Cool, now get into the first model. This implements a scalar, list, and
-hash as a single class. Let's try some tests...</p>
-
-<p>MultiModel1 as a string!</p>
-
-<p>Now as a list...</p>
-
-Model1 value: 0<br />
-Model1 value: 1<br />
-Model1 value: 2<br />
-Model1 value: 3<br />
-Model1 value: 4<br />
-Model1 value: 5<br />
-Model1 value: 6<br />
-Model1 value: 7<br />
-Model1 value: 8<br />
-Model1 value: 9<br />
-Model3 is alive!<br />
-
-<p>Index into a list...</p>
-<p>Model1 value: 1</p>
-<p>List size is: Nasty!</p>
-<p>List size is: Nasty!</p>
-
-<p>Now, again, as a hash. First using dot notation, then using [] notation:</p>
-
-<p>Selftest of a hash from MultiModel1</p>
-<p>Selftest of a hash from MultiModel1</p>
-
-<p>Now for the tricky stuff... use a model to index into another model...</p>
-<p>selftest</p>
-<p>Selftest of a hash from MultiModel1</p>
-<p>self</p>
-<p>Selftest of a hash from MultiModel1</p>
-
-<p>Same thing, this time a List index...</p>
-<p>0</p>
-<p>Model1 value: 0</p>
-<p>Model1 value: 1</p>
-
-<p>Now, do the same recursively...</p>
-<p>MultiModel1 as a string!</p>
-<p>Model2 is alive!</p>
-<p>Arguments are:<br />test<br /></p>
-<p>Arguments are:<br />MultiModel1 as a string!<br />Selftest of a hash from MultiModel1<br />Hello, world!<br /></p>
-
-<p>Does this really not work?</p>
-<p>Model3 is alive!</p>
-<p>Selftest from MultiModel3!</p>
-<p>Hello world from MultiModel3!</p>
-
-<p>(Again, with Hashes)</p>
-<p>Model3 is alive!</p>
-<p>Selftest from MultiModel3!</p>
-
-<p>Model3 is alive!</p>
-<p>Selftest from MultiModel3!</p>
-<p>Selftest from MultiModel3!</p>
-
-<p>As I suspected! (Manual on Expressions needs updating.)</p>
-
-<p>Second test on list size</p>
-<p>Key size, not the listSize method.</p>
-<p>Key size, not the listSize method.</p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/nested.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/nested.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/nested.txt
deleted file mode 100644
index bcfb104..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/nested.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.
- */
-    test 3/1: undefined undefined undefined 
-    test 3/2: undefined undefined undefined 
-    test 3/3: undefined undefined undefined 
-
-    test 3/1: Y X Count 1 
-    test 3/2: Y X Count 2 
-    test 3/3: Y X Count 3 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-allowsnothing.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-allowsnothing.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-allowsnothing.txt
deleted file mode 100644
index b8384c7..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-allowsnothing.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.
- */
-fails
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-defaultresolver.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-defaultresolver.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-defaultresolver.txt
deleted file mode 100644
index 35e7a3e..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-defaultresolver.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.
- */
-works
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-optin.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-optin.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-optin.txt
deleted file mode 100644
index 9d8e883..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/new-optin.txt
+++ /dev/null
@@ -1,32 +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.
- */
-works
-fails
-
-works
-works
-
-works
-fails
-
-works
-fails
-
-works
-works
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines1.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines1.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines1.txt
deleted file mode 100644
index bc58731..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines1.txt
+++ /dev/null
@@ -1,29 +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: Newlines Test</title>
-</head>
-<body>
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines2.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines2.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines2.txt
deleted file mode 100644
index c131421..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/newlines2.txt
+++ /dev/null
@@ -1,30 +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: Newlines the Second 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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/noparse.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/noparse.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/noparse.txt
deleted file mode 100644
index 5e8486c..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/noparse.txt
+++ /dev/null
@@ -1,54 +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: NoParse Test</title>
-</head>
-<body>
-
-A simple test follows:
-
-${message}
-
-A more rigorous test, showing that we're not faking it:
-
-${message@#$%&}
-
-	<p>Message exists!
-		...and even generates output!
-		<#if message>
-			Nested statements are ok, too.
-		</#if>
-	</p>
-
-Here's another edge case, this time, trying to output a &lt;noparse&gt;
-inside another &lt;noparse&gt;
-
-
-This is what the noparse instruction looks like:
-
-<#noparse>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.</#noparse>
-
-The rest of the template appears here.
-
-Simple.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-format.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-format.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-format.txt
deleted file mode 100644
index a6f8475..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-format.txt
+++ /dev/null
@@ -1,33 +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.
- */
-1
-1
-1 234 567,89
-1234567.886
-1,00
-1
-1234567,89
-1234567.886
-1
-1
-1.000000000000001
-0.0000000000000001
--0.0000000000000001
-1
-0.0000000000000001

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-literal.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-literal.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-literal.txt
deleted file mode 100644
index b80bc85..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-literal.txt
+++ /dev/null
@@ -1,79 +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: Number Literal Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-<p>Now perform a number assignment:</p>
-
-1,3
-
-
-My number is: 1,8
-My float is: 1.800000
-The int part is: 1
-
-
-1.83
-
-<p>Now use numbers in assignment</p>
-
-6
-
-8
-
-<p>Try numbers in tests</p>
-
-MyMessage is not 152, its: 8.
-
-<if (mymessage > 5)>
-   MyMessage is greater than five.
-</if
-
-		MyMessage is: 8.
-
-<p>Now for numbers in dynamic keys:</p>
-
-
-one
-three
-
-<p>Numbers in hashes:</p>
-
-twelve
-twelve
-twelve
-
-
-<p>Numbers in method calls:</p>
-
-Single argument value is: 1
-Single argument value is: 1
-Single argument value is: 12
-Single argument value is: 3
-Single argument value is: 3
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-to-date.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-to-date.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-to-date.txt
deleted file mode 100644
index bc8a10e..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/number-to-date.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.
- */
-2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
-2011-05-16 == 2011-05-16
-19:47:55.54Z == 19:47:55.54Z
-
-2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
-2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
-2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
-2011-05-16T19:47:55.54Z == 2011-05-16T19:47:55.54Z
-1970-01-01T00:00:01Z == 1970-01-01T00:00:01Z
-1970-01-01T00:00:01Z == 1970-01-01T00:00:01Z
-1970-01-01T00:00:00Z == 1970-01-01T00:00:00Z
-
-failed

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/numerical-cast.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/numerical-cast.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/numerical-cast.txt
deleted file mode 100644
index 3bf6cd0..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/numerical-cast.txt
+++ /dev/null
@@ -1,462 +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.
- */
-
-?int:
-    0?int=0
-    1?int=1
-    -1?int=-1
-    0.5?int=0
-    1.5?int=1
-    -0.5?int=0
-    -1.5?int=-1
-    0.25?int=0
-    -0.25?int=0
-    1.75?int=1
-    -1.75?int=-1
-    1.01?int=1
-    -1.01?int=-1
-    0.01?int=0
-    -0.01?int=0
-    127?int=127
-    128?int=128
-    -127?int=-127
-    -128?int=-128
-    32767?int=32767
-    32768?int=32768
-    -32767?int=-32767
-    -32768?int=-32768
-    2147483647?int=2147483647
-    2147483648?int=-2147483648
-    -2147483647?int=-2147483647
-    -2147483648?int=-2147483648
-    4294967295?int=-1
-    4294967296?int=0
-    -4294967295?int=1
-    -4294967296?int=0
-    2147483647.1?int=2147483647
-    2147483648.1?int=-2147483648
-    -2147483647.1?int=-2147483647
-    -2147483648.1?int=-2147483648
-    4294967295.1?int=-1
-    4294967296.1?int=0
-    -4294967295.1?int=1
-    -4294967296.1?int=0
-    2147483647.5?int=2147483647
-    2147483648.5?int=-2147483648
-    -2147483647.5?int=-2147483647
-    -2147483648.5?int=-2147483648
-    4294967295.5?int=-1
-    4294967296.5?int=0
-    -4294967295.5?int=1
-    -4294967296.5?int=0
-
-?double
-    0?double=0
-    1?double=1
-    -1?double=-1
-    0.5?double=0.5
-    1.5?double=1.5
-    -0.5?double=-0.5
-    -1.5?double=-1.5
-    0.25?double=0.25
-    -0.25?double=-0.25
-    1.75?double=1.75
-    -1.75?double=-1.75
-    1.01?double=1.01
-    -1.01?double=-1.01
-    0.01?double=0.01
-    -0.01?double=-0.01
-    127?double=127
-    128?double=128
-    -127?double=-127
-    -128?double=-128
-    32767?double=32767
-    32768?double=32768
-    -32767?double=-32767
-    -32768?double=-32768
-    2147483647?double=2147483647
-    2147483648?double=2147483648
-    -2147483647?double=-2147483647
-    -2147483648?double=-2147483648
-    4294967295?double=4294967295
-    4294967296?double=4294967296
-    -4294967295?double=-4294967295
-    -4294967296?double=-4294967296
-    2147483647.1?double=2147483647.1
-    2147483648.1?double=2147483648.1
-    -2147483647.1?double=-2147483647.1
-    -2147483648.1?double=-2147483648.1
-    4294967295.1?double=4294967295.1
-    4294967296.1?double=4294967296.1
-    -4294967295.1?double=-4294967295.1
-    -4294967296.1?double=-4294967296.1
-    2147483647.5?double=2147483647.5
-    2147483648.5?double=2147483648.5
-    -2147483647.5?double=-2147483647.5
-    -2147483648.5?double=-2147483648.5
-    4294967295.5?double=4294967295.5
-    4294967296.5?double=4294967296.5
-    -4294967295.5?double=-4294967295.5
-    -4294967296.5?double=-4294967296.5
-
-?long
-    0?long=0
-    1?long=1
-    -1?long=-1
-    0.5?long=0
-    1.5?long=1
-    -0.5?long=0
-    -1.5?long=-1
-    0.25?long=0
-    -0.25?long=0
-    1.75?long=1
-    -1.75?long=-1
-    1.01?long=1
-    -1.01?long=-1
-    0.01?long=0
-    -0.01?long=0
-    127?long=127
-    128?long=128
-    -127?long=-127
-    -128?long=-128
-    32767?long=32767
-    32768?long=32768
-    -32767?long=-32767
-    -32768?long=-32768
-    2147483647?long=2147483647
-    2147483648?long=2147483648
-    -2147483647?long=-2147483647
-    -2147483648?long=-2147483648
-    4294967295?long=4294967295
-    4294967296?long=4294967296
-    -4294967295?long=-4294967295
-    -4294967296?long=-4294967296
-    2147483647.1?long=2147483647
-    2147483648.1?long=2147483648
-    -2147483647.1?long=-2147483647
-    -2147483648.1?long=-2147483648
-    4294967295.1?long=4294967295
-    4294967296.1?long=4294967296
-    -4294967295.1?long=-4294967295
-    -4294967296.1?long=-4294967296
-    2147483647.5?long=2147483647
-    2147483648.5?long=2147483648
-    -2147483647.5?long=-2147483647
-    -2147483648.5?long=-2147483648
-    4294967295.5?long=4294967295
-    4294967296.5?long=4294967296
-    -4294967295.5?long=-4294967295
-    -4294967296.5?long=-4294967296
-
-?long from date
-    1304877615000 = 1304877615000
-
-?float
-    0?float=0
-    1?float=1
-    -1?float=-1
-    0.5?float=0.5
-    1.5?float=1.5
-    -0.5?float=-0.5
-    -1.5?float=-1.5
-    0.25?float=0.25
-    -0.25?float=-0.25
-    1.75?float=1.75
-    -1.75?float=-1.75
-    1.01?float=1.00999999
-    -1.01?float=-1.00999999
-    0.01?float=0.01
-    -0.01?float=-0.01
-    127?float=127
-    128?float=128
-    -127?float=-127
-    -128?float=-128
-    32767?float=32767
-    32768?float=32768
-    -32767?float=-32767
-    -32768?float=-32768
-    2147483647?float=2147483648
-    2147483648?float=2147483648
-    -2147483647?float=-2147483648
-    -2147483648?float=-2147483648
-    4294967295?float=4294967296
-    4294967296?float=4294967296
-    -4294967295?float=-4294967296
-    -4294967296?float=-4294967296
-    2147483647.1?float=2147483648
-    2147483648.1?float=2147483648
-    -2147483647.1?float=-2147483648
-    -2147483648.1?float=-2147483648
-    4294967295.1?float=4294967296
-    4294967296.1?float=4294967296
-    -4294967295.1?float=-4294967296
-    -4294967296.1?float=-4294967296
-    2147483647.5?float=2147483648
-    2147483648.5?float=2147483648
-    -2147483647.5?float=-2147483648
-    -2147483648.5?float=-2147483648
-    4294967295.5?float=4294967296
-    4294967296.5?float=4294967296
-    -4294967295.5?float=-4294967296
-    -4294967296.5?float=-4294967296
-
-?byte
-    0?byte=0
-    1?byte=1
-    -1?byte=-1
-    0.5?byte=0
-    1.5?byte=1
-    -0.5?byte=0
-    -1.5?byte=-1
-    0.25?byte=0
-    -0.25?byte=0
-    1.75?byte=1
-    -1.75?byte=-1
-    1.01?byte=1
-    -1.01?byte=-1
-    0.01?byte=0
-    -0.01?byte=0
-    127?byte=127
-    128?byte=-128
-    -127?byte=-127
-    -128?byte=-128
-    32767?byte=-1
-    32768?byte=0
-    -32767?byte=1
-    -32768?byte=0
-    2147483647?byte=-1
-    2147483648?byte=0
-    -2147483647?byte=1
-    -2147483648?byte=0
-    4294967295?byte=-1
-    4294967296?byte=0
-    -4294967295?byte=1
-    -4294967296?byte=0
-    2147483647.1?byte=-1
-    2147483648.1?byte=0
-    -2147483647.1?byte=1
-    -2147483648.1?byte=0
-    4294967295.1?byte=-1
-    4294967296.1?byte=0
-    -4294967295.1?byte=1
-    -4294967296.1?byte=0
-    2147483647.5?byte=-1
-    2147483648.5?byte=0
-    -2147483647.5?byte=1
-    -2147483648.5?byte=0
-    4294967295.5?byte=-1
-    4294967296.5?byte=0
-    -4294967295.5?byte=1
-    -4294967296.5?byte=0
-
-?short
-    0?short=0
-    1?short=1
-    -1?short=-1
-    0.5?short=0
-    1.5?short=1
-    -0.5?short=0
-    -1.5?short=-1
-    0.25?short=0
-    -0.25?short=0
-    1.75?short=1
-    -1.75?short=-1
-    1.01?short=1
-    -1.01?short=-1
-    0.01?short=0
-    -0.01?short=0
-    127?short=127
-    128?short=128
-    -127?short=-127
-    -128?short=-128
-    32767?short=32767
-    32768?short=-32768
-    -32767?short=-32767
-    -32768?short=-32768
-    2147483647?short=-1
-    2147483648?short=0
-    -2147483647?short=1
-    -2147483648?short=0
-    4294967295?short=-1
-    4294967296?short=0
-    -4294967295?short=1
-    -4294967296?short=0
-    2147483647.1?short=-1
-    2147483648.1?short=0
-    -2147483647.1?short=1
-    -2147483648.1?short=0
-    4294967295.1?short=-1
-    4294967296.1?short=0
-    -4294967295.1?short=1
-    -4294967296.1?short=0
-    2147483647.5?short=-1
-    2147483648.5?short=0
-    -2147483647.5?short=1
-    -2147483648.5?short=0
-    4294967295.5?short=-1
-    4294967296.5?short=0
-    -4294967295.5?short=1
-    -4294967296.5?short=0
-
-?floor
-    0?floor=0
-    1?floor=1
-    -1?floor=-1
-    0.5?floor=0
-    1.5?floor=1
-    -0.5?floor=-1
-    -1.5?floor=-2
-    0.25?floor=0
-    -0.25?floor=-1
-    1.75?floor=1
-    -1.75?floor=-2
-    1.01?floor=1
-    -1.01?floor=-2
-    0.01?floor=0
-    -0.01?floor=-1
-    127?floor=127
-    128?floor=128
-    -127?floor=-127
-    -128?floor=-128
-    32767?floor=32767
-    32768?floor=32768
-    -32767?floor=-32767
-    -32768?floor=-32768
-    2147483647?floor=2147483647
-    2147483648?floor=2147483648
-    -2147483647?floor=-2147483647
-    -2147483648?floor=-2147483648
-    4294967295?floor=4294967295
-    4294967296?floor=4294967296
-    -4294967295?floor=-4294967295
-    -4294967296?floor=-4294967296
-    2147483647.1?floor=2147483647
-    2147483648.1?floor=2147483648
-    -2147483647.1?floor=-2147483648
-    -2147483648.1?floor=-2147483649
-    4294967295.1?floor=4294967295
-    4294967296.1?floor=4294967296
-    -4294967295.1?floor=-4294967296
-    -4294967296.1?floor=-4294967297
-    2147483647.5?floor=2147483647
-    2147483648.5?floor=2147483648
-    -2147483647.5?floor=-2147483648
-    -2147483648.5?floor=-2147483649
-    4294967295.5?floor=4294967295
-    4294967296.5?floor=4294967296
-    -4294967295.5?floor=-4294967296
-    -4294967296.5?floor=-4294967297
-
-?ceiling
-    0?ceiling=0
-    1?ceiling=1
-    -1?ceiling=-1
-    0.5?ceiling=1
-    1.5?ceiling=2
-    -0.5?ceiling=0
-    -1.5?ceiling=-1
-    0.25?ceiling=1
-    -0.25?ceiling=0
-    1.75?ceiling=2
-    -1.75?ceiling=-1
-    1.01?ceiling=2
-    -1.01?ceiling=-1
-    0.01?ceiling=1
-    -0.01?ceiling=0
-    127?ceiling=127
-    128?ceiling=128
-    -127?ceiling=-127
-    -128?ceiling=-128
-    32767?ceiling=32767
-    32768?ceiling=32768
-    -32767?ceiling=-32767
-    -32768?ceiling=-32768
-    2147483647?ceiling=2147483647
-    2147483648?ceiling=2147483648
-    -2147483647?ceiling=-2147483647
-    -2147483648?ceiling=-2147483648
-    4294967295?ceiling=4294967295
-    4294967296?ceiling=4294967296
-    -4294967295?ceiling=-4294967295
-    -4294967296?ceiling=-4294967296
-    2147483647.1?ceiling=2147483648
-    2147483648.1?ceiling=2147483649
-    -2147483647.1?ceiling=-2147483647
-    -2147483648.1?ceiling=-2147483648
-    4294967295.1?ceiling=4294967296
-    4294967296.1?ceiling=4294967297
-    -4294967295.1?ceiling=-4294967295
-    -4294967296.1?ceiling=-4294967296
-    2147483647.5?ceiling=2147483648
-    2147483648.5?ceiling=2147483649
-    -2147483647.5?ceiling=-2147483647
-    -2147483648.5?ceiling=-2147483648
-    4294967295.5?ceiling=4294967296
-    4294967296.5?ceiling=4294967297
-    -4294967295.5?ceiling=-4294967295
-    -4294967296.5?ceiling=-4294967296
-
-?round
-    0?round=0
-    1?round=1
-    -1?round=-1
-    0.5?round=1
-    1.5?round=2
-    -0.5?round=0
-    -1.5?round=-1
-    0.25?round=0
-    -0.25?round=0
-    1.75?round=2
-    -1.75?round=-2
-    1.01?round=1
-    -1.01?round=-1
-    0.01?round=0
-    -0.01?round=0
-    127?round=127
-    128?round=128
-    -127?round=-127
-    -128?round=-128
-    32767?round=32767
-    32768?round=32768
-    -32767?round=-32767
-    -32768?round=-32768
-    2147483647?round=2147483647
-    2147483648?round=2147483648
-    -2147483647?round=-2147483647
-    -2147483648?round=-2147483648
-    4294967295?round=4294967295
-    4294967296?round=4294967296
-    -4294967295?round=-4294967295
-    -4294967296?round=-4294967296
-    2147483647.1?round=2147483647
-    2147483648.1?round=2147483648
-    -2147483647.1?round=-2147483647
-    -2147483648.1?round=-2147483648
-    4294967295.1?round=4294967295
-    4294967296.1?round=4294967296
-    -4294967295.1?round=-4294967295
-    -4294967296.1?round=-4294967296
-    2147483647.5?round=2147483648
-    2147483648.5?round=2147483649
-    -2147483647.5?round=-2147483647
-    -2147483648.5?round=-2147483648
-    4294967295.5?round=4294967296
-    4294967296.5?round=4294967297
-    -4294967295.5?round=-4294967295
-    -4294967296.5?round=-4294967296

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding1.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding1.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding1.txt
deleted file mode 100644
index 3b5215a..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding1.txt
+++ /dev/null
@@ -1,27 +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.
- */
-Output charset: UTF-8
-URL escaping charset: undefined
-
-a%FE%FF%00%2F%00%25b
-a%FE%FF%00%2F%00%25b
-a%2F%25b
-a%2F%25b
-a%FE%FF%00%2F%00%25b
-a%2F%25b
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding2.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding2.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding2.txt
deleted file mode 100644
index 6956b6c..0000000
Binary files a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding2.txt and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding3.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding3.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding3.txt
deleted file mode 100644
index c0369f6..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/output-encoding3.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.
- */
-Output charset: ISO-8859-1
-URL escaping charset: UTF-16
-
-UTF-16: a%FE%FF%00%2F%00%25b
-ISO-8859-1: a%2F%25b
-UTF-16: a%FE%FF%00%2F%00%25b
-ISO-8859-1: a%2F%25b
-ISO-8859-1: a%2F%25b
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/precedence.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/precedence.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/precedence.txt
deleted file mode 100644
index b19cb31..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/precedence.txt
+++ /dev/null
@@ -1,48 +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: Operator Precedence Test</title>
-</head>
-<body>
-
-@@@@@@@@@@@
-
-<br />
-<br />
-
-##########
-
-<br />
-<br />
-
-&&&&&&&&&&&
-
-<br />
-<br />
-
-!!!!!!!!!!!
-
-<br />
-<br />
-
-$$$$$$$$$$$
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/recover.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/recover.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/recover.txt
deleted file mode 100644
index 880cea3..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/recover.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.
- */
- Hello, World
- Well, that did not work.
- Now we nest another attempt/recover here:
-   Oops...
-   Remember, freeMarker sequences are zero-based! Hello, World
- Now we check the current error message.
-  The template is not currently available
-  The included template had a problem.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/root.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/root.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/root.txt
deleted file mode 100644
index 041222c..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/root.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.
- */
-<html>
-<head>
-<title>FreeMarker: Root Lookup Test</title>
-</head>
-<body>
-
-<p>A simple test follows:</p>
-
-<p>Hello, world!</p>
-
-<p>Access the same variable via the root variable (dot syntax):</p>
-
-<p>Hello, world!</p>
-
-<p>Access the same variable via the root variable (bracket syntax):</p>
-
-<p>Hello, world!</p>
-
-<p>Ensure that root lookups are unaffected by local variables:</p>
-
-
-  Hello, world!
-  Hello, world! Part Deux
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/sequence-builtins.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/sequence-builtins.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/sequence-builtins.txt
deleted file mode 100644
index 4f7796a..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/sequence-builtins.txt
+++ /dev/null
@@ -1,404 +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.
- */
-Sorting scalars:
-----------------
-
-String order:
-- aardvark
-- Barbara
-- beetroot
-- whale
-- zeppelin
-
-First: aardvark
-Last: zeppelin
-Size 5
-
-Numerical order:
-- -324
-- -34
-- 0
-- 0.1
-- 0.11
-- 1
-- 5
-- 111
-- 123
-- 543
-
-First: -324
-Last: 543
-Size 10
-
-Date/time order:
-- 06:05
-- 08:05
-- 08:15
-- 18:00
-
-Boolean order:
-- false
-- false
-- true
-- true
-
-
-Sorting hashes:
----------------
-
-Order by name:
-- aardvark: 30
-- Barbara: 53
-- beetroot: 0.3
-- whale: 2000
-- zeppelin: -200
-
-Order by weight:
-- zeppelin: -200
-- beetroot: 0.3
-- aardvark: 30
-- Barbara: 53
-- whale: 2000
-
-Order by a.x.v:
-- aqweqw
-- dfgdf
-- qweqw
-- utyu
-
-Order by a.y, which is a date:
-- 1998-02-20
-- 1999-01-20
-- 1999-04-19
-- 1999-04-20
-
-Reverse:
---------
-
-Order by weight desc:
-- whale: 2000
-- Barbara: 53
-- aardvark: 30
-- beetroot: 0.3
-- zeppelin: -200
-
-Order by weight desc desc:
-- zeppelin: -200
-- beetroot: 0.3
-- aardvark: 30
-- Barbara: 53
-- whale: 2000
-
-Order by weight desc desc desc:
-- whale: 2000
-- Barbara: 53
-- aardvark: 30
-- beetroot: 0.3
-- zeppelin: -200
-
-Contains:
----------
-
-True:
-true
-true
-true
-true
-true
-true
-true
-
-False:
-false
-false
-false
-false
-false
-false
-false
-
-False: false
-
-Index_of:
----------
-
-0 = 0
-1 = 1
-2 = 2
-6 = 6
-0 = 0
-1 = 1
-2 = 2
-
--1 = -1
--1 = -1
--1 = -1
--1 = -1
--1 = -1
--1 = -1
--1 = -1
-
--1 = -1
-
-Last_index_of:
---------------
-
-6 = 6
-1 = 1
-2 = 2
-7 = 7
--1 = -1
-0 = 0
-1 = 1
-2 = 2
--1 = -1
-
-Index_of and last_index_of with starting indices
-------------------------------------------------
-
-seq_index_of "Joe":
-0 = 0
-0 = 0
-0 = 0
-2 = 2
-2 = 2
--1 = -1
--1 = -1
- 
-seq_last_index_of "Joe":
--1 = -1
--1 = -1
-0 = 0
-0 = 0
-2 = 2
-2 = 2
-2 = 2
- 
-seq_index_of "Susan":
-3 = 3
-3 = 3
-3 = 3
-3 = 3
-3 = 3
-3 = 3
--1 = -1
- 
-seq_last_index_of "Susan":
--1 = -1
--1 = -1
--1 = -1
--1 = -1
--1 = -1
-3 = 3
-3 = 3
-
-seq_index_of "a":
-0 = 0
-0 = 0
-0 = 0
--1 = -1
--1 = -1
--1 = -1
--1 = -1
-
-seq_index_of "b":
-1 = 1
-1 = 1
-1 = 1
-1 = 1
--1 = -1
--1 = -1
-
-seq_index_of "c":
-2 = 2
-2 = 2
-2 = 2
-2 = 2
-2 = 2
--1 = -1
- 
-seq_last_index_of "a":
--1 = -1
--1 = -1
-0 = 0
-0 = 0
-0 = 0
-0 = 0
-0 = 0
-
-seq_last_index_of "b":
--1 = -1
--1 = -1
--1 = -1
-1 = 1
-1 = 1
-1 = 1
-
-seq_last_index_of "c":
--1 = -1
--1 = -1
--1 = -1
--1 = -1
-2 = 2
-2 = 2
-
-Sequence builtins ignoring nulls
---------------------------------
-
-true = true
-2 = 2
-0 = 0
-
-These should throw exception, but for BC they don't:
-false = false
--1 = -1
--1 = -1
-
-Sequence built-ins failing on date-type mismatch
-------------------------------------------------
-
-
-Chunk
------
-
-columns = 1, fill = NULL:
-  Rows: 7
-    a   <-- Columns: 1
-    b   <-- Columns: 1
-    c   <-- Columns: 1
-    d   <-- Columns: 1
-    e   <-- Columns: 1
-    f   <-- Columns: 1
-    g   <-- Columns: 1
-  
-columns = 2, fill = NULL:
-  Rows: 4
-    a b   <-- Columns: 2
-    c d   <-- Columns: 2
-    e f   <-- Columns: 2
-    g   <-- Columns: 1
-  
-columns = 3, fill = NULL:
-  Rows: 3
-    a b c   <-- Columns: 3
-    d e f   <-- Columns: 3
-    g   <-- Columns: 1
-  
-columns = 4, fill = NULL:
-  Rows: 2
-    a b c d   <-- Columns: 4
-    e f g   <-- Columns: 3
-  
-columns = 5, fill = NULL:
-  Rows: 2
-    a b c d e   <-- Columns: 5
-    f g   <-- Columns: 2
-  
-columns = 10, fill = NULL:
-  Rows: 1
-    a b c d e f g   <-- Columns: 7
-  
-columns = 1, fill = -:
-  Rows: 7
-    a   <-- Columns: 1
-    b   <-- Columns: 1
-    c   <-- Columns: 1
-    d   <-- Columns: 1
-    e   <-- Columns: 1
-    f   <-- Columns: 1
-    g   <-- Columns: 1
-  
-columns = 2, fill = -:
-  Rows: 4
-    a b   <-- Columns: 2
-    c d   <-- Columns: 2
-    e f   <-- Columns: 2
-    g -   <-- Columns: 2
-  
-columns = 3, fill = -:
-  Rows: 3
-    a b c   <-- Columns: 3
-    d e f   <-- Columns: 3
-    g - -   <-- Columns: 3
-  
-columns = 4, fill = -:
-  Rows: 2
-    a b c d   <-- Columns: 4
-    e f g -   <-- Columns: 4
-  
-columns = 5, fill = -:
-  Rows: 2
-    a b c d e   <-- Columns: 5
-    f g - - -   <-- Columns: 5
-  
-columns = 10, fill = -:
-  Rows: 1
-    a b c d e f g - - -   <-- Columns: 10
-  
-columns = 3, fill = NULL:
-  Rows: 3
-    1 2 3   <-- Columns: 3
-    4 5 6   <-- Columns: 3
-    7 8 9   <-- Columns: 3
-  
-columns = 3, fill = -:
-  Rows: 3
-    1 2 3   <-- Columns: 3
-    4 5 6   <-- Columns: 3
-    7 8 9   <-- Columns: 3
-  
-columns = 3, fill = NULL:
-  Rows: 1
-    1   <-- Columns: 1
-  
-columns = 3, fill = -:
-  Rows: 1
-    1 - -   <-- Columns: 3
-  
-columns = 3, fill = NULL:
-  Rows: 0
-  
-columns = 3, fill = -:
-  Rows: 0
-  
-
-
-
-Join
-----
-
-- 1, two, three, 4
-- 
-- 1, two, three, 4.
-- (empty)
-- a, c
-- a, c
-- a, c.
-- 
-- (empty)
-- (empty)
-- a, b, c.
-- a, b, c.
-
-
-Misc
-----
-
-First of set 1: a
-First of set 2: a
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/specialvars.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/specialvars.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/specialvars.txt
deleted file mode 100644
index e2fa13e..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/specialvars.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.
- */
-en == en
-en_US == en_US
-utf-8 == utf-8
-specialvars.ftl == specialvars.ftl
-iso-8859-1 == iso-8859-1
-x == x
-true == true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
deleted file mode 100644
index ba14e7f..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps-matches.txt
+++ /dev/null
@@ -1,99 +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.
- */
-
-List mode:
-Size: 4
-[L16][L27][L38][L49]
-[L16][L27][L38][L49]
-
-Iterator mode:
-[L16][L27][L38][L49]
-[L16(L16, L27, L38, L49)][L27(L16, L27, L38, L49)][L38(L16, L27, L38, L49)][L49(L16, L27, L38, L49)]
-[L16][L27][L38][L49]
-
-Iterator mode changes to list mode:
-[L16]/4[L27]/4[L38]/4[L49]/4
-[L16][L27][L38][L49]
-
-Iterator mode changes to list mode 2:
-[L16][L27][L38][L49]
-[L16]/4[L27]/4[L38]/4[L49]/4
-
-List mode with embedded iteration:
-[L16(L16, L27, L38, L49)][L27(L16, L27, L38, L49)][L38(L16, L27, L38, L49)][L49(L16, L27, L38, L49)]
-
-Entire input match:
-- M: L16
-    - G: L16
-    - G: 1
-    - G: 6
-- M: L27
-    - G: L27
-    - G: 2
-    - G: 7
-- M: L38
-    - G: L38
-    - G: 3
-    - G: 8
-- M: L49
-    - G: L49
-    - G: 4
-    - G: 9
-firstGS was: L16, 1, 6
-
-Entire input match 2:
-Matches: true
-- G: x12
-- G: 1
-- G: 2
-As list:
-- M: x12
-    - G: x12
-    - G: 1
-    - G: 2
-Groups again:
-- G: x12
-- G: 1
-- G: 2
-
-Entire input match 3:
-Matches: false
-
-Entire input match 4:
-Matches: true
-- G: x12
-- G: 1
-- G: 2
-
-Substring match nested into entire input match:
-- G: x12 ([x12{x12, 1, 2}])
-- G: 1 ([x12{x12, 1, 2}])
-- G: 2 ([x12{x12, 1, 2}])
-
-Different entire input and substring matches:
-123, 123
-- M: 1 (Gs: 1, 1)
-- M: 2 (Gs: 2, 2)
-- M: 3 (Gs: 3, 3)
-
-Different entire input and substring matches 2:
-123
-- M: 1 (Gs: 1)
-- M: 2 (Gs: 2)
-- M: 3 (Gs: 3)

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
deleted file mode 100644
index c54dc96..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins-regexps.txt
+++ /dev/null
@@ -1,112 +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.
- */
-true == true
-true == true
-
-false == false
-true == true
-
-false == false
-true == true
-
-false == false
-true == true
-
-false == false
-false == false
-false == false
-true == true
-true == true
-true == true
-
-false == false
-false == false
-true == true
-true == true
-true == true
-true == true
-
-
-Lower 'c'-words:
-- coverage
-- considered
-
-Any 'c'-words:
-- Code
-- coverage
-- considered
-
-Lower line-last words:
-- coverage
-
-Any line-last words:
-- coverage
-- BROKEN
-
-Any last words:
-- BROKEN
-
-c-word with follower:
-- "Code without"
-  Groups: "Code without", "Code", "without"
-- "coverage\nis"
-  Groups: "coverage\nis", "coverage", "is"
-- "considered to"
-  Groups: "considered to", "considered", "to"
-
-c-word with follower in the same line:
-- Code without
-- considered to
-
-Lower c-word with follower in the same line:
-- considered to
-
-  Ignored but logged in 2.3: False == False
-  Ignored but logged in 2.3: False == False
-
-FOObar == FOObar
-Foobar == Foobar
-FOObar == FOObar
-FOObarFOO == FOObarFOO
-FOObarfOO == FOObarfOO
-FOObarfOO == FOObarfOO
-Foobar == Foobar
-FOObar == FOObar
-FOObarFOO == FOObarFOO
-FOObarfOO == FOObarfOO
-FOObarfOO == FOObarfOO
-foobar == foobar
-foobar == foobar
-FOObar == FOObar
-FOObarFOO == FOObarFOO
-FOObarfOo == FOObarfOo
-FAlse == FAlse
-FAlse == FAlse
-
-  Ignored but logged in 2.3: FOObar
-
-[foo, barxbaaz] == [foo, barxbaaz]
-[foo, barxbaaz] == [foo, barxbaaz]
-[foo, bar, baaz] == [foo, bar, baaz]
-[foo, barxbaaz] == [foo, barxbaaz]
-[foo, bar, baaz] == [foo, bar, baaz]
-[fooXXbarxxbaaz] == [fooXXbarxxbaaz]
-[foo, bar, baaz] == [foo, bar, baaz]
-[F, ls] == [F, ls]
-[Fals, ] == [Fals, ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins1.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins1.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins1.txt
deleted file mode 100644
index 6e689ac..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins1.txt
+++ /dev/null
@@ -1,112 +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 string built-in tests
-
-  
-cap_first:    DieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case}  
-uncap_first:  dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case}  
-uncap_first:blah
-capitalize:   Diebugsdie! * Vazzze 123456 --cdc-- --<<--@ X ${"kigyo"?upper_case}  
-html:         dieBugsDie! * vazzZE 123456 --cdc-- --&lt;&lt;--@ x ${&quot;kigyo&quot;?upper_case}  
-length:     71
-lower_case:   diebugsdie! * vazzze 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case}  
-rtf:          dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x $\{"kigyo"?upper_case\}  
-trim:       dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x ${"kigyo"?upper_case}
-trim2:      foo bar
-trim3:      foo bar
-trim4:      foo bar
-upper_case:   DIEBUGSDIE! * VAZZZE 123456 --CDC-- --<<--@ X ${"KIGYO"?UPPER_CASE}  
-xml:          dieBugsDie! * vazzZE 123456 --cdc-- --&lt;&lt;--@ x ${&quot;kigyo&quot;?upper_case}  
-xhtml:      &quot;Blah&#39;s is &gt; 1 &amp; &lt; 2&quot;
-
-word_list:
-- dieBugsDie!
-- *
-- vazzZE
-- 123456
-- --cdc--
-- --<<--@
-- x
-- ${"kigyo"?upper_case}
-
-interpret:   dieBugsDie! * vazzZE 123456 --cdc-- --<<--@ x KIGYO  
-number: -122,35
-1500
-5
-0
-0
-true
-true
-true
-true
-true
-
-default constructor
-1
-xxx
-xxx:yyy
-
-
-In The Sacred, Holy beginning, God created The Sacred, Holy Heavens and The Sacred, Holy Earth. 
-In the very beginning, God created the Heavens and The Earth. 
-|I|n| |t|h|e| |b|e|g|i|n|n|i|n|g|,| |G|o|d| |c|r|e|a|t|e|d| |t|h|e| |H|e|a|v|e|n|s| |a|n|d| |T|h|e| |E|a|r|t|h|.| 
-|In the beginning, God created the Heavens and The Earth. 
-
-In the beginning, God created the sky and The Earth. 
-
-matches
-
-  the beginning
-  the sacred beginning
-  the Heavens
-  the sacred Heavens
-  The Earth
-  The sacred Earth
-
-In the beginning, God created the Heavens and The Earth.
-beginning
-the Heavens and The Earth.
-
-   foo
-   bar
-   baz
-       foobar
-
-
-FOOBAR
-
-[a] = [a]
-[a\\'x'\nb] = [a\\'x'\nb]
-[\u0001\u001a ] = [\u0001\u001a ]
-
-[a] = [a]
-[a\\\'x\'\nb] = [a\\\'x\'\nb]
-[\x01\x1A ] = [\x01\x1A ]
-[\x3C![CDATA[] = [\x3C![CDATA[]
-[]]\>] = []]\>]
-
-[a] = [a]
-[a\\'x'\nb] = [a\\'x'\nb]
-[\u0001\u001A ] = [\u0001\u001A ]
-[\n\r\t\f\b\"] = [\n\r\t\f\b\"]
-[\/] = [\/]
-[a/b] = [a/b]
-[<\/script>] = [<\/script>]
-[\u003C![CDATA[] = [\u003C![CDATA[]
-[]]\u003E] = []]\u003E]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins2.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins2.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins2.txt
deleted file mode 100644
index f5eebd9..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/string-builtins2.txt
+++ /dev/null
@@ -1,135 +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.
- */
---
-1 = 1
-5 = 5
-0 = 0
---
-5 = 5
-1 = 1
-7 = 7
---
-true = true
-false = false
-true = true
---
-true = true
-false = false
-true = true
---
-true = true
-true = true
-true = true
-false = false
-true = true
---
-[abbcdbb] = [abbcdbb]
-[qwe] = [qwe]
-[qwe] = [qwe]
-[qwe] = [qwe]
-[qwe
-] = [qwe
-]
-[qwe
-] = [qwe
-]
---
-[abbcdbb] = [abbcdbb]
-[abb-dbb] = [abb-dbb]
-[a-=*cd-=*] = [a-=*cd-=*]
---
-[a][][cd][][] == [a][][cd][][]
-[][die][maggots][!] == [][die][maggots][!]
-[Die maggots!] == [Die maggots!]
---
-[     ]
-[    a]
-[   ab]
-[  abc]
-[ abcd]
-[abcde]
-[abcdef]
-[abcdefg]
-[abcdefgh]
-[-----]
-[----a]
-[---ab]
-[--abc]
-[-abcd]
-[abcde]
-[abcdef]
-[abcdefg]
-[abcdefgh]
-[.oO.oO.o]
-[.oO.oO.a]
-[.oO.oOab]
-[.oO.oabc]
-[.oO.abcd]
-[.oOabcde]
-[.oabcdef]
-[.abcdefg]
-[abcdefgh]
-[abcdefghi]
-[abcdefghij]
-[]
-[/]
-[/\]
-[/\_]
-[/\_/]
-[/\_/\]
-[/\_/\_]
-[/\_/\_/]
---
-[     ]
-[a    ]
-[ab   ]
-[abc  ]
-[abcd ]
-[abcde]
-[abcdef]
-[abcdefg]
-[abcdefgh]
-[-----]
-[a----]
-[ab---]
-[abc--]
-[abcd-]
-[abcde]
-[abcdef]
-[abcdefg]
-[abcdefgh]
-[.oO.oO.o]
-[aoO.oO.o]
-[abO.oO.o]
-[abc.oO.o]
-[abcdoO.o]
-[abcdeO.o]
-[abcdef.o]
-[abcdefgo]
-[abcdefgh]
-[abcdefghi]
-[abcdefghij]
-[]
-[/]
-[/\]
-[/\_]
-[/\_/]
-[/\_/\]
-[/\_/\_]
-[/\_/\_/]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringbimethods.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringbimethods.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringbimethods.txt
deleted file mode 100644
index 8ef415d..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringbimethods.txt
+++ /dev/null
@@ -1,29 +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.
- */
-3.00
-3.00
-01:02:03.000
-01:02:03.000
----
-de
-true false
-yes no
-igen nem
-0.0 1.0
-true true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringliteral.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringliteral.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringliteral.txt
deleted file mode 100644
index 3d9d4c9..0000000
Binary files a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/stringliteral.txt and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/switch.txt
----------------------------------------------------------------------
diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/switch.txt b/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/switch.txt
deleted file mode 100644
index 5d42785..0000000
--- a/freemarker-core/src/test/resources/org/apache/freemarker/test/templatesuite/expected/switch.txt
+++ /dev/null
@@ -1,80 +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: Switch-Case Test</title>
-</head>
-<body>
-
-<p>Here we iterate over a list of animals.</p>
-
-<p>Animal is: aardvark.<br />
-        This is the HTML for other animals.
-</p>
-<p>Animal is: kiwi.<br />
-        This is the HTML for the user's favorite animal.
-</p>
-<p>Animal is: gecko.<br />
-        This is the HTML for small animals.
-</p>
-<p>Animal is: cat.<br />
-        This is the HTML for other animals.
-</p>
-<p>Animal is: dog.<br />
-        This is the HTML for other animals.
-</p>
-<p>Animal is: elephant.<br />
-        This is the HTML for large animals.
-</p>
-<p>Animal is: squirrel.<br />
-        This is the HTML for small animals.
-</p>
-<p>Animal is: zebra.<br />
-        This is the HTML for a large stripey animal.
-        This is the HTML for large animals.
-</p>
-
-      1
-          i2
-      2
-          i4
-          ft
-      ft
-      3
-          i4
-      3
-          i6
-
-[]
-
-  ""
-  "1234"
-  "234"
-  "34"
-  "4"
-
-  "12default45"
-  "2default45"
-  "default"
-  "45"
-  "5"
-
-
-</body>
-</html>


Mime
View raw message