This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-151
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-151 by this push:
new 5d34bf4 FREEMARKER-151 [freemarker-cli] Ensure that build and and
examples are running on Windows
5d34bf4 is described below
commit 5d34bf4ba986b1f9af908061f10664becbd0f424
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Tue Jul 7 10:13:43 2020 +0200
FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are
running on Windows
---
.travis.yml | 3 ---
.../generator/base/file/RecursiveFileSupplier.java | 2 +-
.../datasource/DataSourceFactoryTest.java | 9 ++++----
.../template/TemplateSourceFactoryTest.java | 8 +++----
.../cli/config/DataModelSupplierTest.java | 20 ++++++++---------
.../tools/commonsexec/CommonsExecToolTest.java | 26 ++--------------------
6 files changed, 22 insertions(+), 46 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f6d344e..b3680d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
language: java
-os:
- - windows
- - linux
jdk:
- openjdk8
- openjdk9
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
index 1bb6a65..88fff7f 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
@@ -72,7 +72,7 @@ public class RecursiveFileSupplier implements
Supplier<List<File>> {
return sources.stream()
.map(this::resolve)
.flatMap(Collection::stream)
- .sorted(Comparator.comparing(File::getAbsolutePath))
+ .sorted(Comparator.comparing(File::getName))
.collect(toList());
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
index 2166843..ce1ed61 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.charset.Charset;
-import java.nio.file.Paths;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -47,6 +46,7 @@ public class DataSourceFactoryTest {
private static final String ANY_FILE_URI = format("file:///%s/pom.xml",
PWD);
private static final Charset ANY_CHAR_SET = UTF_8;
private static final File ANY_FILE = new File(ANY_FILE_NAME);
+ private static final String ANY_ENV_VARIABLE = "JAVA_HOME";
private static final String ANY_NAMED_URL_STRING =
"content:www=https://www.google.com?foo=bar#contenttype=application/json";;
@Test
@@ -158,13 +158,14 @@ public class DataSourceFactoryTest {
@Test
public void shouldCreateDataSourceFromEnvironmentVariable() {
- final NamedUri namedUri =
NamedUriStringParser.parse("pwd=env:///JAVA_HOME");
+ final String uri = "env:///" + ANY_ENV_VARIABLE;
+ final NamedUri namedUri = NamedUriStringParser.parse("myenv=" + uri);
final DataSource dataSource = DataSourceFactory.fromNamedUri(namedUri);
- assertEquals("pwd", dataSource.getName());
+ assertEquals("myenv", dataSource.getName());
assertEquals("default", dataSource.getGroup());
assertEquals(UTF_8, dataSource.getCharset());
- assertEquals("env:///JAVA_HOME", dataSource.getUri().toString());
+ assertEquals(uri, dataSource.getUri().toString());
assertEquals("text/plain", dataSource.getContentType());
}
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
index 5f048a7..d1d8310 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateSourceFactoryTest.java
@@ -19,7 +19,6 @@ package org.apache.freemarker.generator.template;
import org.apache.freemarker.generator.base.template.TemplateSource;
import org.apache.freemarker.generator.base.template.TemplateSource.Origin;
import org.apache.freemarker.generator.base.template.TemplateSourceFactory;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -32,7 +31,8 @@ public class TemplateSourceFactoryTest {
private static final String ANY_TEMPLATE_PATH = "any/template/path.ftl";
private static final String ANY_FILE_NAME = "pom.xml";
private static final String ANY_URL =
"https://raw.githubusercontent.com/apache/freemarker-generator/master/freemarker-generator-cli/templates/info.ftl";;
- private static final String ANY_ENVIRONMENT_VARIABLE = "env:///JAVA_HOME";
+ private static final String ANY_ENV_VARIABLE = "JAVA_HOME";
+ private static final String ANY_ENV_URI = "env:///" + ANY_ENV_VARIABLE;
@Test
public void shouldCreateFromTemplatePath() {
@@ -56,9 +56,9 @@ public class TemplateSourceFactoryTest {
@Test
public void shouldCreateFromEnvironmentVariable() {
- final TemplateSource templateSource =
TemplateSourceFactory.create(ANY_ENVIRONMENT_VARIABLE);
+ final TemplateSource templateSource =
TemplateSourceFactory.create(ANY_ENV_URI);
- assertEquals("JAVA_HOME", templateSource.getName());
+ assertEquals(ANY_ENV_VARIABLE, templateSource.getName());
assertEquals(Origin.CODE, templateSource.getOrigin());
assertNull(templateSource.getPath());
assertFalse(templateSource.getCode().isEmpty());
diff --git
a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataModelSupplierTest.java
b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataModelSupplierTest.java
index d1ee2b4..47283df 100644
---
a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataModelSupplierTest.java
+++
b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataModelSupplierTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertTrue;
public class DataModelSupplierTest {
private static final String PWD = FilenameUtils.separatorsToUnix(new
File("").getAbsolutePath());
- private static final String ANY_ENV = "JAVA_HOME";
- private static final String ANY_ENV_VALUE = System.getenv(ANY_ENV);
+ private static final String ANY_ENV_VARIABLE = "JAVA_HOME";
+ private static final String ANY_ENV_VARIABLE_VALUE =
System.getenv(ANY_ENV_VARIABLE);
private static final int NR_OF_ALL_ENV_VARIABLES = System.getenv().size();
// === Environment Variables ===
@@ -45,7 +45,7 @@ public class DataModelSupplierTest {
final Map<String, Object> model = supplier.get();
assertEquals(NR_OF_ALL_ENV_VARIABLES, model.size());
- assertEquals(ANY_ENV_VALUE, model.get(ANY_ENV));
+ assertEquals(ANY_ENV_VARIABLE_VALUE, model.get(ANY_ENV_VARIABLE));
}
@Test
@@ -56,27 +56,27 @@ public class DataModelSupplierTest {
assertEquals(1, model.size());
assertEquals(NR_OF_ALL_ENV_VARIABLES, toMap(model, "myenv").size());
- assertEquals(ANY_ENV_VALUE, toMap(model, "myenv").get(ANY_ENV));
+ assertEquals(ANY_ENV_VARIABLE_VALUE, toMap(model,
"myenv").get(ANY_ENV_VARIABLE));
}
@Test
public void shouldCopySingleEnvironmentVariablesToTopLevelDataModel() {
- final DataModelSupplier supplier = supplier("env:///" + ANY_ENV);
+ final DataModelSupplier supplier = supplier("env:///" +
ANY_ENV_VARIABLE);
final Map<String, Object> model = supplier.get();
assertEquals(1, model.size());
- assertEquals(ANY_ENV_VALUE, model.get(ANY_ENV));
+ assertEquals(ANY_ENV_VARIABLE_VALUE, model.get(ANY_ENV_VARIABLE));
}
@Test
public void shouldCopySingleEnvironmentVariableToDataModelVariable() {
- final DataModelSupplier supplier = supplier("myenv=env:///" + ANY_ENV);
+ final DataModelSupplier supplier = supplier("myenv=env:///" +
ANY_ENV_VARIABLE);
final Map<String, Object> model = supplier.get();
assertEquals(1, model.size());
- assertEquals(ANY_ENV_VALUE, model.get("myenv"));
+ assertEquals(ANY_ENV_VARIABLE_VALUE, model.get("myenv"));
}
@Test(expected = IllegalArgumentException.class)
@@ -139,8 +139,8 @@ public class DataModelSupplierTest {
final Map<String, Object> model = supplier.get();
assertEquals(1, model.size());
- assertEquals("first", ((List)model.get("list")).get(0));
- assertEquals("second", ((List)model.get("list")).get(1));
+ assertEquals("first", ((List) model.get("list")).get(0));
+ assertEquals("second", ((List) model.get("list")).get(1));
}
@Test(expected = Exception.class)
diff --git
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/commonsexec/CommonsExecToolTest.java
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/commonsexec/CommonsExecToolTest.java
index 6c5597b..8f30444 100644
---
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/commonsexec/CommonsExecToolTest.java
+++
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/commonsexec/CommonsExecToolTest.java
@@ -18,35 +18,13 @@ package org.apache.freemarker.generator.tools.commonsexec;
import org.junit.Test;
-import java.util.Collections;
-
import static junit.framework.TestCase.assertFalse;
public class CommonsExecToolTest {
- // The "date" command should work on all platforms
- private static final String ANY_EXECUTABLE = "ping.exe";
-
- /**
- @Test
- public void shallExecuteCommand() {
- final String result = commonsExecTool().execute(ANY_EXECUTABLE,
Collections.emptyList());
-
- assertFalse(result.isEmpty());
- }
-
@Test
- public void shallExecuteCommandLine() {
- final String result = commonsExecTool().execute(ANY_EXECUTABLE);
-
- assertFalse(result.isEmpty());
- }
-
- */
-
- @Test(expected = RuntimeException.class)
- public void shallThrowExecptionForUnknownCommand() {
- commonsExecTool().execute("does-not-exist");
+ public void shouldReturnDescription() {
+ assertFalse(commonsExecTool().toString().isEmpty());
}
private CommonsExecTool commonsExecTool() {
