[freemarker-generator] branch FREEMARKER-151 updated: FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are running on Windows

[sgoeschl]

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 44bf51d  FREEMARKER-151 [freemarker-cli] Ensure that build and and 
examples are running on Windows
44bf51d is described below

commit 44bf51d1b41e2cb8f71678c0cff6f467de12bcfd
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Tue Jul 7 13:31:45 2020 +0200

    FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are 
running on Windows
---
 .../org/apache/freemarker/generator/maven/FreeMarkerMojoTest.java     | 2 +-
 .../apache/freemarker/generator/maven/JsonPropertiesProviderTest.java | 4 ++--
 .../org/apache/freemarker/generator/maven/OutputGeneratorTest.java    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/FreeMarkerMojoTest.java
 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/FreeMarkerMojoTest.java
index cb7471f..046250f 100644
--- 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/FreeMarkerMojoTest.java
+++ 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/FreeMarkerMojoTest.java
@@ -360,7 +360,7 @@ public class FreeMarkerMojoTest extends Assert {
 
     private static String fixSeparators(String str) {
         if (OperatingSystem.isWindows()) {
-            return FilenameUtils.separatorsToUnix(str);
+            return FilenameUtils.separatorsToWindows(str);
         } else {
             return str;
         }
diff --git 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/JsonPropertiesProviderTest.java
 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/JsonPropertiesProviderTest.java
index 88d8fc6..bef999e 100644
--- 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/JsonPropertiesProviderTest.java
+++ 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/JsonPropertiesProviderTest.java
@@ -99,7 +99,7 @@ public class JsonPropertiesProviderTest {
         assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> {
             toTest.providePropertiesFromFile(path, builder);
         })
-                .withMessage("Could not parse json data file: 
src/test/data/generating-file-visitor/data/mydir/success-test.txt.json");
+                .withMessageStartingWith("Could not parse json data file");
     }
 
     @Test
@@ -119,6 +119,6 @@ public class JsonPropertiesProviderTest {
         assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() 
-> {
             toTest.providePropertiesFromFile(path, builder);
         })
-                .withMessage("visitFile() given file not in sourceDirectory: 
src/test/data/generating-file-visitor/badPath/success-test.txt.json");
+                .withMessageStartingWith("visitFile() given file not in 
sourceDirectory");
     }
 }
diff --git 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OutputGeneratorTest.java
 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OutputGeneratorTest.java
index a88592f..11308bb 100644
--- 
a/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OutputGeneratorTest.java
+++ 
b/freemarker-generator-maven-plugin/src/test/java/org/apache/freemarker/generator/maven/OutputGeneratorTest.java
@@ -23,6 +23,7 @@ import freemarker.cache.FileTemplateLoader;
 import freemarker.template.Configuration;
 import mockit.Expectations;
 import mockit.Mocked;
+import org.apache.commons.io.FilenameUtils;
 import org.assertj.core.api.*;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -248,7 +249,7 @@ public class OutputGeneratorTest {
                 .isThrownBy(() -> {
                     generator.generate(config);
                 })
-                .withMessage("Could not process template associated with data 
file: 
src/test/data/generating-file-visitor/data/mydir/missing-var-test.txt.json");
+                .withMessageStartingWith("Could not process template 
associated with data file");
     }
 
     @Test