You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2021/09/27 18:28:14 UTC
[freemarker-generator] 01/02: FREEMARKER-188 Add more tests
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-188
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 418bb9925cbe691fa8a21a9aa645a68ef16a8ba1
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Sep 27 18:50:51 2021 +0200
FREEMARKER-188 Add more tests
---
.../cli/config/AbstractOutputGeneratorTest.java | 3 ++-
.../config/DataSourceSeedingOutputGeneratorTest.java | 18 +++++++++---------
.../cli/config/TemplateSeedingOutputGeneratorTest.java | 16 ++++++++--------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/AbstractOutputGeneratorTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/AbstractOutputGeneratorTest.java
index 16ce464..94790e1 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/AbstractOutputGeneratorTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/AbstractOutputGeneratorTest.java
@@ -18,7 +18,8 @@ public abstract class AbstractOutputGeneratorTest {
protected static final String ANY_DATASOURCE_DIRECTORY = "src/test/data/json";
protected static final String ANY_DATASOURCE_FILE_01 = ANY_DATASOURCE_DIRECTORY + "/environments.json";
protected static final String ANY_DATASOURCE_FILE_02 = ANY_DATASOURCE_DIRECTORY + "/list.json";
- protected static final String ANY_OUTPUT_DIRECTORY_NAME = "target";
+ protected static final String ANY_OUTPUT_DIRECTORY = "target";
+ protected static final String ANY_OUTPUT_FILE = "target/out.txt";
protected static OutputGeneratorDefinition outputGeneratorDefinition() {
return new OutputGeneratorDefinition();
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java
index 62d3217..fa72c2f 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java
@@ -19,7 +19,7 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
public void shouldCreateOutputGeneratorForSingleDataSource() {
final OutputGeneratorDefinition outputGeneratorDefinition = outputGeneratorDefinition();
outputGeneratorDefinition.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY);
outputGeneratorDefinition.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_01);
outputGeneratorDefinition.outputSeedDefinition = outputSeedDefinition(SeedType.DATASOURCE);
outputGeneratorDefinition.outputMapperDefinition = outputMapperDefinition("*.txt");
@@ -34,7 +34,7 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
assertEquals(1, outputGenerator.getDataSources().size());
assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME, "environments.txt"), outputGenerator.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator.getDataSources().get(0).getFileName());
}
@@ -45,14 +45,14 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
public void shouldCreateOutputGeneratorForEachDataSource() {
final OutputGeneratorDefinition outputGeneratorDefinition_01 = outputGeneratorDefinition();
outputGeneratorDefinition_01.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition_01.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition_01.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY);
outputGeneratorDefinition_01.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_01);
outputGeneratorDefinition_01.outputSeedDefinition = outputSeedDefinition(SeedType.DATASOURCE);
outputGeneratorDefinition_01.outputMapperDefinition = outputMapperDefinition("*.txt");
final OutputGeneratorDefinition outputGeneratorDefinition_02 = outputGeneratorDefinition();
outputGeneratorDefinition_02.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition_02.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition_02.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY);
outputGeneratorDefinition_02.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_02);
outputGeneratorDefinition_02.outputSeedDefinition = outputSeedDefinition(SeedType.DATASOURCE);
outputGeneratorDefinition_02.outputMapperDefinition = outputMapperDefinition("*.txt");
@@ -69,13 +69,13 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
assertEquals(1, outputGenerator_01.getDataSources().size());
assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_01.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_01.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator_01.getDataSources().get(0).getFileName());
assertEquals(1, outputGenerator_02.getDataSources().size());
assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_02.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_02.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME, "list.txt"), outputGenerator_02.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_DIRECTORY, "list.txt"), outputGenerator_02.getTemplateOutput().getFile());
assertEquals("list.json", outputGenerator_02.getDataSources().get(0).getFileName());
}
@@ -86,7 +86,7 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
public void shouldCreateOutputGeneratorsForAllDataSourcesInDirectory() {
final OutputGeneratorDefinition outputGeneratorDefinition = outputGeneratorDefinition();
outputGeneratorDefinition.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY);
outputGeneratorDefinition.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_DIRECTORY);
outputGeneratorDefinition.outputSeedDefinition = outputSeedDefinition(SeedType.DATASOURCE);
outputGeneratorDefinition.outputMapperDefinition = outputMapperDefinition("*.txt");
@@ -102,13 +102,13 @@ public class DataSourceSeedingOutputGeneratorTest extends AbstractOutputGenerato
assertEquals(1, outputGenerator_01.getDataSources().size());
assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_01.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_01.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_DIRECTORY, "environments.txt"), outputGenerator_01.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator_01.getDataSources().get(0).getFileName());
assertEquals(1, outputGenerator_02.getDataSources().size());
assertEquals(OutputGenerator.SeedType.DATASOURCE, outputGenerator_02.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_02.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME, "list.txt"), outputGenerator_02.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_DIRECTORY, "list.txt"), outputGenerator_02.getTemplateOutput().getFile());
assertEquals("list.json", outputGenerator_02.getDataSources().get(0).getFileName());
}
}
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateSeedingOutputGeneratorTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateSeedingOutputGeneratorTest.java
index a21ec86..5c00c31 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateSeedingOutputGeneratorTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateSeedingOutputGeneratorTest.java
@@ -19,7 +19,7 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
public void shouldCreateSingleOutputGeneratorForMultipleDataSources() {
final OutputGeneratorDefinition outputGeneratorDefinition = outputGeneratorDefinition();
outputGeneratorDefinition.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_FILE);
outputGeneratorDefinition.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_01, ANY_DATASOURCE_FILE_02);
outputGeneratorDefinition.outputSeedDefinition = outputSeedDefinition(SeedType.TEMPLATE);
final Settings settings = settings(outputGeneratorDefinition);
@@ -33,7 +33,7 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
assertEquals(OutputGenerator.SeedType.TEMPLATE, outputGenerator.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME), outputGenerator.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_FILE), outputGenerator.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator.getDataSources().get(0).getFileName());
assertEquals("list.json", outputGenerator.getDataSources().get(1).getFileName());
}
@@ -45,7 +45,7 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
public void shouldCreateSingleOutputGeneratorForMultipleDataSourcesInDirectory() {
final OutputGeneratorDefinition outputGeneratorDefinition = outputGeneratorDefinition();
outputGeneratorDefinition.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_FILE);
outputGeneratorDefinition.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_DIRECTORY);
outputGeneratorDefinition.outputSeedDefinition = outputSeedDefinition(SeedType.TEMPLATE);
final Settings settings = settings(outputGeneratorDefinition);
@@ -59,7 +59,7 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
assertEquals(OutputGenerator.SeedType.TEMPLATE, outputGenerator.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME), outputGenerator.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_FILE), outputGenerator.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator.getDataSources().get(0).getFileName());
assertEquals("list.json", outputGenerator.getDataSources().get(1).getFileName());
}
@@ -71,13 +71,13 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
public void shouldCreateOutputGeneratorForEachOutputGeneratorDefinition() {
final OutputGeneratorDefinition outputGeneratorDefinition_01 = outputGeneratorDefinition();
outputGeneratorDefinition_01.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition_01.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition_01.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_FILE);
outputGeneratorDefinition_01.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_01);
outputGeneratorDefinition_01.outputSeedDefinition = outputSeedDefinition(SeedType.TEMPLATE);
final OutputGeneratorDefinition outputGeneratorDefinition_02 = outputGeneratorDefinition();
outputGeneratorDefinition_02.templateSourceDefinition = templateSourceDefinition(ANY_TEMPLATE);
- outputGeneratorDefinition_02.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_DIRECTORY_NAME);
+ outputGeneratorDefinition_02.templateOutputDefinition = templateOutputDirectoryDefinition(ANY_OUTPUT_FILE);
outputGeneratorDefinition_02.dataSourceDefinition = dataSourceDefinition(ANY_DATASOURCE_FILE_02);
outputGeneratorDefinition_02.outputSeedDefinition = outputSeedDefinition(SeedType.TEMPLATE);
@@ -93,13 +93,13 @@ public class TemplateSeedingOutputGeneratorTest extends AbstractOutputGeneratorT
assertEquals(1, outputGenerator_01.getDataSources().size());
assertEquals(OutputGenerator.SeedType.TEMPLATE, outputGenerator_01.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_01.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME), outputGenerator_01.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_FILE), outputGenerator_01.getTemplateOutput().getFile());
assertEquals("environments.json", outputGenerator_01.getDataSources().get(0).getFileName());
assertEquals(1, outputGenerator_02.getDataSources().size());
assertEquals(OutputGenerator.SeedType.TEMPLATE, outputGenerator_02.getSeedType());
assertEquals(ANY_TEMPLATE_NAME, outputGenerator_02.getTemplateSource().getName());
- assertEquals(new File(ANY_OUTPUT_DIRECTORY_NAME), outputGenerator_02.getTemplateOutput().getFile());
+ assertEquals(new File(ANY_OUTPUT_FILE), outputGenerator_02.getTemplateOutput().getFile());
assertEquals("list.json", outputGenerator_02.getDataSources().get(0).getFileName());
}
}