aboutsummaryrefslogtreecommitdiff
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
parent6b6a42ab9cbedb3591c2c95ab0e7e94db7d89ce2 (diff)
downloadapache-velocity-engine-0de2e6511b02ce7aa35a9d569b4a1dd3ba2cb602.tar.gz
Add .travis.yml for testing the PRs at https://travis-ci.com/apache/velocity-engine
-rw-r--r--.travis.yml47
-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
4 files changed, 52 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..9d4faff8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,47 @@
+# 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.
+
+os: linux
+dist: focal
+
+arch:
+ - amd64
+ - arm64
+
+cache:
+ directories:
+ - $HOME/.m2/repository
+
+
+install:
+ - lscpu
+ - ARCH=`uname -p`
+ - echo $ARCH
+ - JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz"
+ - JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u275b01.tar.gz"
+ - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi
+ - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
+ - mv jdk8* jdk
+ - export JAVA_HOME=`pwd`/jdk
+ - wget -q https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz && tar xzf apache-maven-*-bin.tar.gz
+ - export M2_HOME=`pwd`/apache-maven-3.6.3
+ - export PATH="$JAVA_HOME/bin:$M2_HOME/bin:$PATH"
+ - java -version
+ - mvn -version
+
+script:
+ - mvn clean verify \ No newline at end of file
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);
/**