From a6d4dcb4ac2f6c9608718e18e101167664474d5f Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Tue, 19 Sep 2023 18:15:54 +0200 Subject: [PATCH] [3.0.6] - 2023-09-19 Added test coverage --- CHANGELOG.md | 2 + fj-doc-base-json/pom.xml | 2 +- fj-doc-base-yaml/pom.xml | 2 +- fj-doc-base/pom.xml | 2 +- fj-doc-freemarker/pom.xml | 2 +- .../process/FreemarkerDocProcessConfig.java | 4 +- .../TestFreemarkerDocProcessConfig.java | 25 +++++++++++ .../fj_doc_test/template/test_02.ftl | 42 +++++++++++++++++++ fj-doc-lib-autodoc/pom.xml | 2 +- fj-doc-lib-simpletable-import/pom.xml | 2 +- fj-doc-lib-simpletable/pom.xml | 2 +- fj-doc-mod-fop/pom.xml | 2 +- fj-doc-mod-opencsv/pom.xml | 2 +- fj-doc-mod-poi/pom.xml | 2 +- fj-doc-playground-quarkus/pom.xml | 2 +- fj-doc-sample/pom.xml | 2 +- fj-doc-tool/pom.xml | 2 +- fj-doc-val-core/pom.xml | 2 +- fj-doc-val-pdfbox/pom.xml | 2 +- fj-doc-val-poi/pom.xml | 2 +- fj-doc-val/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 fj-doc-freemarker/src/test/resources/fj_doc_test/template/test_02.ftl diff --git a/CHANGELOG.md b/CHANGELOG.md index 93b43e7b5..927ba9c52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.0.6] - 2023-09-19 + ### Added - method FreemarkerDocProcessConfig.fullProcess() with minimal parameters, generating the document and returning xml data. diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml index e22731364..6f316d91c 100644 --- a/fj-doc-base-json/pom.xml +++ b/fj-doc-base-json/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-base-json diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml index c47e8b6d2..450163193 100644 --- a/fj-doc-base-yaml/pom.xml +++ b/fj-doc-base-yaml/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-base-yaml diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml index 579b5a226..f278c0d7e 100644 --- a/fj-doc-base/pom.xml +++ b/fj-doc-base/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-base diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml index 65e710426..d996a79c7 100644 --- a/fj-doc-freemarker/pom.xml +++ b/fj-doc-freemarker/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-freemarker diff --git a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java index 039569bff..bd8cd1aa3 100644 --- a/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java +++ b/fj-doc-freemarker/src/main/java/org/fugerit/java/doc/freemarker/process/FreemarkerDocProcessConfig.java @@ -102,8 +102,8 @@ public MiniFilterChain getChainCache(String id) throws Exception { MiniFilterChain chain = null; if ( this.docProcessConfig.getKeys().contains( id ) ) { chain = this.docProcessConfig.getChain(id); - } else if ( this.defaultChain != null ) { - chain = this.defaultChain.newDefaultChain(id); + } else if ( this.getDefaultChain() != null ) { + chain = this.getDefaultChain().newDefaultChain(id); this.setChain(id, chain); } return chain; diff --git a/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java b/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java index 0afac3133..957ccd8fc 100644 --- a/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java +++ b/fj-doc-freemarker/src/test/java/test/org/fugerit/java/doc/freemarker/process/TestFreemarkerDocProcessConfig.java @@ -7,10 +7,14 @@ import java.io.Reader; import org.fugerit.java.core.cfg.ConfigException; +import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.base.config.DocConfig; +import org.fugerit.java.doc.base.config.DocOutput; import org.fugerit.java.doc.base.process.DocProcessContext; +import org.fugerit.java.doc.base.process.DocProcessData; import org.fugerit.java.doc.freemarker.config.FreeMarkerConfigStep; +import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandlerUTF8; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigValidator; @@ -69,6 +73,7 @@ public void testConfigRead002() { FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://fj_doc_test/freemarker-doc-process_alt.xml" ); Assert.assertNotNull( config ); this.templateTesting(config); + log.info( "keys : {}", config.getKeys() ); } @Test @@ -100,4 +105,24 @@ public void testNewSimpleConfigVersion() { } } + @Test + public void testProcess() { + SafeFunction.apply( () -> { + FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.newSimpleConfig( "simple-config-003", "/fj_doc_test/template/" ); + // test full process + try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { + DocProcessData data = config.fullProcess( "test_02" , + DocProcessContext.newContext(), FreeMarkerHtmlTypeHandlerUTF8.HANDLER, DocOutput.newOutput(baos) ); + Assert.assertNotEquals( 0 , data.getCurrentXmlData().length() ); + } + // test process 1 + try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { + DocProcessData data = new DocProcessData(); + config.process( "test_02" , DocProcessContext.newContext(), data, FreeMarkerHtmlTypeHandlerUTF8.HANDLER, DocOutput.newOutput(baos) ); + Assert.assertNotEquals( 0 , data.getCurrentXmlData().length() ); + } + } ); + } + + } diff --git a/fj-doc-freemarker/src/test/resources/fj_doc_test/template/test_02.ftl b/fj-doc-freemarker/src/test/resources/fj_doc_test/template/test_02.ftl new file mode 100644 index 000000000..9f86c799c --- /dev/null +++ b/fj-doc-freemarker/src/test/resources/fj_doc_test/template/test_02.ftl @@ -0,0 +1,42 @@ + + + + + + + + + 10;10;10;30 + + + excel-table=print + 450 + + excel-table + + + + ${r"${currentPage}"} / ${r"${pageCount}"} + + + + + + + + + Name + Surname + Title + +
+ + + \ No newline at end of file diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml index 2b27e1e9a..948092168 100644 --- a/fj-doc-lib-autodoc/pom.xml +++ b/fj-doc-lib-autodoc/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-lib-autodoc diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml index 9d1777036..9dcffd5d1 100644 --- a/fj-doc-lib-simpletable-import/pom.xml +++ b/fj-doc-lib-simpletable-import/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-lib-simpletable-import diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml index 5f04b59ab..81276b413 100644 --- a/fj-doc-lib-simpletable/pom.xml +++ b/fj-doc-lib-simpletable/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-lib-simpletable diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml index 1c426548a..7e08725dd 100644 --- a/fj-doc-mod-fop/pom.xml +++ b/fj-doc-mod-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-mod-fop diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml index f2cac7c79..cf0e14611 100644 --- a/fj-doc-mod-opencsv/pom.xml +++ b/fj-doc-mod-opencsv/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-mod-opencsv diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index f8b41a9c7..782d1af24 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-mod-poi diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml index cd009508a..dffa6620c 100644 --- a/fj-doc-playground-quarkus/pom.xml +++ b/fj-doc-playground-quarkus/pom.xml @@ -4,7 +4,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-playground-quarkus diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index 26edf50fb..58914cd27 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-sample diff --git a/fj-doc-tool/pom.xml b/fj-doc-tool/pom.xml index cc82daa1b..fad1acd41 100644 --- a/fj-doc-tool/pom.xml +++ b/fj-doc-tool/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-tool diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml index 8763104e1..16028d972 100644 --- a/fj-doc-val-core/pom.xml +++ b/fj-doc-val-core/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-val-core diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml index 24a7b0de0..73ef8e300 100644 --- a/fj-doc-val-pdfbox/pom.xml +++ b/fj-doc-val-pdfbox/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-val-pdfbox diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml index b8874c9dc..9d5e88fff 100644 --- a/fj-doc-val-poi/pom.xml +++ b/fj-doc-val-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-val-poi diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml index 5d728dbae..9cdabfc15 100644 --- a/fj-doc-val/pom.xml +++ b/fj-doc-val/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 3.0.5 + 3.0.6 fj-doc-val diff --git a/pom.xml b/pom.xml index 4bcaa29ff..2f399d422 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ fj-doc - 3.0.5 + 3.0.6 pom fj-doc