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:13 UTC
[freemarker-generator] branch FREEMARKER-188 updated (c0a68ff ->
cf67373)
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a change to branch FREEMARKER-188
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.
from c0a68ff FREEMARKER-188 Add more tests
new 418bb99 FREEMARKER-188 Add more tests
new cf67373 FREEMARKER-188 Move some template seeding code to "freemarker-generator-cli"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../output/TemplateSeedingOutputGenerator.java | 2 --
.../cli/config/output}/TemplateTransformation.java | 5 ++++-
.../output}/TemplateTransformationsBuilder.java | 4 +++-
.../src/test/data}/template/application.properties | 0
.../src/test/data}/template/nginx/nginx.conf.ftl | 0
.../cli/config/AbstractOutputGeneratorTest.java | 3 ++-
.../config/TemplateSeedingOutputGeneratorTest.java | 16 +++++++-------
.../DataSourceSeedingOutputGeneratorTest.java | 25 +++++++++++++---------
.../TemplateTransformationsBuilderTest.java | 9 +++-----
9 files changed, 35 insertions(+), 29 deletions(-)
rename {freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template => freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformation.java (89%)
rename {freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template => freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformationsBuilder.java (98%)
rename {freemarker-generator-base/src/test => freemarker-generator-cli/src/test/data}/template/application.properties (100%)
rename {freemarker-generator-base/src/test => freemarker-generator-cli/src/test/data}/template/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/{ => output}/DataSourceSeedingOutputGeneratorTest.java (84%)
rename {freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template => freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformationsBuilderTest.java (96%)
[freemarker-generator] 02/02: FREEMARKER-188 Move some template
seeding code to "freemarker-generator-cli"
Posted by sg...@apache.org.
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 cf67373559bde06c6df2c782d59010b0cf8fc65a
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Sep 27 20:27:37 2021 +0200
FREEMARKER-188 Move some template seeding code to "freemarker-generator-cli"
---
.../cli/config/output/TemplateSeedingOutputGenerator.java | 2 --
.../generator/cli/config/output}/TemplateTransformation.java | 5 ++++-
.../cli/config/output}/TemplateTransformationsBuilder.java | 4 +++-
.../src/test/data}/template/application.properties | 0
.../src/test/data}/template/nginx/nginx.conf.ftl | 0
.../{ => output}/DataSourceSeedingOutputGeneratorTest.java | 11 ++++++++---
.../config/output}/TemplateTransformationsBuilderTest.java | 9 +++------
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java
index 7bb59a0..8dfa8bb 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateSeedingOutputGenerator.java
@@ -18,8 +18,6 @@ package org.apache.freemarker.generator.cli.config.output;
import org.apache.freemarker.generator.base.output.OutputGenerator;
import org.apache.freemarker.generator.base.output.OutputGenerator.SeedType;
-import org.apache.freemarker.generator.base.template.TemplateTransformation;
-import org.apache.freemarker.generator.base.template.TemplateTransformationsBuilder;
import org.apache.freemarker.generator.cli.config.Settings;
import org.apache.freemarker.generator.cli.picocli.OutputGeneratorDefinition;
import org.apache.freemarker.generator.cli.picocli.TemplateOutputDefinition;
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java
similarity index 89%
rename from freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java
rename to freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java
index 6f0ed90..74a1522 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformation.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformation.java
@@ -14,7 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.freemarker.generator.base.template;
+package org.apache.freemarker.generator.cli.config.output;
+
+import org.apache.freemarker.generator.base.template.TemplateOutput;
+import org.apache.freemarker.generator.base.template.TemplateSource;
import static java.util.Objects.requireNonNull;
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
similarity index 98%
rename from freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
rename to freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
index c9b0814..2e9d04b 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilder.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.freemarker.generator.base.template;
+package org.apache.freemarker.generator.cli.config.output;
import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
import org.apache.freemarker.generator.base.datasource.DataSource;
import org.apache.freemarker.generator.base.datasource.DataSourceLoader;
import org.apache.freemarker.generator.base.datasource.DataSourceLoaderFactory;
import org.apache.freemarker.generator.base.file.RecursiveFileSupplier;
+import org.apache.freemarker.generator.base.template.TemplateOutput;
+import org.apache.freemarker.generator.base.template.TemplateSource;
import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper;
import org.apache.freemarker.generator.base.util.StringUtils;
import org.apache.freemarker.generator.base.util.Validate;
diff --git a/freemarker-generator-base/src/test/template/application.properties b/freemarker-generator-cli/src/test/data/template/application.properties
similarity index 100%
rename from freemarker-generator-base/src/test/template/application.properties
rename to freemarker-generator-cli/src/test/data/template/application.properties
diff --git a/freemarker-generator-base/src/test/template/nginx/nginx.conf.ftl b/freemarker-generator-cli/src/test/data/template/nginx/nginx.conf.ftl
similarity index 100%
rename from freemarker-generator-base/src/test/template/nginx/nginx.conf.ftl
rename to freemarker-generator-cli/src/test/data/template/nginx/nginx.conf.ftl
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/output/DataSourceSeedingOutputGeneratorTest.java
similarity index 94%
rename from freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/DataSourceSeedingOutputGeneratorTest.java
rename to freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGeneratorTest.java
index fa72c2f..0f03c52 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/output/DataSourceSeedingOutputGeneratorTest.java
@@ -1,7 +1,10 @@
-package org.apache.freemarker.generator.cli.config;
+package org.apache.freemarker.generator.cli.config.output;
import org.apache.freemarker.generator.base.FreeMarkerConstants.SeedType;
import org.apache.freemarker.generator.base.output.OutputGenerator;
+import org.apache.freemarker.generator.cli.config.AbstractOutputGeneratorTest;
+import org.apache.freemarker.generator.cli.config.OutputGeneratorsSupplier;
+import org.apache.freemarker.generator.cli.config.Settings;
import org.apache.freemarker.generator.cli.picocli.OutputGeneratorDefinition;
import org.junit.Test;
@@ -69,7 +72,8 @@ 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, "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());
@@ -102,7 +106,8 @@ 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, "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());
diff --git a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java
similarity index 96%
rename from freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java
rename to freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java
index 7170cd7..6755404 100644
--- a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template/TemplateTransformationsBuilderTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/TemplateTransformationsBuilderTest.java
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.freemarker.generator.template;
+package org.apache.freemarker.generator.cli.config.output;
import org.apache.freemarker.generator.base.FreeMarkerConstants.Location;
import org.apache.freemarker.generator.base.template.TemplateOutput;
import org.apache.freemarker.generator.base.template.TemplateSource;
import org.apache.freemarker.generator.base.template.TemplateSource.Origin;
-import org.apache.freemarker.generator.base.template.TemplateTransformation;
-import org.apache.freemarker.generator.base.template.TemplateTransformationsBuilder;
import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper;
import org.junit.Ignore;
import org.junit.Test;
@@ -41,10 +39,9 @@ import static org.junit.Assert.assertTrue;
public class TemplateTransformationsBuilderTest {
- private static final String ANY_TEMPLATE_FILE_NAME = "src/test/template/application.properties";
- private static final String OTHER_TEMPLATE_FILE_NAME = "src/test/template/nginx/nginx.conf.ftl";
+ private static final String ANY_TEMPLATE_FILE_NAME = "src/test/data/template/application.properties";
private static final String ANY_TEMPLATE_PATH = "template/info.ftl";
- private static final String ANY_TEMPLATE_DIRECTORY_NAME = "src/test/template";
+ private static final String ANY_TEMPLATE_DIRECTORY_NAME = "src/test/data/template";
private static final String ANY_TEMPLATE_URL = "https://raw.githubusercontent.com/apache/freemarker-generator/master/freemarker-generator-cli/src/app/templates/freemarker-generator/info.ftl";
private static final String ANY_ENV_URI = "env:///JAVA_HOME";
[freemarker-generator] 01/02: FREEMARKER-188 Add more tests
Posted by sg...@apache.org.
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());
}
}