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 2020/08/03 19:53:49 UTC
[freemarker-generator] branch FREEMARKER-153 updated (f9826b6 ->
142c3f9)
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a change to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.
from f9826b6 FREEMARKER-153 Use individual BSD licence files for "antlr4-runtime", "asm", "curvesapi",and "hamcrest".
new 8a0c6ec FREEMARKER-153 Move "freemarker-cli/examples" to "freemarker-cli/src/examples"
new 142c3f9 FREEMARKER-153 Move "freemarker-cli/templates" to "freemarker-cli/src/templates"
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:
freemarker-generator-cli/pom.xml | 4 +-
.../examples/data/accesslog/combined-access.log | 0
.../{ => src}/examples/data/csv/contract.csv | 0
.../{ => src}/examples/data/csv/dataframe.csv | 0
.../examples/data/csv/excel-export-utf8.csv | 0
.../examples/data/csv/locker-test-users.csv | 0
.../{ => src}/examples/data/csv/sales-records.csv | 0
.../{ => src}/examples/data/csv/transactions.csv | 0
.../{ => src}/examples/data/csv/user.csv | 0
.../examples/data/excel/test-multiple-sheets.xlsx | Bin
.../{ => src}/examples/data/excel/test.xls | Bin
.../{ => src}/examples/data/excel/test.xlsx | Bin
.../examples/data/ftl/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/ftl/nginx/nginx.env | 0
.../{ => src}/examples/data/html/dependencies.html | 0
.../{ => src}/examples/data/json/github-users.json | 0
.../{ => src}/examples/data/json/swagger-spec.json | 0
.../data/properties/user_0001/user.properties | 0
.../data/properties/user_0002/user.properties | 0
.../data/properties/user_0003/user.properties | 0
.../data/properties/user_0004/user.properties | 0
.../examples/data/template/application.properties | 0
.../examples/data/template/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/xml/recipients.xml | 0
.../{ => src}/examples/data/yaml/customer.yaml | 0
.../{ => src}/examples/data/yaml/swagger-spec.yaml | 0
.../templates/accesslog/combined-access.ftl | 0
.../templates/csv/csv/gatling-user-credentials.ftl | 0
.../examples/templates/csv/fo/transactions.ftl | 0
.../examples/templates/csv/fo/transform.ftl | 0
.../examples/templates/csv/html/transactions.ftl | 0
.../{ => src}/examples/templates/csv/md/filter.ftl | 0
.../examples/templates/csv/shell/curl.ftl | 0
.../examples/templates/dataframe/example.ftl | 0
.../examples/templates/dataframe/html/print.ftl | 0
.../{ => src}/examples/templates/demo.ftl | 0
.../examples/templates/excel/csv/custom.ftl | 0
.../templates/excel/dataframe/transform.ftl | 0
.../examples/templates/html/csv/dependencies.ftl | 0
.../examples/templates/html/txt/licence.ftl | 0
.../templates/json/csv/swagger-endpoints.ftl | 0
.../templates/json/dataframe/github-users.ftl | 0
.../examples/templates/json/md/github-users.ftl | 0
.../templates/properties/csv/locker-test-users.ftl | 0
.../examples/templates/tsv/fo/transactions.ftl | 0
.../examples/templates/xml/txt/recipients.ftl | 0
.../examples/templates/yaml/txt/transform.ftl | 0
.../{ => src}/templates/cat.ftl | 0
.../{ => src}/templates/csv/csv/transform.ftl | 2 +-
.../{ => src}/templates/csv/html/transform.ftl | 2 +-
.../{ => src}/templates/csv/md/transform.ftl | 2 +-
.../{ => src}/templates/excel/csv/transform.ftl | 2 +-
.../{ => src}/templates/excel/html/transform.ftl | 0
.../{ => src}/templates/excel/md/transform.ftl | 0
.../{ => src}/templates/info.ftl | 0
.../{ => src}/templates/json/yaml/transform.ftl | 0
.../{ => src}/templates/lib/commons-csv.ftl | 0
.../{ => src}/templates/yaml/json/transform.ftl | 0
.../freemarker/generator/cli/ExamplesTest.java | 85 ++++++++++-----------
.../freemarker/generator/cli/ManualTest.java | 10 +--
.../generator/cli/TemplateLoadingTest.java | 2 +-
.../cli/config/TemplateDirectorySupplierTest.java | 4 +-
62 files changed, 56 insertions(+), 57 deletions(-)
rename freemarker-generator-cli/{ => src}/examples/data/accesslog/combined-access.log (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/contract.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/dataframe.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/excel-export-utf8.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/locker-test-users.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/sales-records.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/transactions.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/user.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/excel/test-multiple-sheets.xlsx (100%)
rename freemarker-generator-cli/{ => src}/examples/data/excel/test.xls (100%)
rename freemarker-generator-cli/{ => src}/examples/data/excel/test.xlsx (100%)
rename freemarker-generator-cli/{ => src}/examples/data/ftl/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/data/ftl/nginx/nginx.env (100%)
rename freemarker-generator-cli/{ => src}/examples/data/html/dependencies.html (100%)
rename freemarker-generator-cli/{ => src}/examples/data/json/github-users.json (100%)
rename freemarker-generator-cli/{ => src}/examples/data/json/swagger-spec.json (100%)
rename freemarker-generator-cli/{ => src}/examples/data/properties/user_0001/user.properties (100%)
rename freemarker-generator-cli/{ => src}/examples/data/properties/user_0002/user.properties (100%)
rename freemarker-generator-cli/{ => src}/examples/data/properties/user_0003/user.properties (100%)
rename freemarker-generator-cli/{ => src}/examples/data/properties/user_0004/user.properties (100%)
rename freemarker-generator-cli/{ => src}/examples/data/template/application.properties (100%)
rename freemarker-generator-cli/{ => src}/examples/data/template/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/data/xml/recipients.xml (100%)
rename freemarker-generator-cli/{ => src}/examples/data/yaml/customer.yaml (100%)
rename freemarker-generator-cli/{ => src}/examples/data/yaml/swagger-spec.yaml (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/accesslog/combined-access.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/csv/gatling-user-credentials.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/fo/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/html/transactions.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/md/filter.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/shell/curl.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/dataframe/example.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/dataframe/html/print.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/demo.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/excel/csv/custom.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/excel/dataframe/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/html/csv/dependencies.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/html/txt/licence.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/json/csv/swagger-endpoints.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/json/dataframe/github-users.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/json/md/github-users.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/properties/csv/locker-test-users.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/tsv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/xml/txt/recipients.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/yaml/txt/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/cat.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/csv/csv/transform.ftl (95%)
rename freemarker-generator-cli/{ => src}/templates/csv/html/transform.ftl (97%)
rename freemarker-generator-cli/{ => src}/templates/csv/md/transform.ftl (96%)
rename freemarker-generator-cli/{ => src}/templates/excel/csv/transform.ftl (97%)
rename freemarker-generator-cli/{ => src}/templates/excel/html/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/excel/md/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/info.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/json/yaml/transform.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/lib/commons-csv.ftl (100%)
rename freemarker-generator-cli/{ => src}/templates/yaml/json/transform.ftl (100%)
[freemarker-generator] 02/02: FREEMARKER-153 Move
"freemarker-cli/templates" to "freemarker-cli/src/templates"
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 142c3f96253ad61f1e22ae14a668f2dfc979c67e
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Aug 3 21:53:27 2020 +0200
FREEMARKER-153 Move "freemarker-cli/templates" to "freemarker-cli/src/templates"
---
freemarker-generator-cli/pom.xml | 2 +-
.../{ => src}/templates/cat.ftl | 0
.../{ => src}/templates/csv/csv/transform.ftl | 2 +-
.../{ => src}/templates/csv/html/transform.ftl | 2 +-
.../{ => src}/templates/csv/md/transform.ftl | 2 +-
.../{ => src}/templates/excel/csv/transform.ftl | 2 +-
.../{ => src}/templates/excel/html/transform.ftl | 0
.../{ => src}/templates/excel/md/transform.ftl | 0
.../{ => src}/templates/info.ftl | 0
.../{ => src}/templates/json/yaml/transform.ftl | 0
.../{ => src}/templates/lib/commons-csv.ftl | 0
.../{ => src}/templates/yaml/json/transform.ftl | 0
.../freemarker/generator/cli/ExamplesTest.java | 28 +++++++++++-----------
.../freemarker/generator/cli/ManualTest.java | 10 ++++----
.../generator/cli/TemplateLoadingTest.java | 2 +-
.../cli/config/TemplateDirectorySupplierTest.java | 4 ++--
16 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 66310bc..2e8331b 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -78,7 +78,7 @@
<copy file="./src/main/scripts/run-examples.bat" todir="./target/appassembler" />
<copy file="./src/main/scripts/run-examples.sh" todir="./target/appassembler" />
<copy todir="./target/appassembler/templates">
- <fileset dir="templates" />
+ <fileset dir="src/templates" />
</copy>
<copy todir="./target/appassembler/examples">
<fileset dir="src/examples" />
diff --git a/freemarker-generator-cli/templates/cat.ftl b/freemarker-generator-cli/src/templates/cat.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/cat.ftl
rename to freemarker-generator-cli/src/templates/cat.ftl
diff --git a/freemarker-generator-cli/templates/csv/csv/transform.ftl b/freemarker-generator-cli/src/templates/csv/csv/transform.ftl
similarity index 95%
rename from freemarker-generator-cli/templates/csv/csv/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/csv/transform.ftl
index b02082d..0380665 100644
--- a/freemarker-generator-cli/templates/csv/csv/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/csv/transform.ftl
@@ -15,7 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign csvTargetFormat = csv.targetFormat()>
diff --git a/freemarker-generator-cli/templates/csv/html/transform.ftl b/freemarker-generator-cli/src/templates/csv/html/transform.ftl
similarity index 97%
rename from freemarker-generator-cli/templates/csv/html/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/html/transform.ftl
index 7c52f73..fad0c48 100644
--- a/freemarker-generator-cli/templates/csv/html/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/html/transform.ftl
@@ -15,7 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign csvHeaders = csvParser.getHeaderNames()>
diff --git a/freemarker-generator-cli/templates/csv/md/transform.ftl b/freemarker-generator-cli/src/templates/csv/md/transform.ftl
similarity index 96%
rename from freemarker-generator-cli/templates/csv/md/transform.ftl
rename to freemarker-generator-cli/src/templates/csv/md/transform.ftl
index ec50a98..88595b9 100644
--- a/freemarker-generator-cli/templates/csv/md/transform.ftl
+++ b/freemarker-generator-cli/src/templates/csv/md/transform.ftl
@@ -14,7 +14,7 @@
specific language governing permissions and limitations
under the License.
-->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign dataSource = dataSources?values[0]>
<#assign csvParser = tools.csv.parse(dataSource, csv.sourceFormat())>
<#assign headers = (csvParser.getHeaderMap()!{})?keys>
diff --git a/freemarker-generator-cli/templates/excel/csv/transform.ftl b/freemarker-generator-cli/src/templates/excel/csv/transform.ftl
similarity index 97%
rename from freemarker-generator-cli/templates/excel/csv/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/csv/transform.ftl
index 0138bf5..16f150e 100644
--- a/freemarker-generator-cli/templates/excel/csv/transform.ftl
+++ b/freemarker-generator-cli/src/templates/excel/csv/transform.ftl
@@ -16,7 +16,7 @@
under the License.
-->
<#-- Parse the first data source & sheet of the Excel document -->
-<#import "/templates/lib/commons-csv.ftl" as csv />
+<#import "/src/templates/lib/commons-csv.ftl" as csv />
<#assign workbook = tools.excel.parse(dataSources?values[0])>
<#assign sheet = tools.excel.getSheets(workbook)[0]>
<#assign records = tools.excel.toTable(sheet)>
diff --git a/freemarker-generator-cli/templates/excel/html/transform.ftl b/freemarker-generator-cli/src/templates/excel/html/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/excel/html/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/html/transform.ftl
diff --git a/freemarker-generator-cli/templates/excel/md/transform.ftl b/freemarker-generator-cli/src/templates/excel/md/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/excel/md/transform.ftl
rename to freemarker-generator-cli/src/templates/excel/md/transform.ftl
diff --git a/freemarker-generator-cli/templates/info.ftl b/freemarker-generator-cli/src/templates/info.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/info.ftl
rename to freemarker-generator-cli/src/templates/info.ftl
diff --git a/freemarker-generator-cli/templates/json/yaml/transform.ftl b/freemarker-generator-cli/src/templates/json/yaml/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/json/yaml/transform.ftl
rename to freemarker-generator-cli/src/templates/json/yaml/transform.ftl
diff --git a/freemarker-generator-cli/templates/lib/commons-csv.ftl b/freemarker-generator-cli/src/templates/lib/commons-csv.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/lib/commons-csv.ftl
rename to freemarker-generator-cli/src/templates/lib/commons-csv.ftl
diff --git a/freemarker-generator-cli/templates/yaml/json/transform.ftl b/freemarker-generator-cli/src/templates/yaml/json/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/templates/yaml/json/transform.ftl
rename to freemarker-generator-cli/src/templates/yaml/json/transform.ftl
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
index 97f7e77..5df3dde 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
@@ -31,12 +31,12 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunInfo() throws IOException {
- assertValid(execute("-t templates/info.ftl README.md"));
+ assertValid(execute("-t src/templates/info.ftl README.md"));
}
@Test
public void shouldRunMultipleTimes() throws IOException {
- assertValid(execute("--times=2 -t templates/info.ftl README.md"));
+ assertValid(execute("--times=2 -t src/templates/info.ftl README.md"));
}
@Test
@@ -46,22 +46,22 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunCsvExamples() throws IOException {
- assertValid(execute("-t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl src/examples/data/csv/contract.csv"));
assertValid(execute("-t src/examples/templates/csv/shell/curl.ftl src/examples/data/csv/user.csv"));
assertValid(execute("-t src/examples/templates/csv/fo/transform.ftl src/examples/data/csv/locker-test-users.csv"));
assertValid(execute("-t src/examples/templates/csv/fo/transactions.ftl src/examples/data/csv/transactions.csv"));
assertValid(execute("-t src/examples/templates/csv/html/transactions.ftl src/examples/data/csv/transactions.csv"));
- assertValid(execute("-t templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv"));
}
@Test
public void shouldRunExcelExamples() throws IOException {
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xls"));
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xlsx"));
- assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/md/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/csv/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test.xls"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test.xlsx"));
+ assertValid(execute("-t src/templates/excel/html/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/md/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/templates/excel/csv/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
assertValid(execute("-t src/examples/templates/excel/csv/custom.ftl -Pcsv.format=MYSQL src/examples/data/excel/test.xls"));
assertValid(execute("-t src/examples/templates/excel/dataframe/transform.ftl src/examples/data/excel/test.xls"));
}
@@ -75,7 +75,7 @@ public class ExamplesTest extends AbstractMainTest {
public void shouldRunJsonExamples() throws IOException {
assertValid(execute("-t src/examples/templates/json/csv/swagger-endpoints.ftl src/examples/data/json/swagger-spec.json"));
assertValid(execute("-t src/examples/templates/json/md/github-users.ftl src/examples/data/json/github-users.json"));
- assertValid(execute("-t templates/json/yaml/transform.ftl src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-t src/templates/json/yaml/transform.ftl src/examples/data/json/swagger-spec.json"));
}
@Test
@@ -86,7 +86,7 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunYamlExamples() throws IOException {
assertValid(execute("-t src/examples/templates/yaml/txt/transform.ftl src/examples/data/yaml/customer.yaml"));
- assertValid(execute("-t templates/yaml/json/transform.ftl src/examples/data/yaml/swagger-spec.yaml"));
+ assertValid(execute("-t src/templates/yaml/json/transform.ftl src/examples/data/yaml/swagger-spec.yaml"));
}
@Test
@@ -135,8 +135,8 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldTransformMultipleTemplates() throws IOException {
- assertValid(execute("-t templates/csv/md/transform.ftl -t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl -o target/contract.html src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl -t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/templates/csv/md/transform.ftl -o target/contract.md -t src/templates/csv/html/transform.ftl -o target/contract.html src/examples/data/csv/contract.csv"));
}
@Test
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
index 06f8714..62a20a3 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ManualTest.java
@@ -25,11 +25,11 @@ public class ManualTest {
private static final String SPACE = " ";
// private static final String CMD = "-V";
- // private static final String CMD = "-PCSV_SOURCE_FORMAT=DATAFRAME -t examples/templates/dataframe/example.ftl https://raw.githubusercontent.com/nRo/DataFrame/master/src/test/resources/users.csv";
- // private static final String CMD = "-PCSV_SOURCE_WITH_HEADER=false -PCSV_SOURCE_FORMAT=DEFAULT -PCSV_TARGET_FORMAT=EXCEL -PCSV_TARGET_WITH_HEADER=true -t templates/csv/csv/transform.ftl examples/data/csv/contract.csv";
- // private static final String CMD = "-t examples/templates/json/dataframe/github-users.ftl examples/data/json/github-users.json";
- // private static final String CMD = "-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl examples/data/csv/contract.csv";
- private static final String CMD = "-t examples/templates/demo.ftl src/test/data";
+ // private static final String CMD = "-PCSV_SOURCE_FORMAT=DATAFRAME -t src/examples/templates/dataframe/example.ftl https://raw.githubusercontent.com/nRo/DataFrame/master/src/test/resources/users.csv";
+ // private static final String CMD = "-PCSV_SOURCE_WITH_HEADER=false -PCSV_SOURCE_FORMAT=DEFAULT -PCSV_TARGET_FORMAT=EXCEL -PCSV_TARGET_WITH_HEADER=true -t templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv";
+ // private static final String CMD = "-t src/examples/templates/json/dataframe/github-users.ftl src/examples/data/json/github-users.json";
+ // private static final String CMD = "-t src/templates/csv/md/transform.ftl -o target/contract.md -t src/templates/csv/html/transform.ftl src/examples/data/csv/contract.csv";
+ private static final String CMD = "-t src/examples/templates/demo.ftl src/test/data";
public static void main(String[] args) {
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
index 723f4a8..1ec9a0f 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/TemplateLoadingTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
public class TemplateLoadingTest extends AbstractMainTest {
private static final int SUCCESS = 0;
- private static final String ANY_TEMPLATE_NAME = "templates/info.ftl";
+ private static final String ANY_TEMPLATE_NAME = "src/templates/info.ftl";
private static final String CURR_DIR = System.getProperty("user.dir", ".");
@Test
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
index 79c9ea4..adacf38 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateDirectorySupplierTest.java
@@ -38,8 +38,8 @@ public class TemplateDirectorySupplierTest {
@Test
public void shouldAddTemplateDirectory() throws IOException {
- assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("templates").size());
- assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("./templates").size());
+ assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("src/templates").size());
+ assertEquals(nrOfDefaultTemplateDirectories + 1, templateDirectories("./src/templates").size());
}
@Test
[freemarker-generator] 01/02: FREEMARKER-153 Move
"freemarker-cli/examples" to "freemarker-cli/src/examples"
Posted by sg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 8a0c6eca29d8a4defcdd15afb4b8fe5efb4e722d
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Aug 3 21:47:13 2020 +0200
FREEMARKER-153 Move "freemarker-cli/examples" to "freemarker-cli/src/examples"
---
freemarker-generator-cli/pom.xml | 2 +-
.../examples/data/accesslog/combined-access.log | 0
.../{ => src}/examples/data/csv/contract.csv | 0
.../{ => src}/examples/data/csv/dataframe.csv | 0
.../examples/data/csv/excel-export-utf8.csv | 0
.../examples/data/csv/locker-test-users.csv | 0
.../{ => src}/examples/data/csv/sales-records.csv | 0
.../{ => src}/examples/data/csv/transactions.csv | 0
.../{ => src}/examples/data/csv/user.csv | 0
.../examples/data/excel/test-multiple-sheets.xlsx | Bin
.../{ => src}/examples/data/excel/test.xls | Bin
.../{ => src}/examples/data/excel/test.xlsx | Bin
.../examples/data/ftl/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/ftl/nginx/nginx.env | 0
.../{ => src}/examples/data/html/dependencies.html | 0
.../{ => src}/examples/data/json/github-users.json | 0
.../{ => src}/examples/data/json/swagger-spec.json | 0
.../data/properties/user_0001/user.properties | 0
.../data/properties/user_0002/user.properties | 0
.../data/properties/user_0003/user.properties | 0
.../data/properties/user_0004/user.properties | 0
.../examples/data/template/application.properties | 0
.../examples/data/template/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/xml/recipients.xml | 0
.../{ => src}/examples/data/yaml/customer.yaml | 0
.../{ => src}/examples/data/yaml/swagger-spec.yaml | 0
.../templates/accesslog/combined-access.ftl | 0
.../templates/csv/csv/gatling-user-credentials.ftl | 0
.../examples/templates/csv/fo/transactions.ftl | 0
.../examples/templates/csv/fo/transform.ftl | 0
.../examples/templates/csv/html/transactions.ftl | 0
.../{ => src}/examples/templates/csv/md/filter.ftl | 0
.../examples/templates/csv/shell/curl.ftl | 0
.../examples/templates/dataframe/example.ftl | 0
.../examples/templates/dataframe/html/print.ftl | 0
.../{ => src}/examples/templates/demo.ftl | 0
.../examples/templates/excel/csv/custom.ftl | 0
.../templates/excel/dataframe/transform.ftl | 0
.../examples/templates/html/csv/dependencies.ftl | 0
.../examples/templates/html/txt/licence.ftl | 0
.../templates/json/csv/swagger-endpoints.ftl | 0
.../templates/json/dataframe/github-users.ftl | 0
.../examples/templates/json/md/github-users.ftl | 0
.../templates/properties/csv/locker-test-users.ftl | 0
.../examples/templates/tsv/fo/transactions.ftl | 0
.../examples/templates/xml/txt/recipients.ftl | 0
.../examples/templates/yaml/txt/transform.ftl | 0
.../freemarker/generator/cli/ExamplesTest.java | 81 ++++++++++-----------
48 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index ff7c4b0..66310bc 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -81,7 +81,7 @@
<fileset dir="templates" />
</copy>
<copy todir="./target/appassembler/examples">
- <fileset dir="examples" />
+ <fileset dir="src/examples" />
</copy>
<chmod file="./target/appassembler/run-examples.sh" perm="a+x" />
</target>
diff --git a/freemarker-generator-cli/examples/data/accesslog/combined-access.log b/freemarker-generator-cli/src/examples/data/accesslog/combined-access.log
similarity index 100%
rename from freemarker-generator-cli/examples/data/accesslog/combined-access.log
rename to freemarker-generator-cli/src/examples/data/accesslog/combined-access.log
diff --git a/freemarker-generator-cli/examples/data/csv/contract.csv b/freemarker-generator-cli/src/examples/data/csv/contract.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/contract.csv
rename to freemarker-generator-cli/src/examples/data/csv/contract.csv
diff --git a/freemarker-generator-cli/examples/data/csv/dataframe.csv b/freemarker-generator-cli/src/examples/data/csv/dataframe.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/dataframe.csv
rename to freemarker-generator-cli/src/examples/data/csv/dataframe.csv
diff --git a/freemarker-generator-cli/examples/data/csv/excel-export-utf8.csv b/freemarker-generator-cli/src/examples/data/csv/excel-export-utf8.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/excel-export-utf8.csv
rename to freemarker-generator-cli/src/examples/data/csv/excel-export-utf8.csv
diff --git a/freemarker-generator-cli/examples/data/csv/locker-test-users.csv b/freemarker-generator-cli/src/examples/data/csv/locker-test-users.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/locker-test-users.csv
rename to freemarker-generator-cli/src/examples/data/csv/locker-test-users.csv
diff --git a/freemarker-generator-cli/examples/data/csv/sales-records.csv b/freemarker-generator-cli/src/examples/data/csv/sales-records.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/sales-records.csv
rename to freemarker-generator-cli/src/examples/data/csv/sales-records.csv
diff --git a/freemarker-generator-cli/examples/data/csv/transactions.csv b/freemarker-generator-cli/src/examples/data/csv/transactions.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/transactions.csv
rename to freemarker-generator-cli/src/examples/data/csv/transactions.csv
diff --git a/freemarker-generator-cli/examples/data/csv/user.csv b/freemarker-generator-cli/src/examples/data/csv/user.csv
similarity index 100%
rename from freemarker-generator-cli/examples/data/csv/user.csv
rename to freemarker-generator-cli/src/examples/data/csv/user.csv
diff --git a/freemarker-generator-cli/examples/data/excel/test-multiple-sheets.xlsx b/freemarker-generator-cli/src/examples/data/excel/test-multiple-sheets.xlsx
similarity index 100%
rename from freemarker-generator-cli/examples/data/excel/test-multiple-sheets.xlsx
rename to freemarker-generator-cli/src/examples/data/excel/test-multiple-sheets.xlsx
diff --git a/freemarker-generator-cli/examples/data/excel/test.xls b/freemarker-generator-cli/src/examples/data/excel/test.xls
similarity index 100%
rename from freemarker-generator-cli/examples/data/excel/test.xls
rename to freemarker-generator-cli/src/examples/data/excel/test.xls
diff --git a/freemarker-generator-cli/examples/data/excel/test.xlsx b/freemarker-generator-cli/src/examples/data/excel/test.xlsx
similarity index 100%
rename from freemarker-generator-cli/examples/data/excel/test.xlsx
rename to freemarker-generator-cli/src/examples/data/excel/test.xlsx
diff --git a/freemarker-generator-cli/examples/data/ftl/nginx/nginx.conf.ftl b/freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.conf.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/data/ftl/nginx/nginx.conf.ftl
rename to freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.conf.ftl
diff --git a/freemarker-generator-cli/examples/data/ftl/nginx/nginx.env b/freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.env
similarity index 100%
rename from freemarker-generator-cli/examples/data/ftl/nginx/nginx.env
rename to freemarker-generator-cli/src/examples/data/ftl/nginx/nginx.env
diff --git a/freemarker-generator-cli/examples/data/html/dependencies.html b/freemarker-generator-cli/src/examples/data/html/dependencies.html
similarity index 100%
rename from freemarker-generator-cli/examples/data/html/dependencies.html
rename to freemarker-generator-cli/src/examples/data/html/dependencies.html
diff --git a/freemarker-generator-cli/examples/data/json/github-users.json b/freemarker-generator-cli/src/examples/data/json/github-users.json
similarity index 100%
rename from freemarker-generator-cli/examples/data/json/github-users.json
rename to freemarker-generator-cli/src/examples/data/json/github-users.json
diff --git a/freemarker-generator-cli/examples/data/json/swagger-spec.json b/freemarker-generator-cli/src/examples/data/json/swagger-spec.json
similarity index 100%
rename from freemarker-generator-cli/examples/data/json/swagger-spec.json
rename to freemarker-generator-cli/src/examples/data/json/swagger-spec.json
diff --git a/freemarker-generator-cli/examples/data/properties/user_0001/user.properties b/freemarker-generator-cli/src/examples/data/properties/user_0001/user.properties
similarity index 100%
rename from freemarker-generator-cli/examples/data/properties/user_0001/user.properties
rename to freemarker-generator-cli/src/examples/data/properties/user_0001/user.properties
diff --git a/freemarker-generator-cli/examples/data/properties/user_0002/user.properties b/freemarker-generator-cli/src/examples/data/properties/user_0002/user.properties
similarity index 100%
rename from freemarker-generator-cli/examples/data/properties/user_0002/user.properties
rename to freemarker-generator-cli/src/examples/data/properties/user_0002/user.properties
diff --git a/freemarker-generator-cli/examples/data/properties/user_0003/user.properties b/freemarker-generator-cli/src/examples/data/properties/user_0003/user.properties
similarity index 100%
rename from freemarker-generator-cli/examples/data/properties/user_0003/user.properties
rename to freemarker-generator-cli/src/examples/data/properties/user_0003/user.properties
diff --git a/freemarker-generator-cli/examples/data/properties/user_0004/user.properties b/freemarker-generator-cli/src/examples/data/properties/user_0004/user.properties
similarity index 100%
rename from freemarker-generator-cli/examples/data/properties/user_0004/user.properties
rename to freemarker-generator-cli/src/examples/data/properties/user_0004/user.properties
diff --git a/freemarker-generator-cli/examples/data/template/application.properties b/freemarker-generator-cli/src/examples/data/template/application.properties
similarity index 100%
rename from freemarker-generator-cli/examples/data/template/application.properties
rename to freemarker-generator-cli/src/examples/data/template/application.properties
diff --git a/freemarker-generator-cli/examples/data/template/nginx/nginx.conf.ftl b/freemarker-generator-cli/src/examples/data/template/nginx/nginx.conf.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/data/template/nginx/nginx.conf.ftl
rename to freemarker-generator-cli/src/examples/data/template/nginx/nginx.conf.ftl
diff --git a/freemarker-generator-cli/examples/data/xml/recipients.xml b/freemarker-generator-cli/src/examples/data/xml/recipients.xml
similarity index 100%
rename from freemarker-generator-cli/examples/data/xml/recipients.xml
rename to freemarker-generator-cli/src/examples/data/xml/recipients.xml
diff --git a/freemarker-generator-cli/examples/data/yaml/customer.yaml b/freemarker-generator-cli/src/examples/data/yaml/customer.yaml
similarity index 100%
rename from freemarker-generator-cli/examples/data/yaml/customer.yaml
rename to freemarker-generator-cli/src/examples/data/yaml/customer.yaml
diff --git a/freemarker-generator-cli/examples/data/yaml/swagger-spec.yaml b/freemarker-generator-cli/src/examples/data/yaml/swagger-spec.yaml
similarity index 100%
rename from freemarker-generator-cli/examples/data/yaml/swagger-spec.yaml
rename to freemarker-generator-cli/src/examples/data/yaml/swagger-spec.yaml
diff --git a/freemarker-generator-cli/examples/templates/accesslog/combined-access.ftl b/freemarker-generator-cli/src/examples/templates/accesslog/combined-access.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/accesslog/combined-access.ftl
rename to freemarker-generator-cli/src/examples/templates/accesslog/combined-access.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/csv/gatling-user-credentials.ftl b/freemarker-generator-cli/src/examples/templates/csv/csv/gatling-user-credentials.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/csv/gatling-user-credentials.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/csv/gatling-user-credentials.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/fo/transactions.ftl b/freemarker-generator-cli/src/examples/templates/csv/fo/transactions.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/fo/transactions.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/fo/transactions.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/fo/transform.ftl b/freemarker-generator-cli/src/examples/templates/csv/fo/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/fo/transform.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/fo/transform.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/html/transactions.ftl b/freemarker-generator-cli/src/examples/templates/csv/html/transactions.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/html/transactions.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/html/transactions.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/md/filter.ftl b/freemarker-generator-cli/src/examples/templates/csv/md/filter.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/md/filter.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/md/filter.ftl
diff --git a/freemarker-generator-cli/examples/templates/csv/shell/curl.ftl b/freemarker-generator-cli/src/examples/templates/csv/shell/curl.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/csv/shell/curl.ftl
rename to freemarker-generator-cli/src/examples/templates/csv/shell/curl.ftl
diff --git a/freemarker-generator-cli/examples/templates/dataframe/example.ftl b/freemarker-generator-cli/src/examples/templates/dataframe/example.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/dataframe/example.ftl
rename to freemarker-generator-cli/src/examples/templates/dataframe/example.ftl
diff --git a/freemarker-generator-cli/examples/templates/dataframe/html/print.ftl b/freemarker-generator-cli/src/examples/templates/dataframe/html/print.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/dataframe/html/print.ftl
rename to freemarker-generator-cli/src/examples/templates/dataframe/html/print.ftl
diff --git a/freemarker-generator-cli/examples/templates/demo.ftl b/freemarker-generator-cli/src/examples/templates/demo.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/demo.ftl
rename to freemarker-generator-cli/src/examples/templates/demo.ftl
diff --git a/freemarker-generator-cli/examples/templates/excel/csv/custom.ftl b/freemarker-generator-cli/src/examples/templates/excel/csv/custom.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/excel/csv/custom.ftl
rename to freemarker-generator-cli/src/examples/templates/excel/csv/custom.ftl
diff --git a/freemarker-generator-cli/examples/templates/excel/dataframe/transform.ftl b/freemarker-generator-cli/src/examples/templates/excel/dataframe/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/excel/dataframe/transform.ftl
rename to freemarker-generator-cli/src/examples/templates/excel/dataframe/transform.ftl
diff --git a/freemarker-generator-cli/examples/templates/html/csv/dependencies.ftl b/freemarker-generator-cli/src/examples/templates/html/csv/dependencies.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/html/csv/dependencies.ftl
rename to freemarker-generator-cli/src/examples/templates/html/csv/dependencies.ftl
diff --git a/freemarker-generator-cli/examples/templates/html/txt/licence.ftl b/freemarker-generator-cli/src/examples/templates/html/txt/licence.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/html/txt/licence.ftl
rename to freemarker-generator-cli/src/examples/templates/html/txt/licence.ftl
diff --git a/freemarker-generator-cli/examples/templates/json/csv/swagger-endpoints.ftl b/freemarker-generator-cli/src/examples/templates/json/csv/swagger-endpoints.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/json/csv/swagger-endpoints.ftl
rename to freemarker-generator-cli/src/examples/templates/json/csv/swagger-endpoints.ftl
diff --git a/freemarker-generator-cli/examples/templates/json/dataframe/github-users.ftl b/freemarker-generator-cli/src/examples/templates/json/dataframe/github-users.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/json/dataframe/github-users.ftl
rename to freemarker-generator-cli/src/examples/templates/json/dataframe/github-users.ftl
diff --git a/freemarker-generator-cli/examples/templates/json/md/github-users.ftl b/freemarker-generator-cli/src/examples/templates/json/md/github-users.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/json/md/github-users.ftl
rename to freemarker-generator-cli/src/examples/templates/json/md/github-users.ftl
diff --git a/freemarker-generator-cli/examples/templates/properties/csv/locker-test-users.ftl b/freemarker-generator-cli/src/examples/templates/properties/csv/locker-test-users.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/properties/csv/locker-test-users.ftl
rename to freemarker-generator-cli/src/examples/templates/properties/csv/locker-test-users.ftl
diff --git a/freemarker-generator-cli/examples/templates/tsv/fo/transactions.ftl b/freemarker-generator-cli/src/examples/templates/tsv/fo/transactions.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/tsv/fo/transactions.ftl
rename to freemarker-generator-cli/src/examples/templates/tsv/fo/transactions.ftl
diff --git a/freemarker-generator-cli/examples/templates/xml/txt/recipients.ftl b/freemarker-generator-cli/src/examples/templates/xml/txt/recipients.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/xml/txt/recipients.ftl
rename to freemarker-generator-cli/src/examples/templates/xml/txt/recipients.ftl
diff --git a/freemarker-generator-cli/examples/templates/yaml/txt/transform.ftl b/freemarker-generator-cli/src/examples/templates/yaml/txt/transform.ftl
similarity index 100%
rename from freemarker-generator-cli/examples/templates/yaml/txt/transform.ftl
rename to freemarker-generator-cli/src/examples/templates/yaml/txt/transform.ftl
diff --git a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
index d4bf8b2..97f7e77 100644
--- a/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
+++ b/freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/ExamplesTest.java
@@ -41,63 +41,62 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunDemoExamples() throws IOException {
- assertValid(execute("-t examples/templates/demo.ftl README.md"));
+ assertValid(execute("-t src/examples/templates/demo.ftl README.md"));
}
@Test
public void shouldRunCsvExamples() throws IOException {
- assertValid(execute("-t templates/csv/html/transform.ftl examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl examples/data/csv/contract.csv"));
- assertValid(execute("-t examples/templates/csv/shell/curl.ftl examples/data/csv/user.csv"));
- assertValid(execute("-t examples/templates/csv/fo/transform.ftl examples/data/csv/locker-test-users.csv"));
- assertValid(execute("-t examples/templates/csv/fo/transactions.ftl examples/data/csv/transactions.csv"));
- assertValid(execute("-t examples/templates/csv/html/transactions.ftl examples/data/csv/transactions.csv"));
- assertValid(execute("-t templates/csv/csv/transform.ftl examples/data/csv/contract.csv"));
+ assertValid(execute("-t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t templates/csv/md/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t src/examples/templates/csv/shell/curl.ftl src/examples/data/csv/user.csv"));
+ assertValid(execute("-t src/examples/templates/csv/fo/transform.ftl src/examples/data/csv/locker-test-users.csv"));
+ assertValid(execute("-t src/examples/templates/csv/fo/transactions.ftl src/examples/data/csv/transactions.csv"));
+ assertValid(execute("-t src/examples/templates/csv/html/transactions.ftl src/examples/data/csv/transactions.csv"));
+ assertValid(execute("-t templates/csv/csv/transform.ftl src/examples/data/csv/contract.csv"));
}
@Test
public void shouldRunExcelExamples() throws IOException {
- assertValid(execute("-t templates/excel/html/transform.ftl examples/data/excel/test.xls"));
- assertValid(execute("-t templates/excel/html/transform.ftl examples/data/excel/test.xlsx"));
- assertValid(execute("-t templates/excel/html/transform.ftl examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/md/transform.ftl examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t templates/excel/csv/transform.ftl examples/data/excel/test-multiple-sheets.xlsx"));
- assertValid(execute("-t examples/templates/excel/csv/custom.ftl -Pcsv.format=MYSQL examples/data/excel/test.xls"));
- assertValid(execute("-t examples/templates/excel/dataframe/transform.ftl examples/data/excel/test.xls"));
+ assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xls"));
+ assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test.xlsx"));
+ assertValid(execute("-t templates/excel/html/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t templates/excel/md/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t templates/excel/csv/transform.ftl src/examples/data/excel/test-multiple-sheets.xlsx"));
+ assertValid(execute("-t src/examples/templates/excel/csv/custom.ftl -Pcsv.format=MYSQL src/examples/data/excel/test.xls"));
+ assertValid(execute("-t src/examples/templates/excel/dataframe/transform.ftl src/examples/data/excel/test.xls"));
}
@Test
public void shouldRunHtmlExamples() throws IOException {
- assertValid(execute("-t examples/templates/html/csv/dependencies.ftl examples/data/html/dependencies.html"));
- assertValid(execute("-t examples/templates/html/txt/licence.ftl examples/data/html/dependencies.html"));
+ assertValid(execute("-t src/examples/templates/html/csv/dependencies.ftl src/examples/data/html/dependencies.html"));
}
@Test
public void shouldRunJsonExamples() throws IOException {
- assertValid(execute("-t examples/templates/json/csv/swagger-endpoints.ftl examples/data/json/swagger-spec.json"));
- assertValid(execute("-t examples/templates/json/md/github-users.ftl examples/data/json/github-users.json"));
- assertValid(execute("-t templates/json/yaml/transform.ftl examples/data/json/swagger-spec.json"));
+ assertValid(execute("-t src/examples/templates/json/csv/swagger-endpoints.ftl src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-t src/examples/templates/json/md/github-users.ftl src/examples/data/json/github-users.json"));
+ assertValid(execute("-t templates/json/yaml/transform.ftl src/examples/data/json/swagger-spec.json"));
}
@Test
public void shouldRunPropertiesExamples() throws IOException {
- assertValid(execute("-t examples/templates/properties/csv/locker-test-users.ftl examples/data/properties"));
+ assertValid(execute("-t src/examples/templates/properties/csv/locker-test-users.ftl src/examples/data/properties"));
}
@Test
public void shouldRunYamlExamples() throws IOException {
- assertValid(execute("-t examples/templates/yaml/txt/transform.ftl examples/data/yaml/customer.yaml"));
- assertValid(execute("-t templates/yaml/json/transform.ftl examples/data/yaml/swagger-spec.yaml"));
+ assertValid(execute("-t src/examples/templates/yaml/txt/transform.ftl src/examples/data/yaml/customer.yaml"));
+ assertValid(execute("-t templates/yaml/json/transform.ftl src/examples/data/yaml/swagger-spec.yaml"));
}
@Test
public void shouldRunXmlExamples() throws IOException {
- assertValid(execute("-t examples/templates/xml/txt/recipients.ftl examples/data/xml/recipients.xml"));
+ assertValid(execute("-t src/examples/templates/xml/txt/recipients.ftl src/examples/data/xml/recipients.xml"));
}
@Test
public void shouldRunGrokExamples() throws IOException {
- assertValid(execute("-t examples/templates/accesslog/combined-access.ftl examples/data/accesslog/combined-access.log"));
+ assertValid(execute("-t src/examples/templates/accesslog/combined-access.ftl src/examples/data/accesslog/combined-access.log"));
}
@Test
@@ -107,42 +106,42 @@ public class ExamplesTest extends AbstractMainTest {
@Test
public void shouldRunDataFrameExamples() throws IOException {
- assertValid(execute("-PCSV_SOURCE_DELIMITER=SEMICOLON -PCSV_SOURCE_WITH_HEADER=true -t examples/templates/dataframe/example.ftl examples/data/csv/dataframe.csv"));
+ assertValid(execute("-PCSV_SOURCE_DELIMITER=SEMICOLON -PCSV_SOURCE_WITH_HEADER=true -t src/examples/templates/dataframe/example.ftl src/examples/data/csv/dataframe.csv"));
}
@Test
public void shouldRunInteractiveTemplateExamples() throws IOException {
- assertValid(execute("-i ${tools.jsonpath.parse(dataSources?values[0]).read(\"$.info.title\")} examples/data/json/swagger-spec.json"));
- assertValid(execute("-i ${tools.xml.parse(dataSources?values[0])[\"recipients/person[1]/name\"]} examples/data/xml/recipients.xml"));
- assertValid(execute("-i ${tools.jsoup.parse(dataSources?values[0]).select(\"a\")[0]} examples/data/html/dependencies.html"));
- assertValid(execute("-i ${tools.gson.toJson(tools.yaml.parse(dataSources?values[0]))} examples/data/yaml/swagger-spec.yaml"));
- assertValid(execute("-i ${tools.gson.toJson(yaml)} -m yaml=examples/data/yaml/swagger-spec.yaml"));
- assertValid(execute("-i ${tools.yaml.toYaml(tools.gson.parse(dataSources?values[0]))} examples/data/json/swagger-spec.json"));
- assertValid(execute("-i ${tools.yaml.toYaml(json)} -m json=examples/data/json/swagger-spec.json"));
- assertValid(execute("-i ${tools.dataframe.print(tools.dataframe.fromMaps(tools.gson.parse(dataSources?values[0])))} examples/data/json/github-users.json"));
+ assertValid(execute("-i ${tools.jsonpath.parse(dataSources?values[0]).read(\"$.info.title\")} src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-i ${tools.xml.parse(dataSources?values[0])[\"recipients/person[1]/name\"]} src/examples/data/xml/recipients.xml"));
+ assertValid(execute("-i ${tools.jsoup.parse(dataSources?values[0]).select(\"a\")[0]} src/examples/data/html/dependencies.html"));
+ assertValid(execute("-i ${tools.gson.toJson(tools.yaml.parse(dataSources?values[0]))} src/examples/data/yaml/swagger-spec.yaml"));
+ assertValid(execute("-i ${tools.gson.toJson(yaml)} -m yaml=src/examples/data/yaml/swagger-spec.yaml"));
+ assertValid(execute("-i ${tools.yaml.toYaml(tools.gson.parse(dataSources?values[0]))} src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-i ${tools.yaml.toYaml(json)} -m json=src/examples/data/json/swagger-spec.json"));
+ assertValid(execute("-i ${tools.dataframe.print(tools.dataframe.fromMaps(tools.gson.parse(dataSources?values[0])))} src/examples/data/json/github-users.json"));
}
@Test
public void shouldTransformSingleTemplateDirectory() throws IOException {
- assertTrue(execute("-t examples/data/template").contains("server.name=127.0.0.1"));
- assertTrue(execute("-t examples/data/template -PNGINX_HOSTNAME=my.domain.com").contains("server.name=my.domain.com"));
+ assertTrue(execute("-t src/examples/data/template").contains("server.name=127.0.0.1"));
+ assertTrue(execute("-t src/examples/data/template -PNGINX_HOSTNAME=my.domain.com").contains("server.name=my.domain.com"));
}
@Test
public void shouldTransformMultipleTemplateDirectories() throws IOException {
- assertValid(execute("-t examples/data/template -t examples/data/template"));
- assertValid(execute("-t examples/data/template -o target/out/template1 -t examples/data/template -o target/out/template2"));
+ assertValid(execute("-t src/examples/data/template -t src/examples/data/template"));
+ assertValid(execute("-t src/examples/data/template -o target/out/template1 -t src/examples/data/template -o target/out/template2"));
}
@Test
public void shouldTransformMultipleTemplates() throws IOException {
- assertValid(execute("-t templates/csv/md/transform.ftl -t templates/csv/html/transform.ftl examples/data/csv/contract.csv"));
- assertValid(execute("-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl -o target/contract.html examples/data/csv/contract.csv"));
+ assertValid(execute("-t templates/csv/md/transform.ftl -t templates/csv/html/transform.ftl src/examples/data/csv/contract.csv"));
+ assertValid(execute("-t templates/csv/md/transform.ftl -o target/contract.md -t templates/csv/html/transform.ftl -o target/contract.html src/examples/data/csv/contract.csv"));
}
@Test
public void shouldSupportDataSourcesAccessInFTL() throws IOException {
- final String args = "users=examples/data/json/github-users.json contract=examples/data/csv/contract.csv";
+ final String args = "users=src/examples/data/json/github-users.json contract=src/examples/data/csv/contract.csv";
// check FreeMarker directives
assertEquals("true", execute(args + " -i ${dataSources?has_content?c}"));