aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core
diff options
context:
space:
mode:
authorMartin Tzvetanov Grigorov <mgrigorov@apache.org>2020-11-20 14:32:04 +0200
committerMartin Tzvetanov Grigorov <mgrigorov@apache.org>2020-11-23 14:10:07 +0200
commit0de2e6511b02ce7aa35a9d569b4a1dd3ba2cb602 (patch)
tree51f05e887fda4fc19777aa576d0b4b10c47a3d64 /velocity-engine-core
parent6b6a42ab9cbedb3591c2c95ab0e7e94db7d89ce2 (diff)
downloadapache-velocity-engine-0de2e6511b02ce7aa35a9d569b4a1dd3ba2cb602.tar.gz
Add .travis.yml for testing the PRs at https://travis-ci.com/apache/velocity-engine
Diffstat (limited to 'velocity-engine-core')
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java2
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java12
-rw-r--r--velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java8
3 files changed, 5 insertions, 17 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 5466782f..f2eb297d 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
@@ -48,7 +48,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase
{
protected VelocityEngine engine;
protected VelocityContext context;
- protected boolean DEBUG = false;
+ protected boolean DEBUG = Boolean.getBoolean("test.debug");
protected TestLogger log;
protected String stringRepoName = "string.repo";
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java
index 43b58ee8..4bbcbe2a 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java
@@ -19,31 +19,19 @@ package org.apache.velocity.test;
* under the License.
*/
-import com.sun.org.apache.bcel.internal.classfile.Deprecated;
-import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.DeprecatedRuntimeConstants;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.RuntimeInstance;
import org.apache.velocity.test.misc.TestLogger;
import org.apache.velocity.util.DeprecationAwareExtProperties;
-import org.apache.velocity.util.ExtProperties;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.InputStream;
import java.lang.reflect.Field;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java
index ac5a4ee1..69f88697 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java
@@ -88,7 +88,6 @@ public class SpaceGobblingTestCase extends BaseTestCase
private void testMode(SpaceGobbling mode) throws Exception
{
- VelocityEngine ve = createEngine(mode);
File dir = new File(TEST_COMPARE_DIR + "/gobbling");
File[] directoryListing = dir.listFiles();
if (directoryListing != null)
@@ -97,7 +96,7 @@ public class SpaceGobblingTestCase extends BaseTestCase
{
if (child.isFile())
{
- testTemplate(ve, child.getName(), mode);
+ testTemplate(child.getName(), mode);
}
}
}
@@ -107,14 +106,15 @@ public class SpaceGobblingTestCase extends BaseTestCase
}
}
- private void testTemplate(VelocityEngine engine, String templateFile, SpaceGobbling mode) throws Exception
+ private void testTemplate(String templateFile, SpaceGobbling mode) throws Exception
{
assureResultsDirectoryExists(RESULT_DIR);
FileOutputStream fos = new FileOutputStream (getFileName(RESULT_DIR, templateFile, mode.toString()));
VelocityContext context = new VelocityContext();
Writer writer = new BufferedWriter(new OutputStreamWriter(fos));
- Template template = engine.getTemplate(templateFile);
+ VelocityEngine ve = createEngine(mode);
+ Template template = ve.getTemplate(templateFile);
template.merge(context, writer);
/**