[VELOCITY-889] Fix lookahead issue in macro arguments parsing

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1843211 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 51 insertions, 9 deletions

diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java
index e5356273..ea5c26d8 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java
@@ -160,15 +160,6 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase
         }
     }
 
-    public void testBase()
-    {
-        if (DEBUG && engine != null)
-        {
-            assertSchmoo("");
-            assertSchmoo("abc\n123");
-        }
-    }
-
     /**
      * Compare an expected string with the given loaded template
      */
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity889TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity889TestCase.java
new file mode 100755
index 00000000..d4532f84
--- /dev/null
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity889TestCase.java
@@ -0,0 +1,51 @@
+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-589.
+ */
+public class Velocity889TestCase extends BaseTestCase
+{
+    public Velocity889TestCase(String name)
+    {
+       super(name);
+    }
+
+    public void testSpaceBeforeRParen()
+    {
+        assertEvalEquals("#foo(\n)", "#foo(\n)");
+        assertEvalEquals("#foo(\n )", "#foo(\n )");
+    }
+
+    public void testSpaceBeforeRParenWithArg()
+    {
+        assertEvalEquals("#foo(\n$bar\n)", "#foo(\n$bar\n)");
+        assertEvalEquals("#foo(\n $bar\n )", "#foo(\n $bar\n )");
+    }
+
+    public void testSpaceBeforeRParenWithDefaultArg()
+    {
+        assertEvalEquals("", "#macro(\nfoo\n,\n$bar\n=\n'bar')\n#end");
+        assertEvalEquals("", "#macro(\n foo\n ,\n $bar\n =\n 'bar'\n )\n #end");
+    }
+}