diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index 28cc17c4a..eb0ba2e6a 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -116,8 +116,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java index 88ed9f377..ddd14e2dc 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java @@ -1,18 +1,18 @@ package test.org.fugerit.java.doc.sample.config; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import org.fugerit.java.doc.base.facade.DocHandlerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestDocHandlerFactory { +class TestDocHandlerFactory { private final static Logger logger = LoggerFactory.getLogger( TestDocHandlerFactory.class ); @Test - public void initDocFactoryTest() { + void initDocFactoryTest() { try { String path = "cl://config/doc-handler-sample.xml"; DocHandlerFactory factory = DocHandlerFactory.newInstance( path ); diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/coverage/TestCoverageHelper.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/coverage/TestCoverageHelper.java index 5233958f3..523100bb3 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/coverage/TestCoverageHelper.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/coverage/TestCoverageHelper.java @@ -15,12 +15,12 @@ import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; import org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler; import org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; @Slf4j -public class TestCoverageHelper { +class TestCoverageHelper { private static final DocTypeHandler[] HANDLERS = { SimpleMarkdownBasicTypeHandler.HANDLER, SimpleMarkdownExtTypeHandler.HANDLER, PdfFopTypeHandler.HANDLER, @@ -32,7 +32,7 @@ public class TestCoverageHelper { "coverage/default_doc.xml" }; @Test - public void testHandlers() { + void testHandlers() { Arrays.asList(HANDLERS).stream().forEach(handler -> { Arrays.asList(TEMPLATES).stream().forEach(template -> { SafeFunction.apply(() -> { diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/AutodocDetailFullDocHelper.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/AutodocDetailFullDocHelper.java index 22d6b59f7..799c51d35 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/AutodocDetailFullDocHelper.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/AutodocDetailFullDocHelper.java @@ -7,7 +7,7 @@ public class AutodocDetailFullDocHelper extends BasicFacadeTest { public AutodocDetailFullDocHelper() { - super( "full_doc_header_footer", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); + super.setup( "full_doc_header_footer", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/DevHelper.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/DevHelper.java index 9f4de5cf6..41f1a9929 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/DevHelper.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/DevHelper.java @@ -30,7 +30,7 @@ import org.fugerit.java.doc.mod.fop.FopConfigDefault; import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler; import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,8 +40,8 @@ public class DevHelper { private final static Logger logger = LoggerFactory.getLogger( DevHelper.class ); - @BeforeClass - public static void initPath() { + @BeforeAll + static void initPath() { File baseOut = new File( BasicFacadeTest.BASIC_OUTPUT_PATH ); if ( !baseOut.exists() ) { logger.info( "create base dir -> {} -> {}", baseOut.getAbsolutePath(), baseOut.mkdirs() ); diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestFo01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestFo01.java index 5c227d12d..923ed46f3 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestFo01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestFo01.java @@ -2,18 +2,18 @@ import java.io.File; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestFo01 extends DevHelper { +class TestFo01 extends DevHelper { @Test - public void test01() throws Exception { + void test01() throws Exception { String testCase = "test-fo-01"; boolean res = this.workerFoToPdf( new File( "src/test/resources/dev/"+testCase+".fo" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+".pdf" ) ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestHtml01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestHtml01.java index 28e8fe2d7..c46410496 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestHtml01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestHtml01.java @@ -3,18 +3,18 @@ import java.io.File; import org.fugerit.java.doc.base.config.DocConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestHtml01 extends DevHelper { +class TestHtml01 extends DevHelper { @Test - public void test01() throws Exception { + void test01() throws Exception { String testCase = "test-xml-01"; boolean res = this.workerXmlToHtml( new File( "src/test/resources/dev/"+testCase+"."+DocConfig.TYPE_XML ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+DocConfig.TYPE_HTML) ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestItext2.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestItext2.java index 57c2ca724..7e6c36723 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestItext2.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestItext2.java @@ -14,15 +14,15 @@ import org.fugerit.java.doc.base.facade.DocFacade; import org.fugerit.java.doc.base.model.DocBase; import org.fugerit.java.doc.mod.openpdf.ext.PdfTypeHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestItext2 extends DevHelper { +class TestItext2 extends DevHelper { @Test - public void test01FoPdf() throws Exception { + void test01FoPdf() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; String type = DocConfig.TYPE_PDF; @@ -32,7 +32,7 @@ public void test01FoPdf() throws Exception { DocBase doc = DocFacade.parse( input ); handler.handle( DocInput.newInput( type, doc) , DocOutput.newOutput( output ) ); } - Assert.assertTrue( true ); + Assertions.assertTrue( true ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestMarkdown01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestMarkdown01.java index 5a0e93978..ad85601f4 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestMarkdown01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestMarkdown01.java @@ -5,21 +5,21 @@ import org.fugerit.java.doc.base.config.DocTypeHandler; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestMarkdown01 extends DevHelper { +class TestMarkdown01 extends DevHelper { @Test - public void test01() throws Exception { + void test01() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; DocTypeHandler handler = SimpleMarkdownExtTypeHandler.HANDLER; boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java index 8a24b3688..cc2e69cb4 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java @@ -6,42 +6,42 @@ import org.fugerit.java.doc.base.config.DocTypeHandler; import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler; import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestXml01 extends DevHelper { +class TestXml01 extends DevHelper { //@Test - public void test01() throws Exception { + void test01() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; DocTypeHandler handler = PdfFopTypeHandler.HANDLER; boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } @Test - public void test01FoPdf() throws Exception { + void test01FoPdf() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; DocTypeHandler handler = PdfFopTypeHandler.HANDLER; boolean res = this.workerXmlToFoToPdf( new File( "src/test/resources/dev/"+testCase+".xml" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+".fo" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ) ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } @Test - public void test01Html() throws Exception { + void test01Html() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER; boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ), new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler ); - Assert.assertTrue( res ); + Assertions.assertTrue( res ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/BasicFacadeTest.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/BasicFacadeTest.java index 42133aa1c..8fc44b20d 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/BasicFacadeTest.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/BasicFacadeTest.java @@ -22,7 +22,7 @@ import org.fugerit.java.doc.base.parser.DocValidationResult; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,11 +51,11 @@ public class BasicFacadeTest { private boolean validate; public BasicFacadeTest() { - this( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML ); + this.setup( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML ); this.validate = VALIDATE_DEFAULT; } - protected BasicFacadeTest( String nameBase, String ...typeList ) { + protected void setup( String nameBase, String ...typeList ) { this.checkpoints = Checkpoints.newInstance( CheckpointFormatHelper.DEFAULT_DECORATION ); this.nameBase = nameBase; this.types = new ArrayList<>(); @@ -164,7 +164,7 @@ public void produce( File outputFolder, String facadeId, DocBase doc, Reader rea } @Test - public void produce() throws Exception { + void produce() throws Exception { File baseFile = new File(BASIC_OUTPUT_PATH); if (!baseFile.exists()) { logger.info("Create base path : {} ({})", baseFile.mkdirs(), baseFile.getCanonicalPath()); diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestAutodocHelper.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestAutodocHelper.java index 3d545ee47..5a15aacfe 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestAutodocHelper.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestAutodocHelper.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.base.config.DocConfig; -public class TestAutodocHelper extends BasicFacadeTest { +class TestAutodocHelper extends BasicFacadeTest { public TestAutodocHelper() { - super( "autodoc_helper", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLSX, DocConfig.TYPE_HTML ); + super.setup( "autodoc_helper", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLSX, DocConfig.TYPE_HTML ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocCatalogSample.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocCatalogSample.java index 6e2314aef..2b0521e68 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocCatalogSample.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocCatalogSample.java @@ -1,28 +1,28 @@ package test.org.fugerit.java.doc.sample.facade; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import org.fugerit.java.core.io.StreamIO; import org.fugerit.java.core.util.collection.ListMapStringKey; import org.fugerit.java.doc.sample.facade.DocCatalogEntry; import org.fugerit.java.doc.sample.facade.DocCatalogSample; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestDocCatalogSample { +class TestDocCatalogSample { private static final Logger logger = LoggerFactory.getLogger( TestDocCatalogSample.class ); @Test - public void testConfig() { + void testConfig() { try { DocCatalogSample catalog = DocCatalogSample.getInstance(); - assertNotNull( "catalog must exists", catalog ); + assertNotNull( catalog ); ListMapStringKey list = catalog.getPlaygroundCoreCatalog(); DocCatalogEntry entry = list.get( "default" ); - assertNotNull( "default entry must exists", entry ); + assertNotNull( entry ); String content = StreamIO.readString( catalog.entryReader(entry) ); logger.info( "entry -> {}, content -> {}", entry, content ); assertNotNull( "entry content must exists", content ); diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocFacadeSource.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocFacadeSource.java index 02bf92e74..837ef4c28 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocFacadeSource.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocFacadeSource.java @@ -4,24 +4,24 @@ import org.fugerit.java.doc.base.facade.DocFacadeSource; import org.fugerit.java.doc.base.kotlin.parse.DocKotlinParser; import org.fugerit.java.doc.base.parser.DocParser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j -public class TestDocFacadeSource { +class TestDocFacadeSource { @Test - public void testKotlinYaml() { + void testKotlinYaml() { DocParser docParser = DocFacadeSource.getInstance().getParserForSource( DocFacadeSource.SOURCE_TYPE_YAML ); log.info( "docParser yaml : {}", docParser ); - Assert.assertNotNull( docParser ); + Assertions.assertNotNull( docParser ); } @Test - public void testKotlinSource() { + void testKotlinSource() { DocParser docParser = DocFacadeSource.getInstance().getParserForSource( DocFacadeSource.SOURCE_TYPE_KOTLIN ); log.info( "docParser kotlin : {}", docParser ); - Assert.assertNotNull( docParser ); + Assertions.assertNotNull( docParser ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01.java index ecf0468c0..3e02950df 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.base.config.DocConfig; -public class TestIntro01 extends BasicFacadeTest { +class TestIntro01 extends BasicFacadeTest { public TestIntro01() { - super( "intro_01", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML ); + super.setup( "intro_01", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Json.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Json.java index 497d3453b..0e1e66ae9 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Json.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Json.java @@ -2,11 +2,10 @@ import org.fugerit.java.doc.base.config.DocConfig; -public class TestIntro01Json extends BasicFacadeTest { +class TestIntro01Json extends BasicFacadeTest { public TestIntro01Json() { - super( "intro_01.json", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); - //super( "intro_01.json", DocConfig.TYPE_MD ); + super.setup( "intro_01.json", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Yaml.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Yaml.java index d6709e979..fb3b1451c 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Yaml.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Yaml.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.base.config.DocConfig; -public class TestIntro01Yaml extends BasicFacadeTest { +class TestIntro01Yaml extends BasicFacadeTest { public TestIntro01Yaml() { - super( "intro_01.yaml", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); + super.setup( "intro_01.yaml", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro02.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro02.java index 9c66f2b28..9a3d1ef33 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro02.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro02.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.base.config.DocConfig; -public class TestIntro02 extends BasicFacadeTest { +class TestIntro02 extends BasicFacadeTest { public TestIntro02() { - super( "intro_02", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); + super.setup( "intro_02", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestKotlinScript.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestKotlinScript.java index a33e75f7b..42025c2da 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestKotlinScript.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestKotlinScript.java @@ -2,13 +2,13 @@ import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.base.process.DocProcessContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileOutputStream; -public class TestKotlinScript extends BasicFacadeTest { +class TestKotlinScript extends BasicFacadeTest { @Test @Override @@ -25,6 +25,6 @@ public void produce() throws Exception { PROCESSCONFIG.fullProcess( chaindId, context, handleID, os ); } } - Assert.assertTrue(baseFile.exists()); + Assertions.assertTrue(baseFile.exists()); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/format/TestPOI.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/format/TestPOI.java index fab2fd521..b4c5e2a3c 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/format/TestPOI.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/format/TestPOI.java @@ -12,12 +12,12 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; -public class TestPOI extends TestFormatBase { +class TestPOI extends TestFormatBase { private void close( Workbook workbook, String test ) throws Exception { File file = this.getFile( BasicFacadeTest.BASIC_OUTPUT_PATH, test+".xlsx" ); @@ -29,7 +29,7 @@ private void close( Workbook workbook, String test ) throws Exception { } @Test - public void testCellForegroundColor() throws Exception { + void testCellForegroundColor() throws Exception { boolean ok = false; String test = "cell_foreground_color"; Workbook workbook = new XSSFWorkbook(); @@ -50,7 +50,7 @@ public void testCellForegroundColor() throws Exception { cell.setCellStyle( style ); close( workbook, test ); ok = true; - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/BasicFreeMarkerTest.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/BasicFreeMarkerTest.java index a19c262a7..debf16660 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/BasicFreeMarkerTest.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/BasicFreeMarkerTest.java @@ -11,11 +11,11 @@ public class BasicFreeMarkerTest extends BasicFacadeTest { public BasicFreeMarkerTest() { - this( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_CSV ); + this.setupFreemMarker( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_CSV ); } - protected BasicFreeMarkerTest(String nameBase, String... typeList) { - super(nameBase, typeList); + protected void setupFreemMarker(String nameBase, String... typeList) { + super.setup(nameBase, typeList); } @Override diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestDocHandlerFacade.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestDocHandlerFacade.java index 9a691057e..c8ceb4355 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestDocHandlerFacade.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestDocHandlerFacade.java @@ -6,8 +6,8 @@ import org.fugerit.java.doc.base.process.DocProcessContext; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileOutputStream; @@ -17,7 +17,7 @@ * Test case or issue : https://github.com/fugerit-org/fj-doc/issues/52 */ @Slf4j -public class TestDocHandlerFacade { +class TestDocHandlerFacade { private static final String PDF_A_UA_FOP = "pdf-a-ua-fop"; @@ -25,7 +25,7 @@ public class TestDocHandlerFacade { FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://config/freemarker-doc-process-test-doc-handler.xml" ); @Test - public void testDocHandlers() throws Exception { + void testDocHandlers() throws Exception { DocHandlerFacade facade = config.getFacade(); for ( DocTypeHandler handler : new LinkedHashSet<>( facade.handlers() ) ) { log.info( "current handler : {}", handler ); @@ -35,7 +35,7 @@ public void testDocHandlers() throws Exception { try (FileOutputStream fos = new FileOutputStream( file )) { config.fullProcess( "pdf_a_test", DocProcessContext.newContext(), PDF_A_UA_FOP, fos ); } - Assert.assertTrue( file.exists() ); + Assertions.assertTrue( file.exists() ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01.java index a1bec3adf..354b44062 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01.java @@ -5,7 +5,7 @@ public class TestFreeMarker01 extends BasicFreeMarkerTest { public TestFreeMarker01() { - super( "free-marker-01", DocConfig.TYPE_FO, + super.setupFreemMarker( "free-marker-01", DocConfig.TYPE_FO, DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_HTML); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java index 127adaeb2..68aa59fcb 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01Fop.java @@ -5,7 +5,7 @@ public class TestFreeMarker01Fop extends BasicFreeMarkerTest { public TestFreeMarker01Fop() { - super( "free-marker-01-fop", DocConfig.TYPE_FO, DocConfig.TYPE_PDF ); + super.setupFreemMarker( "free-marker-01-fop", DocConfig.TYPE_FO, DocConfig.TYPE_PDF ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java index a7cc0cd0a..43589a2d9 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FreeMarkerHtml.java @@ -5,7 +5,7 @@ public class TestFreeMarker01FreeMarkerHtml extends BasicFreeMarkerTest { public TestFreeMarker01FreeMarkerHtml() { - super( "free-marker-01-fop", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT ); + super.setupFreemMarker( "free-marker-01-fop", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java index 4fa4fc911..9cdf5b9dd 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker01FullFacade.java @@ -6,7 +6,7 @@ public class TestFreeMarker01FullFacade extends BasicFreeMarkerTest { public TestFreeMarker01FullFacade() { - super( "full-facade-01", + super.setupFreemMarker( "full-facade-01", FreeMarkerFopTypeHandler.HANDLER.getKey(), PdfFopTypeHandler.HANDLER.getKey() ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker02.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker02.java index fe4423937..aada5f530 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker02.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarker02.java @@ -5,7 +5,7 @@ public class TestFreeMarker02 extends BasicFreeMarkerTest { public TestFreeMarker02() { - super( "free-marker-02", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); + super.setupFreemMarker( "free-marker-02", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerColorTest.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerColorTest.java index 41011c8e2..24bb51534 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerColorTest.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerColorTest.java @@ -5,7 +5,7 @@ public class TestFreeMarkerColorTest extends BasicFreeMarkerTest { public TestFreeMarkerColorTest() { - super( "free-marker-color-test", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); + super.setupFreemMarker( "free-marker-color-test", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java index d0e58f654..38706bfaf 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFopFont.java @@ -5,7 +5,7 @@ public class TestFreeMarkerFopFont extends BasicFreeMarkerTest { public TestFreeMarkerFopFont() { - super( "free-marker-test-fop-font", DocConfig.TYPE_FO, DocConfig.TYPE_PDF, DocConfig.TYPE_HTML ); + super.setupFreemMarker( "free-marker-test-fop-font", DocConfig.TYPE_FO, DocConfig.TYPE_PDF, DocConfig.TYPE_HTML ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFormatTest.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFormatTest.java index ce45c1331..acd6f4450 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFormatTest.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreeMarkerFormatTest.java @@ -5,7 +5,7 @@ public class TestFreeMarkerFormatTest extends BasicFreeMarkerTest { public TestFreeMarkerFormatTest() { - super( "free-marker-format-test", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); + super.setupFreemMarker( "free-marker-format-test", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML, DocConfig.TYPE_XLSX ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreemarkerConfigValidation.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreemarkerConfigValidation.java index 74ae17653..9831189cf 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreemarkerConfigValidation.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestFreemarkerConfigValidation.java @@ -5,16 +5,16 @@ import org.fugerit.java.core.cfg.ConfigRuntimeException; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestFreemarkerConfigValidation { +class TestFreemarkerConfigValidation { @Test - public void testValidation() { + void testValidation() { try ( InputStreamReader xmlReader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "config/freemarker-doc-process.xml" ) ) ) { boolean valid = FreemarkerDocProcessConfigValidator.logValidation( xmlReader ); - Assert.assertTrue( "Xml non valido", valid ); + Assertions.assertTrue( valid ); } catch (Exception e) { throw new ConfigRuntimeException( "Exception on testValidation : "+e, e ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfA.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfA.java index 3c57fcec3..1c860720e 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfA.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfA.java @@ -5,7 +5,7 @@ public class TestPdfA extends BasicFreeMarkerTest { public TestPdfA() { - super( "pdf_a_test", DocConfig.TYPE_FO, DocConfig.TYPE_PDF, PDF_A_FOP, PDF_UA_FOP ); + super.setupFreemMarker( "pdf_a_test", DocConfig.TYPE_FO, DocConfig.TYPE_PDF, PDF_A_FOP, PDF_UA_FOP ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfADirect.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfADirect.java index 8de21e7f9..ee3f1a9ab 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfADirect.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfADirect.java @@ -1,7 +1,7 @@ package test.org.fugerit.java.doc.sample.freemarker; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -13,13 +13,13 @@ import org.fugerit.java.doc.base.process.DocProcessContext; import org.fugerit.java.doc.base.process.DocProcessData; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; @Slf4j -public class TestPdfADirect { +class TestPdfADirect { private void testWorker( String handlerRef ) { FreemarkerDocProcessConfig config = BasicFacadeTest.getPROCESSCONFIG(); @@ -38,17 +38,17 @@ private void testWorker( String handlerRef ) { } @Test - public void testPDFADirectFormat() { + void testPDFADirectFormat() { this.testWorker( DocConfig.FORMAT_PDF_A_1B ); } @Test - public void testPDFADirectId() { + void testPDFADirectId() { this.testWorker( BasicFacadeTest.PDF_A_FOP ); } @Test - public void testPDFDirectType() { + void testPDFDirectType() { this.testWorker( DocConfig.TYPE_PDF ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfAUA.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfAUA.java index 3cd20ae92..93d4c2a49 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfAUA.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/freemarker/TestPdfAUA.java @@ -3,8 +3,8 @@ import org.fugerit.java.doc.base.process.DocProcessContext; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileOutputStream; @@ -12,7 +12,7 @@ /* * Test case or issue : https://github.com/fugerit-org/fj-doc/issues/52 */ -public class TestPdfAUA { +class TestPdfAUA { private static final String PDF_A_UA_FOP = "pdf-a-ua-fop"; @@ -20,12 +20,12 @@ public class TestPdfAUA { FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://config/freemarker-doc-process-pdf-a-ua.xml" ); @Test - public void testPDFAUA() throws Exception { + void testPDFAUA() throws Exception { File file = new File( "target/sample_out/", PDF_A_UA_FOP+"test-issue-52.pdf" ); try (FileOutputStream fos = new FileOutputStream( file )) { config.fullProcess( "pdf_a_test", DocProcessContext.newContext(), PDF_A_UA_FOP, fos ); } - Assert.assertTrue( file.exists() ); + Assertions.assertTrue( file.exists() ); } } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFopPDF.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFopPDF.java index d71f406f7..efd580fcd 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFopPDF.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFopPDF.java @@ -2,12 +2,12 @@ import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler; import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestFullFopPDF extends TestHandleBase { +class TestFullFopPDF extends TestHandleBase { @Test - public void testPDF() { + void testPDF() { this.testWorker( "handler_full_test" , FreeMarkerFopTypeHandler.HANDLER_UTF8, PdfFopTypeHandler.HANDLER ); diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFreemarkerHTML.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFreemarkerHTML.java index 761e8142e..01ecf7665 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFreemarkerHTML.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestFullFreemarkerHTML.java @@ -1,12 +1,12 @@ package test.org.fugerit.java.doc.sample.handlertest; import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TestFullFreemarkerHTML extends TestHandleBase { +class TestFullFreemarkerHTML extends TestHandleBase { @Test - public void testHTML() { + void testHTML() { this.testWorker( "handler_full_test" , FreeMarkerHtmlTypeHandler.HANDLER_UTF8 ); } diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestHandleBase.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestHandleBase.java index 54ed318c1..41c52f0f7 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestHandleBase.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/handlertest/TestHandleBase.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.sample.handlertest; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java index 03d9e5af3..c9ae2e0f9 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.sample.simpletable; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -17,14 +17,14 @@ import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; import org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler; import org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest; @Slf4j -public class TestSimpleTable { +class TestSimpleTable { private static final DocTypeHandler[] HANDLERS = { DocTypeHandlerXML.HANDLER_UTF8, XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() }; @@ -32,8 +32,8 @@ public class TestSimpleTable { private File baseDir = new File( BasicFacadeTest.BASIC_OUTPUT_PATH ); - @Before - public void init() throws ConfigException { + @BeforeEach + void init() throws ConfigException { this.docConfig = SimpleTableDocConfig.newConfig(); log.info( "config init ok {}", this.docConfig ); if ( !baseDir.exists() ) { @@ -42,7 +42,7 @@ public void init() throws ConfigException { } @Test - public void testSimpleTable01() { + void testSimpleTable01() { SimpleTable simpleTableModel = SimpleTableFacade.newTable( 30, 30, 40 ); simpleTableModel.setDefaultBorderWidth( 1 ); SimpleRow headerRow = new SimpleRow( BooleanUtils.BOOLEAN_TRUE ); diff --git a/fj-doc-tool/pom.xml b/fj-doc-tool/pom.xml index e2ec95597..30be89292 100644 --- a/fj-doc-tool/pom.xml +++ b/fj-doc-tool/pom.xml @@ -47,8 +47,15 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api + test + + + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter-api-version} test diff --git a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestConvertConfigTool.java b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestConvertConfigTool.java index b4ceb1f4c..4d1c8dd65 100644 --- a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestConvertConfigTool.java +++ b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestConvertConfigTool.java @@ -1,43 +1,29 @@ package test.org.fugerit.java.doc.tool; -import java.util.Arrays; -import java.util.Collection; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -@RunWith(Parameterized.class) -public class TestConvertConfigTool extends TestDocTool { - - private static final Object[][] PARAMS = { - { "src/test/resources/params-test/convert-config-fop.properties", true }, - { "src/test/resources/params-test/convert-config-sample.properties", true }, - { "src/test/resources/params-test/convert-config-autodoc.properties", true }, - { "src/test/resources/params-test/convert-config-help.properties", true }, - { "src/test/resources/params-test/convert-config-yaml.properties", true }, - }; - - @SuppressWarnings("rawtypes") - @Parameterized.Parameters - public static Collection primeNumbers() { - return Arrays.asList( PARAMS ); - } - - private String path; - - private boolean expectedResult; - - public TestConvertConfigTool(String path, boolean exptectedResult ) { - this.path = path; - this.expectedResult = exptectedResult; +import java.util.stream.Stream; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +class TestConvertConfigTool extends TestDocTool { + + private static Stream provideConfigs() { + return Stream.of( + Arguments.of("src/test/resources/params-test/convert-config-fop.properties", true), + Arguments.of("src/test/resources/params-test/convert-config-sample.properties", true), + Arguments.of("src/test/resources/params-test/convert-config-autodoc.properties", true), + Arguments.of("src/test/resources/params-test/convert-config-help.properties", true), + Arguments.of("src/test/resources/params-test/convert-config-yaml.properties", true) + ); } - @Test - public void testCurrent() { - boolean ok = this.docToolWorker(this.path); - Assert.assertEquals( this.expectedResult , ok ); + @ParameterizedTest + @MethodSource("provideConfigs") + void testCurrent(String path, boolean expectedResult) { + boolean ok = this.docToolWorker(path); + Assertions.assertEquals(expectedResult, ok); } } diff --git a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestDocTool.java b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestDocTool.java index de65551e0..82a7f0e82 100644 --- a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestDocTool.java +++ b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestDocTool.java @@ -6,7 +6,7 @@ import org.fugerit.java.core.util.PropsIO; import org.fugerit.java.doc.tool.DocTool; -public class TestDocTool { +class TestDocTool { protected boolean docToolWorker( String paramsPath ) { return SafeFunction.get( () -> { diff --git a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestFail.java b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestFail.java index dc22ab80b..c8ff543e4 100644 --- a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestFail.java +++ b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestFail.java @@ -6,41 +6,41 @@ import org.fugerit.java.core.cli.ArgUtils; import org.fugerit.java.doc.tool.DocTool; import org.fugerit.java.doc.tool.handler.GenerateStubHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestFail extends TestDocTool { +class TestFail extends TestDocTool { private static final Exception DEF = new IOException( "e" ); @Test - public void testFail01() { - Assert.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-01.properties" ) ); + void testFail01() { + Assertions.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-01.properties" ) ); } @Test - public void testFail02() { - Assert.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-02.properties" ) ); + void testFail02() { + Assertions.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-02.properties" ) ); } @Test - public void testFail03() { - Assert.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-03.properties" ) ); + void testFail03() { + Assertions.assertThrows( ConfigRuntimeException.class , () -> this.docToolWorker( "src/test/resources/params-test/test-fail-03.properties" ) ); } @Test - public void testExHandler() { - Assert.assertThrows( ConfigRuntimeException.class , () -> GenerateStubHandler.EX_HANDLER.accept( DEF ) ); + void testExHandler() { + Assertions.assertThrows( ConfigRuntimeException.class , () -> GenerateStubHandler.EX_HANDLER.accept( DEF ) ); } @Test - public void testMain01() { + void testMain01() { DocTool.main( null ); - Assert.assertTrue( true ); + Assertions.assertTrue( true ); } @Test - public void testMain02() { + void testMain02() { String[] args = { ArgUtils.getArgString( DocTool.ARG_TOOL ), "generate-stub", @@ -50,7 +50,7 @@ public void testMain02() { "target/autodoc-new-process-config.xml" }; DocTool.main( args ); - Assert.assertTrue( true ); + Assertions.assertTrue( true ); } } diff --git a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateHelperTool.java b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateHelperTool.java index d323d69e1..976a7cf23 100644 --- a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateHelperTool.java +++ b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateHelperTool.java @@ -1,14 +1,14 @@ package test.org.fugerit.java.doc.tool; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestGenerateHelperTool extends TestDocTool { +class TestGenerateHelperTool extends TestDocTool { @Test - public void testGenerateHelper() { + void testGenerateHelper() { boolean ok = this.docToolWorker( "src/test/resources/params-test/test-generate-helper.properties" ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateStubTool.java b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateStubTool.java index 3c5a3d8cb..45fbfc287 100644 --- a/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateStubTool.java +++ b/fj-doc-tool/src/test/java/test/org/fugerit/java/doc/tool/TestGenerateStubTool.java @@ -1,41 +1,27 @@ package test.org.fugerit.java.doc.tool; -import java.util.Arrays; -import java.util.Collection; +import java.util.stream.Stream; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) -public class TestGenerateStubTool extends TestDocTool { - - private static final Object[][] PARAMS = { - { "src/test/resources/params-test/generate-stub-001.properties", true }, - { "src/test/resources/params-test/generate-stub-002.properties", true }, - { "src/test/resources/params-test/generate-stub-help.properties", true } - }; - - @SuppressWarnings("rawtypes") - @Parameterized.Parameters - public static Collection primeNumbers() { - return Arrays.asList( PARAMS ); - } +class TestGenerateStubTool extends TestDocTool { - private String path; - - private boolean expectedResult; - - public TestGenerateStubTool(String path, boolean exptectedResult ) { - this.path = path; - this.expectedResult = exptectedResult; + private static Stream provideConfigs() { + return Stream.of( + Arguments.of("src/test/resources/params-test/generate-stub-001.properties", true), + Arguments.of("src/test/resources/params-test/generate-stub-002.properties", true), + Arguments.of("src/test/resources/params-test/generate-stub-help.properties", true) + ); } - - @Test - public void testCurrent() { - boolean ok = this.docToolWorker(this.path); - Assert.assertEquals( this.expectedResult , ok ); + + @ParameterizedTest + @MethodSource("provideConfigs") + void testCurrent(String path, boolean expectedResult) { + boolean ok = this.docToolWorker(path); + Assertions.assertEquals(expectedResult, ok); } - + } diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml index 10478d9e5..85b8d5e87 100644 --- a/fj-doc-val-core/pom.xml +++ b/fj-doc-val-core/pom.xml @@ -36,8 +36,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestAllValidatorFacade.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestAllValidatorFacade.java index 694930eb5..fbc3d5617 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestAllValidatorFacade.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestAllValidatorFacade.java @@ -12,13 +12,13 @@ import org.fugerit.java.doc.val.core.DocTypeValidator; import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.core.basic.ImageValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; @Slf4j -public class TestAllValidatorFacade extends TestDocValidatorFacade { +class TestAllValidatorFacade extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( ImageValidator.JPG_VALIDATOR, @@ -27,49 +27,49 @@ public class TestAllValidatorFacade extends TestDocValidatorFacade { ); @Test - public void testPngAsPdf() { + void testPngAsPdf() { boolean ok = this.worker(FACADE, "png_as_pdf.pdf", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testJpgAsJpg() { + void testJpgAsJpg() { boolean ok = this.worker(FACADE, "jpg_as_jpg.jpg", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testJpgAsJpgExtJpeg() { + void testJpgAsJpgExtJpeg() { boolean ok = this.worker(FACADE, "jpg_as_jpg.jpeg", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPdfAsJpg() { + void testPdfAsJpg() { boolean ok = this.worker(FACADE, "pdf_as_jpg.jpg", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPngAsPng() { + void testPngAsPng() { boolean ok = this.worker(FACADE, "png_as_png.png", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } // note : only supported for java 9+ @Test - public void testTiffAsTiff() { + void testTiffAsTiff() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tiff", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testTiffAsTiffExtTif() { + void testTiffAsTiffExtTif() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tif", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testDocValidatorFacadeDouble() { + void testDocValidatorFacadeDouble() { DocTypeValidator notCompValidator = new HelperDocValidator() { @Override public boolean checkCompatibility() { @@ -80,24 +80,24 @@ public boolean checkCompatibility() { ImageValidator.JPG_VALIDATOR, notCompValidator ); log.info( "facade {}", facade ); - Assert.assertTrue( facade.findAllByMimeType( HelperDocValidator.MIME_TEST ).isEmpty() ); - Assert.assertTrue( facade.findAllExtension( HelperDocValidator.FORMAT_TEST ).isEmpty() ); - Assert.assertNull( facade.findByMimeType( HelperDocValidator.MIME_TEST ) ); - Assert.assertNull( facade.findByExtension( HelperDocValidator.FORMAT_TEST ) ); - Assert.assertFalse( facade.getSupportedMimeTypes().isEmpty() ); - Assert.assertFalse( facade.getSupportedExtensions().isEmpty() ); - Assert.assertFalse( facade.isMimeTypeSupprted( HelperDocValidator.MIME_TEST ) ); - Assert.assertFalse( facade.isExtensionSupported( HelperDocValidator.FORMAT_TEST ) ); - Assert.assertFalse( facade.isMimeTypeSupprted( HelperDocValidator.MIME_TEST ) ); - Assert.assertFalse( facade.isExtensionSupported( HelperDocValidator.FORMAT_TEST ) ); - Assert.assertFalse( facade.isMimeTypeSupprted( "aaaa" ) ); - Assert.assertFalse( facade.isExtensionSupported( "bbbb/test" ) ); - Assert.assertTrue( facade.isMimeTypeSupprted( ImageValidator.JPG_VALIDATOR.getMimeType() ) ); - Assert.assertTrue( facade.isExtensionSupported( ImageValidator.FORMAT_JPG ) ); + Assertions.assertTrue( facade.findAllByMimeType( HelperDocValidator.MIME_TEST ).isEmpty() ); + Assertions.assertTrue( facade.findAllExtension( HelperDocValidator.FORMAT_TEST ).isEmpty() ); + Assertions.assertNull( facade.findByMimeType( HelperDocValidator.MIME_TEST ) ); + Assertions.assertNull( facade.findByExtension( HelperDocValidator.FORMAT_TEST ) ); + Assertions.assertFalse( facade.getSupportedMimeTypes().isEmpty() ); + Assertions.assertFalse( facade.getSupportedExtensions().isEmpty() ); + Assertions.assertFalse( facade.isMimeTypeSupprted( HelperDocValidator.MIME_TEST ) ); + Assertions.assertFalse( facade.isExtensionSupported( HelperDocValidator.FORMAT_TEST ) ); + Assertions.assertFalse( facade.isMimeTypeSupprted( HelperDocValidator.MIME_TEST ) ); + Assertions.assertFalse( facade.isExtensionSupported( HelperDocValidator.FORMAT_TEST ) ); + Assertions.assertFalse( facade.isMimeTypeSupprted( "aaaa" ) ); + Assertions.assertFalse( facade.isExtensionSupported( "bbbb/test" ) ); + Assertions.assertTrue( facade.isMimeTypeSupprted( ImageValidator.JPG_VALIDATOR.getMimeType() ) ); + Assertions.assertTrue( facade.isExtensionSupported( ImageValidator.FORMAT_JPG ) ); // test path String testPath = "src/test/resources/sample/jpg_as_jpg.jpeg"; SafeFunction.apply( () -> { - Assert.assertTrue( facade.check( new File( testPath ) ) ); + Assertions.assertTrue( facade.check( new File( testPath ) ) ); try ( InputStream is = new FileInputStream( testPath ) ) { facade.checkByMimeType( HelperDocValidator.FORMAT_TEST , is); } @@ -108,7 +108,7 @@ public boolean checkCompatibility() { } @Test - public void finalTests() { + void finalTests() { DocTypeValidator notCompValidator = new HelperDocValidator() { @Override public boolean checkCompatibility() { @@ -117,16 +117,16 @@ public boolean checkCompatibility() { }; String testPath = "src/test/resources/sample/jpg_as_jpg.jpeg"; // facade strict - Assert.assertThrows( ConfigRuntimeException.class, () -> DocValidatorFacade.newFacadeStrict( notCompValidator ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> DocValidatorFacade.newFacadeStrict( notCompValidator ) ); // result - Assert.assertEquals( Result.RESULT_CODE_OK , DocTypeValidationResult.newOk().getResultCode() ); - Assert.assertFalse( ImageValidator.javaVersionSupportHelper( JavaVersionHelper.MAJOR_VERSION_JAVA_8 , JavaVersionHelper.MAJOR_VERSION_JAVA_11 ) ); + Assertions.assertEquals( Result.RESULT_CODE_OK , DocTypeValidationResult.newOk().getResultCode() ); + Assertions.assertFalse( ImageValidator.javaVersionSupportHelper( JavaVersionHelper.MAJOR_VERSION_JAVA_8 , JavaVersionHelper.MAJOR_VERSION_JAVA_11 ) ); // test - Assert.assertNotNull( new HelperDocValidator( HelperDocValidator.MIME_TEST, HelperDocValidator.FORMAT_TEST ) ); + Assertions.assertNotNull( new HelperDocValidator( HelperDocValidator.MIME_TEST, HelperDocValidator.FORMAT_TEST ) ); SafeFunction.apply( () -> { try ( InputStream is = new FileInputStream( testPath ) ) { - Assert.assertTrue( notCompValidator.check( is ) ); - Assert.assertTrue( new HelperDocValidator().checkCompatibility() ); + Assertions.assertTrue( notCompValidator.check( is ) ); + Assertions.assertTrue( new HelperDocValidator().checkCompatibility() ); } } ); } diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorFacade.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorFacade.java index d8efd55b5..dbae510ab 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorFacade.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorFacade.java @@ -5,7 +5,7 @@ import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.core.DocValidatorFacade; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +21,7 @@ protected boolean worker( DocValidatorFacade facade, String fileName, boolean r logger.info( "test path {}, expected result {}", path, result ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( path ) ) { boolean check = facade.check(fileName, is); - Assert.assertEquals( "File check failed", result, check ); + Assertions.assertEquals( result, check ); return ( result == check ); } } ); diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorTypeCheck.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorTypeCheck.java index 9cf835f68..d7146388e 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorTypeCheck.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestDocValidatorTypeCheck.java @@ -5,14 +5,14 @@ import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.core.DocValidatorTypeCheck; import org.fugerit.java.doc.val.core.basic.ImageValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.awt.*; import java.io.InputStream; @Slf4j -public class TestDocValidatorTypeCheck { +class TestDocValidatorTypeCheck { private static final DocValidatorTypeCheck TYPE_CHECK = DocValidatorTypeCheck.newInstance( ImageValidator.JPG_VALIDATOR, ImageValidator.PNG_VALIDATOR ); @@ -30,18 +30,18 @@ private String worker( String fileName ) { } @Test - public void testJpg() { - Assert.assertEquals(ImageValidator.JPG_VALIDATOR.getMimeType(), this.worker( "jpg_as_jpg.jpg" ) ); + void testJpg() { + Assertions.assertEquals(ImageValidator.JPG_VALIDATOR.getMimeType(), this.worker( "jpg_as_jpg.jpg" ) ); } @Test - public void testPng() { - Assert.assertEquals(ImageValidator.PNG_VALIDATOR.getMimeType(), this.worker( "png_as_png.png" ) ); + void testPng() { + Assertions.assertEquals(ImageValidator.PNG_VALIDATOR.getMimeType(), this.worker( "png_as_png.png" ) ); } @Test - public void testNull() { - Assert.assertNull( this.worker( "pdf_as_jpg.jpg" ) ); + void testNull() { + Assertions.assertNull( this.worker( "pdf_as_jpg.jpg" ) ); } } diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestImageValidator.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestImageValidator.java index 3af2a4928..f3c3073b3 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestImageValidator.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestImageValidator.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.core.basic.ImageValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestImageValidator extends TestDocValidatorFacade { +class TestImageValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( ImageValidator.JPG_VALIDATOR, @@ -14,39 +14,39 @@ public class TestImageValidator extends TestDocValidatorFacade { ); @Test - public void testJpgAsJpg() { + void testJpgAsJpg() { boolean ok = this.worker(FACADE, "jpg_as_jpg.jpg", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testJpgAsJpgExtJpeg() { + void testJpgAsJpgExtJpeg() { boolean ok = this.worker(FACADE, "jpg_as_jpg.jpeg", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPdfAsJpg() { + void testPdfAsJpg() { boolean ok = this.worker(FACADE, "pdf_as_jpg.jpg", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPngAsPng() { + void testPngAsPng() { boolean ok = this.worker(FACADE, "png_as_png.png", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } // note : only supported for java 9+ @Test - public void testTiffAsTiff() { + void testTiffAsTiff() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tiff", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testTiffAsTiffExtTif() { + void testTiffAsTiffExtTif() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tif", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestNopOutputStream.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestNopOutputStream.java index 7354d9032..2281615ac 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestNopOutputStream.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestNopOutputStream.java @@ -1,21 +1,21 @@ package test.org.fugerit.java.doc.core.val; import org.fugerit.java.doc.val.core.io.NopOutputStream; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; -public class TestNopOutputStream { +class TestNopOutputStream { @Test - public void test1() throws IOException { + void test1() throws IOException { try ( NopOutputStream os = new NopOutputStream() ) { os.write( 1 ); byte[] data = "test".getBytes(); os.write( data ); os.write( data, 0, data.length ); - Assert.assertNotNull( os ); + Assertions.assertNotNull( os ); } } diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestTiffValidator.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestTiffValidator.java index 525f464f2..44c829cc6 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestTiffValidator.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestTiffValidator.java @@ -2,10 +2,10 @@ import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.core.basic.ImageValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestTiffValidator extends TestDocValidatorFacade { +class TestTiffValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( ImageValidator.TIFF_VALIDATOR @@ -13,14 +13,14 @@ public class TestTiffValidator extends TestDocValidatorFacade { // note : only supported for java 9+ @Test - public void testTiffAsTiff() { + void testTiffAsTiff() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tiff", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testTiffAsTiffExtTif() { + void testTiffAsTiffExtTif() { boolean ok = this.worker(FACADE, "tiff_as_tiff.tif", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestXmlValidator.java b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestXmlValidator.java index 569a062cf..4fdb49f16 100644 --- a/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestXmlValidator.java +++ b/fj-doc-val-core/src/test/java/test/org/fugerit/java/doc/core/val/TestXmlValidator.java @@ -2,24 +2,24 @@ import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.core.basic.XmlValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestXmlValidator extends TestDocValidatorFacade { +class TestXmlValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( XmlValidator.DEFAULT ); @Test - public void testXmlAsXml() { + void testXmlAsXml() { boolean ok = this.worker(FACADE, "xml_as_xml.xml", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testXslAsXml() { + void testXslAsXml() { boolean ok = this.worker(FACADE, "xls_as_xml.xml", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val-p7m/pom.xml b/fj-doc-val-p7m/pom.xml index b272a1b1a..1bf709a81 100644 --- a/fj-doc-val-p7m/pom.xml +++ b/fj-doc-val-p7m/pom.xml @@ -48,8 +48,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestDocValidatorFacade.java b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestDocValidatorFacade.java index dc18bf191..2c460a9e1 100644 --- a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestDocValidatorFacade.java +++ b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestDocValidatorFacade.java @@ -6,12 +6,10 @@ import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.core.DocValidatorFacade; -import org.junit.Assert; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.junit.jupiter.api.Assertions; @Slf4j -public class TestDocValidatorFacade { +class TestDocValidatorFacade { protected static final String BASE_PATH = "sample"; @@ -21,7 +19,7 @@ protected boolean worker( DocValidatorFacade facade, String fileName, boolean r log.info( "test path {}, expected result {}", path, result ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( path ) ) { boolean check = facade.check(fileName, is); - Assert.assertEquals( "File check failed", result, check ); + Assertions.assertEquals( result, check ); return ( result == check ); } } ); diff --git a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestExtractContentP7M.java b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestExtractContentP7M.java index f8f2b6c0c..dd174d850 100644 --- a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestExtractContentP7M.java +++ b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestExtractContentP7M.java @@ -12,22 +12,22 @@ import org.fugerit.java.core.io.StreamIO; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.p7m.P7MUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; @Slf4j -public class TestExtractContentP7M { +class TestExtractContentP7M { @Test - public void testDataProcess() { - Assert.assertThrows( CMSException.class , () -> P7MUtils.extractContentCMSSignedDataProcess( null, null ) ) ; + void testDataProcess() { + Assertions.assertThrows( CMSException.class , () -> P7MUtils.extractContentCMSSignedDataProcess( null, null ) ) ; } @Test - public void testContentInfo() throws IOException { - Assert.assertThrows( CMSException.class , () -> P7MUtils.checkContentInfo( null ) ) ; + void testContentInfo() throws IOException { + Assertions.assertThrows( CMSException.class , () -> P7MUtils.checkContentInfo( null ) ) ; try (InputStream is = ClassHelper.loadFromDefaultClassLoader( "sample/pkcs7_test_ok1.p7m" ) ) { String in = new String(StreamIO.readBytes( is )); try ( PEMParser pp = new PEMParser(new StringReader(in) ) ) { @@ -38,14 +38,14 @@ public ASN1ObjectIdentifier getContentType() { return CMSObjectIdentifiers.authenticatedData; } }; - Assert.assertThrows( CMSException.class , () -> P7MUtils.checkContentInfo( ci ) ) ; + Assertions.assertThrows( CMSException.class , () -> P7MUtils.checkContentInfo( ci ) ) ; } } } @Test - public void testP7MKo() { - Assert.assertThrows( CMSException.class , () -> { + void testP7MKo() { + Assertions.assertThrows( CMSException.class , () -> { String path = "src/test/resources/sample/png_as_p7m.p7m"; File testP7M = new File( path ); log.info( "test extract ko : {}", testP7M.getCanonicalPath() ); @@ -57,8 +57,8 @@ public void testP7MKo() { } @Test - public void testP7MOk() { - Assert.assertTrue( SafeFunction.get( () -> { + void testP7MOk() { + Assertions.assertTrue( SafeFunction.get( () -> { String path = "src/test/resources/sample/pdf_as_pdf.p7m"; File testP7M = new File( path ); log.info( "test extract : {}", testP7M.getCanonicalPath() ); diff --git a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MContentValidator.java b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MContentValidator.java index 938059d6a..fc65b3169 100644 --- a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MContentValidator.java +++ b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MContentValidator.java @@ -7,13 +7,13 @@ import org.fugerit.java.doc.val.core.basic.ImageValidator; import org.fugerit.java.doc.val.p7m.P7MContentValidator; import org.fugerit.java.doc.val.pdf.box.PdfboxStrictValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.InputStream; @Slf4j -public class TestP7MContentValidator extends TestDocValidatorFacade { +class TestP7MContentValidator extends TestDocValidatorFacade { private static final String FILENAME_PDF_AS_P7M = "pdf_as_pdf.p7m"; @@ -46,36 +46,36 @@ protected String worker( P7MContentValidator validator, String fileName ) { } @Test - public void testP7MAsP7M() { + void testP7MAsP7M() { boolean ok = this.worker(FACADE_PDF, FILENAME_PDF_AS_P7M, true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testP7MAsP7MNull() { + void testP7MAsP7MNull() { boolean ok = this.worker(FACADE_NULL, FILENAME_PDF_AS_P7M, true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testP7MAsP7MKo() { + void testP7MAsP7MKo() { boolean ok = this.worker(FACADE_JPG, FILENAME_PDF_AS_P7M, false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testKO() { - Assert.assertNull( this.worker( CONTENT_JPG_PROCEED, "docx_as_docx.docx" ) ); + void testKO() { + Assertions.assertNull( this.worker( CONTENT_JPG_PROCEED, "docx_as_docx.docx" ) ); } @Test - public void testProccedKo() { - Assert.assertNull( this.worker( CONTENT_JPG_PROCEED, FILENAME_PDF_AS_P7M ) ); + void testProccedKo() { + Assertions.assertNull( this.worker( CONTENT_JPG_PROCEED, FILENAME_PDF_AS_P7M ) ); } @Test - public void testProccedOk() { - Assert.assertEquals( PdfboxStrictValidator.DEFAULT.getMimeType(), this.worker( CONTENT_PDF_PROCEED, FILENAME_PDF_AS_P7M ) ); + void testProccedOk() { + Assertions.assertEquals( PdfboxStrictValidator.DEFAULT.getMimeType(), this.worker( CONTENT_PDF_PROCEED, FILENAME_PDF_AS_P7M ) ); } } diff --git a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MValidator.java b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MValidator.java index 7eced1252..70edf16fd 100644 --- a/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MValidator.java +++ b/fj-doc-val-p7m/src/test/java/test/org/fugerit/java/doc/val/p7m/TestP7MValidator.java @@ -5,61 +5,61 @@ import org.fugerit.java.doc.val.p7m.P7MPemValidator; import org.fugerit.java.doc.val.p7m.P7MRawValidator; import org.fugerit.java.doc.val.p7m.P7MValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestP7MValidator extends TestDocValidatorFacade { +class TestP7MValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( P7MValidator.DEFAULT ); private static final DocValidatorFacade FACADE_LEGACY = DocValidatorFacade.newFacadeStrict( new P7MLegacyValidator() ); @Test - public void testP7MAsP7M() { + void testP7MAsP7M() { String path = "pdf_as_pdf.p7m"; - Assert.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); - Assert.assertTrue( this.worker(FACADE, path, true ) ); + Assertions.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); + Assertions.assertTrue( this.worker(FACADE, path, true ) ); } @Test - public void testPNGAsP7M() { + void testPNGAsP7M() { String path = "pdf_as_png.p7m"; - Assert.assertTrue( this.worker(FACADE_LEGACY, path, false ) ); - Assert.assertTrue( this.worker(FACADE, path, false ) ); + Assertions.assertTrue( this.worker(FACADE_LEGACY, path, false ) ); + Assertions.assertTrue( this.worker(FACADE, path, false ) ); } @Test - public void testPkcs7Ok1() { + void testPkcs7Ok1() { String path = "pkcs7_test_ok1.p7m"; - Assert.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); - Assert.assertTrue( this.worker(FACADE, path, true ) ); + Assertions.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); + Assertions.assertTrue( this.worker(FACADE, path, true ) ); } @Test - public void testPkcs7Ok2() { + void testPkcs7Ok2() { String path = "pkcs7_test_ok2.p7m"; - Assert.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); - Assert.assertTrue( this.worker(FACADE, path, true ) ); + Assertions.assertTrue( this.worker(FACADE_LEGACY, path, true ) ); + Assertions.assertTrue( this.worker(FACADE, path, true ) ); } @Test - public void testPkcs7Ko1() { + void testPkcs7Ko1() { String path = "pkcs7_test_ko1.p7m"; - Assert.assertTrue( this.worker(FACADE_LEGACY, path, false ) ); - Assert.assertTrue( this.worker(FACADE, path, false ) ); + Assertions.assertTrue( this.worker(FACADE_LEGACY, path, false ) ); + Assertions.assertTrue( this.worker(FACADE, path, false ) ); } @Test - public void testP7MAsP7MRaValidator() { - Assert.assertTrue( this.worker( + void testP7MAsP7MRaValidator() { + Assertions.assertTrue( this.worker( DocValidatorFacade.newFacadeStrict( new P7MRawValidator() ), "pdf_as_pdf.p7m", true ) ); } @Test - public void testPkcs7Ok1PemValidator() { - Assert.assertTrue( this.worker( + void testPkcs7Ok1PemValidator() { + Assertions.assertTrue( this.worker( DocValidatorFacade.newFacadeStrict( new P7MPemValidator() ), "pkcs7_test_ok1.p7m", true ) ); } diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml index 3048fb47b..3cbd1a5b4 100644 --- a/fj-doc-val-pdfbox/pom.xml +++ b/fj-doc-val-pdfbox/pom.xml @@ -48,8 +48,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestDocValidatorFacade.java b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestDocValidatorFacade.java index f1e6499fc..53e9eb310 100644 --- a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestDocValidatorFacade.java +++ b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestDocValidatorFacade.java @@ -5,11 +5,11 @@ import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.core.DocValidatorFacade; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestDocValidatorFacade { +class TestDocValidatorFacade { private static final Logger logger = LoggerFactory.getLogger( TestDocValidatorFacade.class ); @@ -21,7 +21,7 @@ protected boolean worker( DocValidatorFacade facade, String fileName, boolean r logger.info( "test path {}, expected result {}", path, result ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( path ) ) { boolean check = facade.check(fileName, is); - Assert.assertEquals( "File check failed", result, check ); + Assertions.assertEquals( result, check ); return ( result == check ); } } ); diff --git a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxStrictValidator.java b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxStrictValidator.java index 506ebe56e..a5b743b54 100644 --- a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxStrictValidator.java +++ b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxStrictValidator.java @@ -2,31 +2,31 @@ import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.pdf.box.PdfboxStrictValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestPdfboxStrictValidator extends TestDocValidatorFacade { +class TestPdfboxStrictValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( PdfboxStrictValidator.DEFAULT ); @Test - public void testPdfAsPdf() { + void testPdfAsPdf() { boolean ok = this.worker(FACADE, "pdf_as_pdf.pdf", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPngAsPdf() { + void testPngAsPdf() { boolean ok = this.worker(FACADE, "png_as_pdf.pdf", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPdfAsPdfP7M() { + void testPdfAsPdfP7M() { boolean ok = this.worker(FACADE, "pdf_as_pdf_p7m.pdf", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxValidator.java b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxValidator.java index c4252811d..6f8a8436d 100644 --- a/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxValidator.java +++ b/fj-doc-val-pdfbox/src/test/java/test/org/fugerit/java/doc/pdfbox/val/TestPdfboxValidator.java @@ -2,31 +2,31 @@ import org.fugerit.java.doc.val.core.DocValidatorFacade; import org.fugerit.java.doc.val.pdf.box.PdfboxValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestPdfboxValidator extends TestDocValidatorFacade { +class TestPdfboxValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( PdfboxValidator.DEFAULT ); @Test - public void testPdfAsPdf() { + void testPdfAsPdf() { boolean ok = this.worker(FACADE, "pdf_as_pdf.pdf", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPngAsPdf() { + void testPngAsPdf() { boolean ok = this.worker(FACADE, "png_as_pdf.pdf", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testPdfAsPdfP7M() { + void testPdfAsPdfP7M() { boolean ok = this.worker(FACADE, "pdf_as_pdf_p7m.pdf", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml index 0d86eb00b..7f63581bc 100644 --- a/fj-doc-val-poi/pom.xml +++ b/fj-doc-val-poi/pom.xml @@ -51,8 +51,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestDocValidatorFacade.java b/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestDocValidatorFacade.java index cd7976df5..3d9810102 100644 --- a/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestDocValidatorFacade.java +++ b/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestDocValidatorFacade.java @@ -5,11 +5,11 @@ import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.val.core.DocValidatorFacade; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestDocValidatorFacade { +class TestDocValidatorFacade { private static final Logger logger = LoggerFactory.getLogger( TestDocValidatorFacade.class ); @@ -21,7 +21,7 @@ protected boolean worker( DocValidatorFacade facade, String fileName, boolean r logger.info( "test path {}, expected result {}", path, result ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( path ) ) { boolean check = facade.check(fileName, is); - Assert.assertEquals( "File check failed", result, check ); + Assertions.assertEquals( result, check ); return ( result == check ); } } ); diff --git a/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestPoiValidator.java b/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestPoiValidator.java index a6e72549f..506ceb815 100644 --- a/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestPoiValidator.java +++ b/fj-doc-val-poi/src/test/java/test/org/fugerit/java/doc/poi/val/TestPoiValidator.java @@ -5,10 +5,10 @@ import org.fugerit.java.doc.val.poi.DocxValidator; import org.fugerit.java.doc.val.poi.XlsValidator; import org.fugerit.java.doc.val.poi.XlsxValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestPoiValidator extends TestDocValidatorFacade { +class TestPoiValidator extends TestDocValidatorFacade { private static final DocValidatorFacade FACADE = DocValidatorFacade.newFacadeStrict( DocValidator.DEFAULT, @@ -18,51 +18,51 @@ public class TestPoiValidator extends TestDocValidatorFacade { ); @Test - public void testDocAsDoc() { + void testDocAsDoc() { boolean ok = this.worker(FACADE, "doc_as_doc.doc", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testDocxAsDocx() { + void testDocxAsDocx() { boolean ok = this.worker(FACADE, "docx_as_docx.docx", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testDocxAsDoc() { + void testDocxAsDoc() { boolean ok = this.worker(FACADE, "docx_as_doc.doc", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testDocAsDocx() { + void testDocAsDocx() { boolean ok = this.worker(FACADE, "doc_as_docx.docx", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testXlsAsXls() { + void testXlsAsXls() { boolean ok = this.worker(FACADE, "xls_as_xls.xls", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testXlsxAsXlsx() { + void testXlsxAsXlsx() { boolean ok = this.worker(FACADE, "xlsx_as_xlsx.xlsx", true ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testJpgAsXlsx() { + void testJpgAsXlsx() { boolean ok = this.worker(FACADE, "jpg_as_xlsx.xlsx", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testXlsxAsXls() { + void testXlsxAsXls() { boolean ok = this.worker(FACADE, "xlsx_as_xls.xls", false ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } } diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml index 27dfbf991..3de368944 100644 --- a/fj-doc-val/pom.xml +++ b/fj-doc-val/pom.xml @@ -56,8 +56,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestCreateFullFactory.java b/fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestCreateFullFactory.java index 43fc78fb8..e7b110173 100644 --- a/fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestCreateFullFactory.java +++ b/fj-doc-val/src/test/java/test/org/fugerit/java/doc/val/TestCreateFullFactory.java @@ -1,14 +1,14 @@ package test.org.fugerit.java.doc.val; import org.fugerit.java.doc.val.DocValidatorFacadeFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestCreateFullFactory { +class TestCreateFullFactory { @Test - public void test() { - Assert.assertNotNull( new DocValidatorFacadeFactory().createFullDocValidatorFacade() ); + void test() { + Assertions.assertNotNull( new DocValidatorFacadeFactory().createFullDocValidatorFacade() ); } }