Author: nbubna
Date: Sun Mar 28 18:54:55 2010
New Revision: 928475
URL: http://svn.apache.org/viewvc?rev=928475&view=rev
Log:
VELOCITY-755 use LinkedHashMap for VTL-created maps
Added:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java
(with props)
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java?rev=928475&r1=928474&r2=928475&view=diff
==============================================================================
---
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
(original)
+++
velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
Sun Mar 28 18:54:55 2010
@@ -19,7 +19,7 @@ package org.apache.velocity.runtime.pars
* under the License.
*/
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.velocity.context.InternalContextAdapter;
@@ -69,7 +69,7 @@ public class ASTMap extends SimpleNode
{
int size = jjtGetNumChildren();
- Map objectMap = new HashMap();
+ Map objectMap = new LinkedHashMap();
for (int i = 0; i < size; i += 2)
{
Added:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java?rev=928475&view=auto
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java
(added)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java
Sun Mar 28 18:54:55 2010
@@ -0,0 +1,41 @@
+package org.apache.velocity.test.issues;
+
+/*
+ * 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.
+ */
+
+import org.apache.velocity.test.BaseTestCase;
+
+/**
+ * This class tests VELOCITY-755.
+ */
+public class Velocity755TestCase extends BaseTestCase
+{
+ public Velocity755TestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testMapOrder()
+ {
+ String template = "#set( $map = {'a': 1, 'b': true, 'c': 3, 'd':
false, 'e': 5} )"+
+ "#foreach( $i in $map )$i#end";
+ assertEvalEquals("1true3false5", template);
+ }
+
+}
Propchange:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity755TestCase.java
------------------------------------------------------------------------------
svn:executable = *
