Author: cbrisson
Date: Mon Jul 18 10:33:42 2016
New Revision: 1753201
URL: http://svn.apache.org/viewvc?rev=1753201&view=rev
Log:
[engine] add test case for VELOCITY-710
Added:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java
Added:
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java?rev=1753201&view=auto
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java
(added)
+++
velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java
Mon Jul 18 10:33:42 2016
@@ -0,0 +1,91 @@
+package org.apache.velocity.test;
+
+/*
+ * 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.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
+import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
+import org.apache.velocity.test.misc.TestLogger;
+
+import java.io.FileWriter;
+
+/**
+ * This class tests the velocimacro.library.autoreload functionality, and
issue VELOCITY-
+ */
+public class MacroAutoReloadTestCase extends BaseTestCase
+{
+ public MacroAutoReloadTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ engine = new VelocityEngine();
+
+ //by default, make the engine's log output go to the test-report
+ log = new TestLogger(false, false);
+ engine.setProperty(RuntimeConstants.RUNTIME_LOG_INSTANCE, log);
+
+ // use file resource loader
+ engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file,string");
+ engine.addProperty("file.resource.loader.path", TEST_COMPARE_DIR +
"/reload");
+ engine.addProperty("velocimacro.library", "macros.vtl");
+ engine.addProperty("velocimacro.library.autoreload", "true");
+ engine.addProperty("file.resource.loader.cache", "false");
+ engine.addProperty("string.resource.loader.class",
StringResourceLoader.class.getName());
+ engine.addProperty("string.resource.loader.repository.name",
"stringRepo");
+ engine.addProperty("string.resource.loader.repository.static",
"false");
+
+ setUpEngine(engine);
+
+ context = new VelocityContext();
+ setUpContext(context);
+ }
+
+
+ public void testChangedMacro() throws Exception
+ {
+ String template = "#foo('hip')";
+ String result = "hop_hip";
+ assertEvalEquals(result, template);
+
+ FileWriter writer = new FileWriter(TEST_COMPARE_DIR +
"/reload/macros.vtl");
+ writer.write("#macro(foo $txt)hip_$txt#{end}");
+ writer.close();
+
+ result = "hip_hip";
+ assertEvalEquals(result, template);
+ }
+
+ public void testNewMacro() throws Exception
+ {
+ FileWriter writer = new FileWriter(TEST_COMPARE_DIR +
"/reload/macros.vtl", true);
+ writer.write("\n#macro(bar $txt)hep_$txt#{end}");
+ writer.close();
+
+ String template = "#foo('hip') #bar('hip')";
+ String result = "hip_hip hep_hip";
+ assertEvalEquals(result, template);
+ }
+}
+
