freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [7/9] incubator-freemarker git commit: (Test file name typo)
Date Thu, 31 Dec 2015 16:33:09 GMT
(Test file name typo)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7d8792cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7d8792cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7d8792cb

Branch: refs/heads/2.3
Commit: 7d8792cb334a6bf271287f5b263f7274bb54f8be
Parents: 1334cd9
Author: ddekany <ddekany@apache.org>
Authored: Thu Dec 31 16:37:19 2015 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Dec 31 16:37:19 2015 +0100

----------------------------------------------------------------------
 src/test/java/freemarker/core/ASTTest.java      |  2 +-
 .../freemarker/core/ast-whitesoacestripping.ast | 52 --------------------
 .../freemarker/core/ast-whitesoacestripping.ftl | 40 ---------------
 .../freemarker/core/ast-whitespacestripping.ast | 52 ++++++++++++++++++++
 .../freemarker/core/ast-whitespacestripping.ftl | 40 +++++++++++++++
 5 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/java/freemarker/core/ASTTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTTest.java b/src/test/java/freemarker/core/ASTTest.java
index 7124c64..1f2160a 100644
--- a/src/test/java/freemarker/core/ASTTest.java
+++ b/src/test/java/freemarker/core/ASTTest.java
@@ -54,7 +54,7 @@ public class ASTTest extends FileTestCase {
     }
     
     public void testWhitespaceStripping() throws Exception {
-        testAST("ast-whitesoacestripping");
+        testAST("ast-whitespacestripping");
     }
 
     public void testMixedContentSimplifications() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitesoacestripping.ast b/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
deleted file mode 100644
index 7731fec..0000000
--- a/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
+++ /dev/null
@@ -1,52 +0,0 @@
-#mixed_content  // f.c.MixedContent
-    #assign  // f.c.Assignment
-        - assignment target: "xs"  // String
-        - assignment operator: "="  // String
-        - assignment source: [...]  // f.c.ListLiteral
-        - variable scope: "1"  // Integer
-        - namespace: null  // Null
-    #text  // f.c.TextBlock
-        - content: "\n"  // String
-    #list  // f.c.IteratorBlock
-        - list source: x  // f.c.Identifier
-        - target loop variable: "xs"  // String
-        #text  // f.c.TextBlock
-            - content: "    "  // String
-        ${...}  // f.c.DollarVariable
-            - content: x  // f.c.Identifier
-        #text  // f.c.TextBlock
-            - content: "\n"  // String
-    #text  // f.c.TextBlock
-        - content: "\n"  // String
-    #assign  // f.c.Assignment
-        - assignment target: "a"  // String
-        - assignment operator: "="  // String
-        - assignment source: 1  // f.c.NumberLiteral
-        - variable scope: "1"  // Integer
-        - namespace: null  // Null
-    #assign  // f.c.Assignment
-        - assignment target: "b"  // String
-        - assignment operator: "="  // String
-        - assignment source: 1  // f.c.NumberLiteral
-        - variable scope: "1"  // Integer
-        - namespace: null  // Null
-    #text  // f.c.TextBlock
-        - content: "\n"  // String
-    @  // f.c.UnifiedCall
-        - callee: b  // f.c.Identifier
-        #text  // f.c.TextBlock
-            - content: "    x\n"  // String
-    #text  // f.c.TextBlock
-        - content: "\n"  // String
-    @  // f.c.UnifiedCall
-        - callee: c  // f.c.Identifier
-    #text  // f.c.TextBlock
-        - content: "\n"  // String
-    @  // f.c.UnifiedCall
-        - callee: d  // f.c.Identifier
-    #text  // f.c.TextBlock
-        - content: "\na\n"  // String
-    #--...--  // f.c.Comment
-        - content: " comment "  // String
-    #text  // f.c.TextBlock
-        - content: "b"  // String

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl b/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
deleted file mode 100644
index af801fa..0000000
--- a/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
+++ /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.
--->
-
-
-<#assign xs = []>
-
-<#list x as xs>
-    ${x}
-</#list>
-
-<#assign a = 1>
-<#assign b = 1>
-
-<@b>
-    x
-</@b>
-
-<@c />
-
-<@d></@d>
-
-a
-<#-- comment -->
-b
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitespacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ast b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
new file mode 100644
index 0000000..7731fec
--- /dev/null
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
@@ -0,0 +1,52 @@
+#mixed_content  // f.c.MixedContent
+    #assign  // f.c.Assignment
+        - assignment target: "xs"  // String
+        - assignment operator: "="  // String
+        - assignment source: [...]  // f.c.ListLiteral
+        - variable scope: "1"  // Integer
+        - namespace: null  // Null
+    #text  // f.c.TextBlock
+        - content: "\n"  // String
+    #list  // f.c.IteratorBlock
+        - list source: x  // f.c.Identifier
+        - target loop variable: "xs"  // String
+        #text  // f.c.TextBlock
+            - content: "    "  // String
+        ${...}  // f.c.DollarVariable
+            - content: x  // f.c.Identifier
+        #text  // f.c.TextBlock
+            - content: "\n"  // String
+    #text  // f.c.TextBlock
+        - content: "\n"  // String
+    #assign  // f.c.Assignment
+        - assignment target: "a"  // String
+        - assignment operator: "="  // String
+        - assignment source: 1  // f.c.NumberLiteral
+        - variable scope: "1"  // Integer
+        - namespace: null  // Null
+    #assign  // f.c.Assignment
+        - assignment target: "b"  // String
+        - assignment operator: "="  // String
+        - assignment source: 1  // f.c.NumberLiteral
+        - variable scope: "1"  // Integer
+        - namespace: null  // Null
+    #text  // f.c.TextBlock
+        - content: "\n"  // String
+    @  // f.c.UnifiedCall
+        - callee: b  // f.c.Identifier
+        #text  // f.c.TextBlock
+            - content: "    x\n"  // String
+    #text  // f.c.TextBlock
+        - content: "\n"  // String
+    @  // f.c.UnifiedCall
+        - callee: c  // f.c.Identifier
+    #text  // f.c.TextBlock
+        - content: "\n"  // String
+    @  // f.c.UnifiedCall
+        - callee: d  // f.c.Identifier
+    #text  // f.c.TextBlock
+        - content: "\na\n"  // String
+    #--...--  // f.c.Comment
+        - content: " comment "  // String
+    #text  // f.c.TextBlock
+        - content: "b"  // String

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
new file mode 100644
index 0000000..af801fa
--- /dev/null
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
@@ -0,0 +1,40 @@
+<#--
+  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 xs = []>
+
+<#list x as xs>
+    ${x}
+</#list>
+
+<#assign a = 1>
+<#assign b = 1>
+
+<@b>
+    x
+</@b>
+
+<@c />
+
+<@d></@d>
+
+a
+<#-- comment -->
+b
\ No newline at end of file


Mime
View raw message