diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml index 28d1d92e5..f4dbb329a 100644 --- a/fj-doc-base-json/pom.xml +++ b/fj-doc-base-json/pom.xml @@ -43,7 +43,13 @@ org.fugerit.java fj-xml-to-json - + + + + junit + junit + test + diff --git a/fj-doc-base-kotlin/pom.xml b/fj-doc-base-kotlin/pom.xml index 5439ffad3..629a2b351 100644 --- a/fj-doc-base-kotlin/pom.xml +++ b/fj-doc-base-kotlin/pom.xml @@ -91,6 +91,12 @@ ${kotlin.version} + + junit + junit + test + + org.junit.jupiter junit-jupiter-api diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml index cab7c6513..1d7dab0ee 100644 --- a/fj-doc-base-yaml/pom.xml +++ b/fj-doc-base-yaml/pom.xml @@ -50,6 +50,12 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml + + + junit + junit + test + diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml index 2cefc131b..fc9558645 100644 --- a/fj-doc-base/pom.xml +++ b/fj-doc-base/pom.xml @@ -79,10 +79,16 @@ 2.3.34 test - + + + org.junit.jupiter + junit-jupiter-api + test + + org.fugerit.java - fj-test-helper8 + fj-test-helper-core test @@ -90,7 +96,7 @@ * - + diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocCharsetProvider.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocCharsetProvider.java index c3cefa124..85fc50463 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocCharsetProvider.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocCharsetProvider.java @@ -1,19 +1,19 @@ package test.org.fugerit.java.doc.base.config; import org.fugerit.java.doc.base.config.DocCharsetProvider; -import org.junit.Assert; -import org.junit.Test; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j -public class TestDocCharsetProvider { +class TestDocCharsetProvider { @Test - public void testProvider() { + void testProvider() { DocCharsetProvider.setDefaultProvider( DocCharsetProvider.getDefaultProvider() ); log.info( "test : {}", DocCharsetProvider.getDefaultProvider() ); - Assert.assertNotNull( DocCharsetProvider.getDefaultProvider() ); + Assertions.assertNotNull( DocCharsetProvider.getDefaultProvider() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocException.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocException.java index 457672733..a069242cc 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocException.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocException.java @@ -4,109 +4,109 @@ import java.sql.SQLException; import org.fugerit.java.doc.base.config.DocException; -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 TestDocException { +class TestDocException { @Test - public void testApplySilent() throws DocException { + void testApplySilent() throws DocException { boolean ok = true; DocException.applySilent( () -> { throw new IOException( "junit test scenario" ); } ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testGetSilent() throws DocException { + void testGetSilent() throws DocException { Object result = DocException.getSilent( () -> { throw new IOException( "junit test scenario" ); } ); - Assert.assertNull( result ); + Assertions.assertNull( result ); } @Test - public void testApplyEX() { - Assert.assertThrows( DocException.class ,() -> DocException.apply( () -> { throw new IOException( "junit test scenario" ); } ) ); + void testApplyEX() { + Assertions.assertThrows( DocException.class ,() -> DocException.apply( () -> { throw new IOException( "junit test scenario" ); } ) ); } @Test - public void testGetEX() { - Assert.assertThrows( DocException.class ,() -> DocException.get( () -> { throw new IOException( "junit test scenario" ); } ) ); + void testGetEX() { + Assertions.assertThrows( DocException.class ,() -> DocException.get( () -> { throw new IOException( "junit test scenario" ); } ) ); } @Test - public void testApplyEXMessage() { - Assert.assertThrows( DocException.class ,() -> DocException.applyWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) ); + void testApplyEXMessage() { + Assertions.assertThrows( DocException.class ,() -> DocException.applyWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) ); } @Test - public void testGetEXMessage() { - Assert.assertThrows( DocException.class ,() -> DocException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) ); + void testGetEXMessage() { + Assertions.assertThrows( DocException.class ,() -> DocException.getWithMessage( () -> { throw new IOException( "junit test scenario" ); }, "test message" ) ); } @Test - public void testApplyEXMessageOk() throws DocException { + void testApplyEXMessageOk() throws DocException { boolean ok = true; DocException.applyWithMessage( () -> log.info( "test ok" ) , "test message" ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } @Test - public void testGetEXMessageOk() throws DocException { - Assert.assertNotNull( DocException.getWithMessage( () -> "test ok" , "test message" ) ); + void testGetEXMessageOk() throws DocException { + Assertions.assertNotNull( DocException.getWithMessage( () -> "test ok" , "test message" ) ); } @Test - public void testApply() throws DocException { + void testApply() throws DocException { DocException.apply( () -> log.info( "apply ok" ) ); - Assert.assertThrows( DocException.class ,() -> DocException.apply( () -> { throw new SQLException( "junit test scenario" ); } ) ); + Assertions.assertThrows( DocException.class ,() -> DocException.apply( () -> { throw new SQLException( "junit test scenario" ); } ) ); } @Test - public void testGet() throws DocException { - Assert.assertNotNull( DocException.get( () -> "ok" ) ); - Assert.assertThrows( DocException.class ,() -> DocException.get( () -> { throw new SQLException( "junit test scenario" ); } ) ); + void testGet() throws DocException { + Assertions.assertNotNull( DocException.get( () -> "ok" ) ); + Assertions.assertThrows( DocException.class ,() -> DocException.get( () -> { throw new SQLException( "junit test scenario" ); } ) ); } @Test - public void testEx1() { - Assert.assertNotNull( new DocException() ); + void testEx1() { + Assertions.assertNotNull( new DocException() ); } @Test - public void testEx2() { - Assert.assertNotNull( new DocException( "a" ) ); + void testEx2() { + Assertions.assertNotNull( new DocException( "a" ) ); } @Test - public void testEx3() { - Assert.assertNotNull( new DocException( new SQLException( "b" ) ) ); + void testEx3() { + Assertions.assertNotNull( new DocException( new SQLException( "b" ) ) ); } @Test - public void testEx4() { - Assert.assertNotNull( new DocException( "c", new SQLException( "d" ) ) ); + void testEx4() { + Assertions.assertNotNull( new DocException( "c", new SQLException( "d" ) ) ); } @Test - public void testEx5() { - Assert.assertNotNull( DocException.convertEx( "e" , new SQLException( "f" ) ) ); + void testEx5() { + Assertions.assertNotNull( DocException.convertEx( "e" , new SQLException( "f" ) ) ); } @Test - public void testEx6() { - Assert.assertNotNull( DocException.convertEx( "g" , new DocException( "g" ) ) ); + void testEx6() { + Assertions.assertNotNull( DocException.convertEx( "g" , new DocException( "g" ) ) ); } @Test - public void testEx7() { - Assert.assertNotNull( DocException.convertExMethod( "e" , new SQLException( "f" ) ) ); + void testEx7() { + Assertions.assertNotNull( DocException.convertExMethod( "e" , new SQLException( "f" ) ) ); } @Test - public void testEx8() { - Assert.assertNotNull( new DocException( "code", "e" , new SQLException( "f" ) ).getCode() ); + void testEx8() { + Assertions.assertNotNull( new DocException( "code", "e" , new SQLException( "f" ) ).getCode() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocInput.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocInput.java index 97016b07c..a42062e83 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocInput.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocInput.java @@ -6,35 +6,35 @@ import org.fugerit.java.doc.base.config.DocInput; import org.fugerit.java.doc.base.facade.DocFacadeSource; import org.fugerit.java.doc.base.model.DocBase; -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 TestDocInput { +class TestDocInput { @Test - public void test1() { + void test1() { DocInput docInput = new DocInput( DocConfig.TYPE_PDF , new DocBase(), null ); log.info( "docInput : {}" , docInput ); - Assert.assertNotNull( docInput.getDoc() ); + Assertions.assertNotNull( docInput.getDoc() ); } @Test - public void test2() { + void test2() { try ( StringReader reader = new StringReader( "" ) ) { DocInput docInput = DocInput.newInput( DocConfig.TYPE_PDF , reader, DocFacadeSource.SOURCE_TYPE_XML ); log.info( "docInput : {}" , docInput ); - Assert.assertNotNull( docInput.getDoc() ); + Assertions.assertNotNull( docInput.getDoc() ); } } @Test - public void test3() { + void test3() { DocInput docInput = new DocInput( DocConfig.TYPE_PDF , null, null ); log.info( "docInput : {}" , docInput ); - Assert.assertNull( docInput.getDoc() ); + Assertions.assertNull( docInput.getDoc() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocOutput.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocOutput.java index d1331b679..e76f6ea20 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocOutput.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocOutput.java @@ -4,20 +4,20 @@ import java.io.IOException; import org.fugerit.java.doc.base.config.DocOutput; -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 TestDocOutput { +class TestDocOutput { @Test - public void test1() throws IOException { + void test1() throws IOException { try ( ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { DocOutput docOutput = DocOutput.newOutput( baos ); log.info( "docOutput : {}" , docOutput ); - Assert.assertNotNull( docOutput.getResult() ); + Assertions.assertNotNull( docOutput.getResult() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDecorator.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDecorator.java index a9aad51a4..8779a9613 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDecorator.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDecorator.java @@ -6,22 +6,22 @@ import org.fugerit.java.core.xml.XMLException; import org.fugerit.java.core.xml.dom.DOMIO; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownBasicTypeHandlerUTF8; -import org.junit.Assert; -import org.junit.Test; import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @Slf4j -public class TestDocTypeHandlerDecorator { + class TestDocTypeHandlerDecorator { @Test - public void test1() throws ConfigException, XMLException { + void test1() throws ConfigException, XMLException { SimpleMarkdownBasicTypeHandlerUTF8 handler = new SimpleMarkdownBasicTypeHandlerUTF8(); log.info( "handler : {}", handler ); try ( StringReader reader = new StringReader( "" ) ) { handler.configure( DOMIO.loadDOMDoc( reader ).getDocumentElement() ); } - Assert.assertNotNull( handler.unwrap() ); + Assertions.assertNotNull( handler.unwrap() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDefault.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDefault.java index 22f207e2b..ff2db93ec 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDefault.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocTypeHandlerDefault.java @@ -8,27 +8,27 @@ import org.fugerit.java.core.cfg.ConfigException; import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.base.config.DocTypeHandlerDefault; -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 TestDocTypeHandlerDefault { +class TestDocTypeHandlerDefault { @Test - public void test1() throws Exception { + void test1() throws Exception { TestHandler handler = new TestHandler(); log.info( "handler format : {}", handler.getFormat() ); - Assert.assertEquals( TestHandler.FORMAT , handler.getFormat() ); + Assertions.assertEquals( TestHandler.FORMAT , handler.getFormat() ); handler.handle(null, null); try ( InputStream is = new ByteArrayInputStream( "test=val".getBytes() ) ) { - Assert.assertThrows( ConfigException.class , () -> handler.configureProperties( is ) ); + Assertions.assertThrows( ConfigException.class , () -> handler.configureProperties( is ) ); } Properties config = new Properties(); - Assert.assertThrows( ConfigException.class , () -> handler.configure( config ) ); + Assertions.assertThrows( ConfigException.class , () -> handler.configure( config ) ); try ( InputStream is = new ByteArrayInputStream( "".getBytes() ) ) { handler.configureXML( is ); } @@ -36,11 +36,11 @@ public void test1() throws Exception { handler.configureXML( is ); } try ( InputStream is = new ByteArrayInputStream( "".getBytes() ) ) { - Assert.assertThrows( ConfigException.class , () -> handler.configureXML( is ) ); + Assertions.assertThrows( ConfigException.class , () -> handler.configureXML( is ) ); } String customId = UUID.randomUUID().toString(); handler.setCustomId( customId ); - Assert.assertEquals( customId, handler.getCustomId() ); + Assertions.assertEquals( customId, handler.getCustomId() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocVersion.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocVersion.java index 4ed4de451..127e1b670 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocVersion.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/config/TestDocVersion.java @@ -5,64 +5,64 @@ import java.util.List; import org.fugerit.java.doc.base.config.DocVersion; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestDocVersion { +class TestDocVersion { private static final Logger logger = LoggerFactory.getLogger( TestDocVersion.class ); private boolean testCompareWorker( int expected, DocVersion v1, DocVersion v2 ) { int result = DocVersion.compare( v1, v2 ); logger.info( "Test compare {} to {} , expected:{}, result:{}", v1, v2, expected, result ); - Assert.assertEquals( "Wrong compare result", expected, result ); + Assertions.assertEquals( expected, result ); return result == expected; } @Test - public void testCompareMajorThan01() { - Assert.assertTrue( this.testCompareWorker( 9, DocVersion.VERSION_1_10, DocVersion.VERSION_1_1 ) ); + void testCompareMajorThan01() { + Assertions.assertTrue( this.testCompareWorker( 9, DocVersion.VERSION_1_10, DocVersion.VERSION_1_1 ) ); } @Test - public void testCompareMinorThan01() { - Assert.assertTrue( this.testCompareWorker( -2, DocVersion.VERSION_1_1, DocVersion.VERSION_1_3 ) ); + void testCompareMinorThan01() { + Assertions.assertTrue( this.testCompareWorker( -2, DocVersion.VERSION_1_1, DocVersion.VERSION_1_3 ) ); } @Test - public void testCompareEqual01() { - Assert.assertTrue( this.testCompareWorker( 0, DocVersion.VERSION_1_5, DocVersion.VERSION_1_5 ) ); + void testCompareEqual01() { + Assertions.assertTrue( this.testCompareWorker( 0, DocVersion.VERSION_1_5, DocVersion.VERSION_1_5 ) ); } @Test - public void testHashCode() { - Assert.assertNotEquals( DocVersion.VERSION_1_5.hashCode() , DocVersion.VERSION_2_1.hashCode() ); + void testHashCode() { + Assertions.assertNotEquals( DocVersion.VERSION_1_5.hashCode() , DocVersion.VERSION_2_1.hashCode() ); } @Test - public void testEquals() { + void testEquals() { boolean testNotEquals = DocVersion.VERSION_1_5.equals( DocVersion.VERSION_2_1 ); - Assert.assertFalse( testNotEquals ); + Assertions.assertFalse( testNotEquals ); boolean testNotEqualsAlt = DocVersion.VERSION_1_5 == null; - Assert.assertFalse( testNotEqualsAlt ); + Assertions.assertFalse( testNotEqualsAlt ); boolean testEquals = DocVersion.VERSION_2_1.equals( DocVersion.VERSION_2_1 ); - Assert.assertTrue( testEquals ); + Assertions.assertTrue( testEquals ); } @Test - public void testCompare() { + void testCompare() { int testNotEquals = DocVersion.compare( DocVersion.VERSION_1_0.stringVersion() , DocVersion.VERSION_2_1.stringVersion() ); - Assert.assertNotEquals( 0 , testNotEquals); + Assertions.assertNotEquals( 0 , testNotEquals); int testNotEqualsAlt = DocVersion.compare( DocVersion.VERSION_2_0.stringVersion() , DocVersion.VERSION_2_1.stringVersion() ); - Assert.assertNotEquals( 0 , testNotEqualsAlt); + Assertions.assertNotEquals( 0 , testNotEqualsAlt); int testEquals = DocVersion.compare( DocVersion.VERSION_2_1.stringVersion() , DocVersion.VERSION_2_1.stringVersion() ); - Assert.assertEquals( 0 , testEquals); + Assertions.assertEquals( 0 , testEquals); } @Test - public void testSort() { + void testSort() { List list = new ArrayList(); list.add( DocVersion.VERSION_1_8 ); list.add( DocVersion.VERSION_1_2 ); @@ -71,7 +71,7 @@ public void testSort() { logger.info( "list pre sort : {}", list ); Collections.sort( list ); logger.info( "list post sort : {}", list ); - Assert.assertEquals( "Version list sort", "[1-2, 1-8, 1-9, 1-10]", String.valueOf( list ) ); + Assertions.assertEquals( "[1-2, 1-8, 1-9, 1-10]", String.valueOf( list ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestConfig.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestConfig.java index 7bc0acd8e..70d99534e 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestConfig.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestConfig.java @@ -16,54 +16,54 @@ import org.fugerit.java.doc.base.helper.Base64Helper; import org.fugerit.java.doc.base.helper.DocHelperEuro; 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 lombok.extern.slf4j.Slf4j; @Slf4j -public class TestConfig { +class TestConfig { @Test - public void testDocConfig() { + void testDocConfig() { DocConfig config = new DocConfig(); log.info( "version config -> {}", config.getVersionConfig() ); - Assert.assertNotNull( config ); + Assertions.assertNotNull( config ); } @Test - public void testBase64() { + void testBase64() { String text = "Venus!"; String base64 = Base64Helper.encodeBase64String( text.getBytes() ); - Assert.assertEquals( text , new String( Base64Helper.decodeBase64String( base64 ) ) ); + Assertions.assertEquals( text , new String( Base64Helper.decodeBase64String( base64 ) ) ); } @Test - public void testDocConstatns() { + void testDocConstatns() { DocConstants config = new DocConstants(); log.info( "const-> {}", config.getEuro() ); - Assert.assertNotNull( DocConstants.getInstance() ); + Assertions.assertNotNull( DocConstants.getInstance() ); } @Test - public void testDocFacadeSourceConfig() { + void testDocFacadeSourceConfig() { boolean value = false; DocFacadeSourceConfig config = new DocFacadeSourceConfig(value); log.info( "config-> {}", config.isFailOnSourceModuleNotFound() ); - Assert.assertEquals( value , config.isFailOnSourceModuleNotFound() ); + Assertions.assertEquals( value , config.isFailOnSourceModuleNotFound() ); } @Test - public void testDocHelperEuro() { + void testDocHelperEuro() { DocHelperEuro config = new DocHelperEuro(); log.info( "config-> {}", config.filterText( "test" ) ); log.info( "config-> {}", config.filterText( "test €" ) ); - Assert.assertNotNull( config ); + Assertions.assertNotNull( config ); } @Test - public void testInitAsyncAll() { + void testInitAsyncAll() { DocTypeHandler fail = new DocTypeHandlerDefault( DocConfig.TYPE_CSV , "test-fail" ) { @Override public void handle(DocInput docInput, DocOutput docOutput) throws Exception { @@ -74,9 +74,9 @@ public void handle(DocInput docInput, DocOutput docOutput) throws Exception { List handlers = Arrays.asList( SimpleMarkdownExtTypeHandler.HANDLER, fail ); InitHandler.initDocAllAsync( handlers ); Map failMap = InitHandler.initDocAll( handlers ); - Assert.assertTrue( failMap.containsKey( fail ) ); - Assert.assertFalse( failMap.containsKey( SimpleMarkdownExtTypeHandler.HANDLER ) ); - Assert.assertThrows( ConfigException.class , () -> InitHandler.initDoc( + Assertions.assertTrue( failMap.containsKey( fail ) ); + Assertions.assertFalse( failMap.containsKey( SimpleMarkdownExtTypeHandler.HANDLER ) ); + Assertions.assertThrows( ConfigException.class , () -> InitHandler.initDoc( fail ) ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestCoverage.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestCoverage.java index 3b33b52ba..30b661ac7 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestCoverage.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestCoverage.java @@ -31,18 +31,17 @@ import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandlerUTF8; import org.fugerit.java.doc.base.xml.DocXmlParser; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateExceptionHandler; import lombok.extern.slf4j.Slf4j; -import test.org.fugerit.java.BasicTest; @Slf4j -public class TestCoverage extends BasicTest { +class TestCoverage { private final static String[] TEST_LIST = { "default_doc", "doc_test_01", "default_doc_alt", "default_doc_missing_tag", "default_doc_fail1", "default_doc_fail2", "default_doc_empty" }; @@ -69,8 +68,8 @@ public void handle(DocInput docInput, DocOutput docOutput) throws Exception { } }; - @BeforeClass - public static void init() { + @BeforeAll + static void init() { Arrays.asList( HANDLERS ).forEach( h -> SafeFunction.apply( () -> InitHandler.initDoc( h ) ) ); } @@ -91,9 +90,9 @@ private boolean worker( String path ) { } @Test - public void test02() { - Arrays.asList( TEST_LIST ).stream().forEach( c -> Assert.assertTrue( this.worker( "coverage/xml/"+c+".xml" ) ) ); - Assert.assertTrue( Boolean.TRUE ); + void test02() { + Arrays.asList( TEST_LIST ).stream().forEach( c -> Assertions.assertTrue( this.worker( "coverage/xml/"+c+".xml" ) ) ); + Assertions.assertTrue( Boolean.TRUE ); } private static final Configuration CFG = SafeFunction.get( () -> { @@ -111,7 +110,7 @@ public void test02() { private boolean workerAlt( String c ) { SimpleValue res = new SimpleValue<>(false); - runTestEx( () -> { + SafeFunction.apply( () -> { String path = "coverage/xml/"+c+".xml"; Template temp = CFG.getTemplate("/html_doc.ftl"); Map root = new HashMap<>(); @@ -132,15 +131,15 @@ private boolean workerAlt( String c ) { } @Test - public void test01() { - Arrays.asList( TEST_LIST ).stream().forEach( c -> Assert.assertTrue( this.workerAlt( c ) ) ); - Assert.assertTrue( Boolean.TRUE ); + void test01() { + Arrays.asList( TEST_LIST ).stream().forEach( c -> Assertions.assertTrue( this.workerAlt( c ) ) ); + Assertions.assertTrue( Boolean.TRUE ); } @Test - public void test03() { - Assert.assertTrue( SafeFunction.get( () -> { + void test03() { + Assertions.assertTrue( SafeFunction.get( () -> { File file = new File( "target/test_output.md" ); SimpleDocFacade.produce( SimpleMarkdownExtTypeHandler.HANDLER , "cl://coverage/xml/default_doc.xml", file ); return file.exists(); @@ -148,7 +147,7 @@ public void test03() { } @Test - public void test04() { + void test04() { int res = SafeFunction.get( () -> { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "coverage/xml/default_doc.xml" ) ); ByteArrayOutputStream buffer = new ByteArrayOutputStream() ) { @@ -156,14 +155,14 @@ public void test04() { return buffer.toByteArray().length; } } ); - Assert.assertNotEquals( 0, res ); + Assertions.assertNotEquals( 0, res ); } @Test - public void testXsdVersion() { + void testXsdVersion() { String version = DocParserContext.createXsdVersionXmlns( DocVersion.VERSION_2_1.stringVersion() ); log.info( "version : {}", version ); - Assert.assertTrue( version.endsWith( "doc-2-1.xsd" ) ); + Assertions.assertTrue( version.endsWith( "doc-2-1.xsd" ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocContentHandler.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocContentHandler.java index ddfbbbc1d..314c14bc3 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocContentHandler.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocContentHandler.java @@ -3,18 +3,18 @@ import org.fugerit.java.doc.base.model.DocHelper; import org.fugerit.java.doc.base.parser.DocParserContext; import org.fugerit.java.doc.base.xml.DocContentHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; -public class TestDocContentHandler { +class TestDocContentHandler { @Test - public void testCoverage() throws SAXException { + void testCoverage() throws SAXException { DocContentHandler handler = new DocContentHandler(); - Assert.assertNotNull( handler ); - Assert.assertNotNull( new DocContentHandler( new DocHelper() ) ); - Assert.assertNotNull( new DocParserContext() ); + Assertions.assertNotNull( handler ); + Assertions.assertNotNull( new DocContentHandler( new DocHelper() ) ); + Assertions.assertNotNull( new DocParserContext() ); // they are all currently do nothing impl handler.skippedEntity( null ); handler.processingInstruction(null, null); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocFacade.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocFacade.java index 92037e06d..5a9ccf093 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocFacade.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocFacade.java @@ -17,16 +17,16 @@ import org.fugerit.java.doc.base.model.DocRow; import org.fugerit.java.doc.base.model.DocTable; import org.fugerit.java.doc.base.typehelper.excel.TableMatrix; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestDocFacade { +class TestDocFacade { private static final String DEF_PATH = "coverage/xml/default_doc.xml"; private void additionalTest( DocBase doc ) { DocTable table = (DocTable)doc.getElementById( "excel-table" ); - Assert.assertNotNull( table ); + Assertions.assertNotNull( table ); TableMatrix matrix = new TableMatrix( table.containerSize() , table.getColumns() ); Iterator itRows = table.docElements(); while ( itRows.hasNext() ) { @@ -37,10 +37,10 @@ private void additionalTest( DocBase doc ) { matrix.setNext( cell , cell.getRowSpan(), cell.getColumnSpan() ); } } - Assert.assertNotNull( matrix ); - Assert.assertNotNull( matrix.getParent( 1, 1 ) ); - Assert.assertNotNull( matrix.getBorders( 1, 1 ) ); - Assert.assertFalse( matrix.isCellEmpty( 1, 1 ) ); + Assertions.assertNotNull( matrix ); + Assertions.assertNotNull( matrix.getParent( 1, 1 ) ); + Assertions.assertNotNull( matrix.getBorders( 1, 1 ) ); + Assertions.assertFalse( matrix.isCellEmpty( 1, 1 ) ); for ( int r=0; r { byte[] data = SourceResolverHelper.resolveImage( img ); - Assert.assertNotNull( data ); + Assertions.assertNotNull( data ); }); } } ); } @Test - public void testParse001() { - Assert.assertNotNull( + void testParse001() { + Assertions.assertNotNull( SafeFunction.get( () -> { try ( InputStream reader = ClassHelper.loadFromDefaultClassLoader( DEF_PATH ) ) { DocBase doc = DocFacade.parse( reader ); @@ -73,8 +73,8 @@ public void testParse001() { } @Test - public void testParseRE001() { - Assert.assertNotNull( SafeFunction.get( () -> { + void testParseRE001() { + Assertions.assertNotNull( SafeFunction.get( () -> { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( DEF_PATH ) ) ) { return DocFacade.parseRE( reader ); } @@ -82,8 +82,8 @@ public void testParseRE001() { } @Test - public void testParseRE002() { - Assert.assertNotNull( SafeFunction.get( () -> { + void testParseRE002() { + Assertions.assertNotNull( SafeFunction.get( () -> { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( DEF_PATH ) ) ) { return DocFacade.parseRE( reader, DocFacadeSource.SOURCE_TYPE_XML ); } @@ -91,8 +91,8 @@ public void testParseRE002() { } @Test - public void testValidate001() { - Assert.assertTrue( SafeFunction.get( () -> { + void testValidate001() { + Assertions.assertTrue( SafeFunction.get( () -> { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( DEF_PATH ) ) ) { return DocFacade.validate( reader ); } @@ -100,8 +100,8 @@ public void testValidate001() { } @Test - public void testParse002() { - Assert.assertNotNull( SafeFunction.get( () -> { + void testParse002() { + Assertions.assertNotNull( SafeFunction.get( () -> { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( DEF_PATH ) ) ) { return DocFacade.parse( reader, new DocHelper() ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocHandlerFactory.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocHandlerFactory.java index aec2dc72a..7272ca9bc 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocHandlerFactory.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocHandlerFactory.java @@ -3,17 +3,17 @@ import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.doc.base.facade.DocHandlerFacade; import org.fugerit.java.doc.base.facade.DocHandlerFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestDocHandlerFactory { +class TestDocHandlerFactory { @Test - public void test001() { - Assert.assertNotNull( SafeFunction.get( () -> { + void test001() { + Assertions.assertNotNull( SafeFunction.get( () -> { DocHandlerFactory factory = DocHandlerFactory.newInstance( "cl://coverage/config/doc-handler-sample.xml" ); DocHandlerFacade facade = factory.get( "test" ); - Assert.assertNotNull( facade ); + Assertions.assertNotNull( facade ); return facade.findHandler( "md" ); } ) ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocTypeFacade.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocTypeFacade.java index 8a19073d3..f6e663965 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocTypeFacade.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestDocTypeFacade.java @@ -1,5 +1,5 @@ package test.org.fugerit.java.doc.base.coverage; -public class TestDocTypeFacade { +class TestDocTypeFacade { } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestExcelHelpers.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestExcelHelpers.java index 612173abd..dac38dbef 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestExcelHelpers.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestExcelHelpers.java @@ -10,57 +10,57 @@ import org.fugerit.java.doc.base.typehelper.excel.ExcelHelperConsts; import org.fugerit.java.doc.base.typehelper.excel.ExcelHelperUtils; import org.fugerit.java.doc.base.typehelper.excel.MatrixCell; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestExcelHelpers { +class TestExcelHelpers { @Test - public void testTesoveTemplateStreamOk() throws IOException { + void testTesoveTemplateStreamOk() throws IOException { DocBase docBase = new DocBase(); docBase.setStableInfo( new Properties() ); docBase.getStableInfo().setProperty( ExcelHelperConsts.PROP_XLS_TEMPLATE , "cl://txt/test.txt" ); String text = StreamIO.readString( ExcelHelperUtils.resoveTemplateStream( docBase ) ); - Assert.assertEquals( "test text" , text ); + Assertions.assertEquals( "test text" , text ); } @Test - public void testTesoveTemplateStreamFail() throws IOException { + void testTesoveTemplateStreamFail() throws IOException { DocBase docBase = new DocBase(); docBase.setStableInfo( new Properties() ); docBase.getStableInfo().setProperty( ExcelHelperConsts.PROP_XLS_TEMPLATE , "cl://txt/not_found.txt" ); - Assert.assertThrows( IOException.class , () -> ExcelHelperUtils.resoveTemplateStream( docBase ) ); + Assertions.assertThrows( IOException.class , () -> ExcelHelperUtils.resoveTemplateStream( docBase ) ); } @Test - public void testTesoveTemplateStreamNoProp() throws IOException { + void testTesoveTemplateStreamNoProp() throws IOException { DocBase docBase = new DocBase(); docBase.setStableInfo( new Properties() ); - Assert.assertNull( ExcelHelperUtils.resoveTemplateStream( docBase ) ); + Assertions.assertNull( ExcelHelperUtils.resoveTemplateStream( docBase ) ); } @Test - public void testPrepareNumber() throws IOException { - Assert.assertEquals( "1000.5", ExcelHelperUtils.prepareNumber( "1.000,5" ) ); - Assert.assertEquals( "10", ExcelHelperUtils.prepareNumber( "10" ) ); + void testPrepareNumber() throws IOException { + Assertions.assertEquals( "1000.5", ExcelHelperUtils.prepareNumber( "1.000,5" ) ); + Assertions.assertEquals( "10", ExcelHelperUtils.prepareNumber( "10" ) ); } @Test - public void testMatrixCell() { + void testMatrixCell() { DocCell cell = new DocCell(); cell.setDocBorders( new DocBorders() ); cell.getDocBorders().setBorderWidthBottom( 1 ); MatrixCell mc = new MatrixCell( cell , cell ); - Assert.assertNotNull( mc.getBorders() ); + Assertions.assertNotNull( mc.getBorders() ); cell.setRSpan( 2 ); cell.setCSpan( 2 ); - Assert.assertEquals( 0, mc.getBorders().getBorderWidthBottom() ); + Assertions.assertEquals( 0, mc.getBorders().getBorderWidthBottom() ); DocCell newCell = new DocCell(); mc.setCell( newCell ); - Assert.assertEquals( 0, mc.getBorders().getBorderWidthBottom() ); + Assertions.assertEquals( 0, mc.getBorders().getBorderWidthBottom() ); cell.setRSpan( 1 ); cell.setCSpan( 1 ); - Assert.assertEquals( 1, mc.getBorders().getBorderWidthBottom() ); + Assertions.assertEquals( 1, mc.getBorders().getBorderWidthBottom() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestProcessDocFacade.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestProcessDocFacade.java index f49b0fe9b..b31b76594 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestProcessDocFacade.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/coverage/TestProcessDocFacade.java @@ -14,26 +14,26 @@ import org.fugerit.java.doc.base.facade.ProcessDocFacade; import org.fugerit.java.doc.base.process.DocProcessConfig; 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 lombok.extern.slf4j.Slf4j; @Slf4j -public class TestProcessDocFacade { +class TestProcessDocFacade { public static final String TEST_PROCESS_PATH = "coverage/config/doc-process-autodoc.xml"; public static final String TEST_CHAIN_ID = "test-chain"; @Test - public void test001() { - Assert.assertTrue( SafeFunction.get( () -> { + void test001() { + Assertions.assertTrue( SafeFunction.get( () -> { ProcessDocFacade facade = ProcessDocFacade.newFacade( "cl://"+TEST_PROCESS_PATH, "cl://coverage/config/doc-handler-sample.xml", "test" ); - Assert.assertNotNull( facade ); + Assertions.assertNotNull( facade ); DocProcessContext context = DocProcessContext.newContext(); // test base try ( ByteArrayOutputStream buffer = new ByteArrayOutputStream() ) { @@ -54,25 +54,25 @@ public void test001() { } @Test - public void test002() { - Assert.assertNotNull( SafeFunction.get( () -> DocProcessConfig.loadConfigSafe( "cl://"+TEST_PROCESS_PATH ) ) ); + void test002() { + Assertions.assertNotNull( SafeFunction.get( () -> DocProcessConfig.loadConfigSafe( "cl://"+TEST_PROCESS_PATH ) ) ); } @Test - public void test003() { - Assert.assertTrue( SafeFunction.get( () -> { + void test003() { + Assertions.assertTrue( SafeFunction.get( () -> { try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( TEST_PROCESS_PATH ) ) { DocProcessConfig facade = new DocProcessConfig(); DocProcessConfig.loadConfig(is, facade); ListMapConfig config = facade.getListMap( TEST_CHAIN_ID); MiniFilterChain chain = facade.getChainCache( TEST_CHAIN_ID ); - Assert.assertNotNull( facade ); - Assert.assertNotNull( config ); - Assert.assertNotNull( chain ); - Assert.assertNotNull( facade.getGeneralProps() ); - Assert.assertNotNull( facade.getKeys() ); - Assert.assertNotNull( facade.getIdSet() ); - Assert.assertNotNull( facade.getDataList( TEST_CHAIN_ID ) ); + Assertions.assertNotNull( facade ); + Assertions.assertNotNull( config ); + Assertions.assertNotNull( chain ); + Assertions.assertNotNull( facade.getGeneralProps() ); + Assertions.assertNotNull( facade.getKeys() ); + Assertions.assertNotNull( facade.getIdSet() ); + Assertions.assertNotNull( facade.getDataList( TEST_CHAIN_ID ) ); facade.setChain( TEST_CHAIN_ID , chain ); return Boolean.TRUE; } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacade.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacade.java index a9709cd21..7ff29a7ca 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacade.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacade.java @@ -4,15 +4,15 @@ import java.io.Reader; import java.util.Properties; +import lombok.extern.slf4j.Slf4j; import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.base.facade.DocFacade; -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.BasicTest; - -public class TestDocFacade extends BasicTest { +@Slf4j +class TestDocFacade { public static final boolean VALID = true; public static final boolean NOT_VALID = false; @@ -24,23 +24,23 @@ public class TestDocFacade extends BasicTest { private boolean testValidateWorker( String path, boolean valid, boolean exception ) { return SafeFunction.get(() -> { try ( Reader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( path ) ) ) { - logger.info( "path : {}, valid: {}, exception: {} ", path, valid, exception ); + log.info( "path : {}, valid: {}, exception: {} ", path, valid, exception ); Properties params = new Properties(); boolean validResult = DocFacade.validate( reader , params ); - Assert.assertEquals( "Validation result" , valid, validResult ); + Assertions.assertEquals( valid, validResult ); return true; } }); } @Test - public void testOk01() { - Assert.assertTrue( this.testValidateWorker( "sample/doc_test_01.xml", VALID, NO_EXCEPTION ) ); + void testOk01() { + Assertions.assertTrue( this.testValidateWorker( "sample/doc_test_01.xml", VALID, NO_EXCEPTION ) ); } @Test - public void testKo02() { - Assert.assertTrue( this.testValidateWorker( "sample/doc_test_02_ko.xml", NOT_VALID, NO_EXCEPTION ) ); + void testKo02() { + Assertions.assertTrue( this.testValidateWorker( "sample/doc_test_02_ko.xml", NOT_VALID, NO_EXCEPTION ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSource.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSource.java index 0ca4e4449..48f5106a6 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSource.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSource.java @@ -1,7 +1,7 @@ package test.org.fugerit.java.doc.base.facade; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; import java.io.Reader; @@ -13,43 +13,41 @@ import org.fugerit.java.doc.base.config.DocException; import org.fugerit.java.doc.base.facade.DocFacadeSource; import org.fugerit.java.doc.base.facade.DocFacadeSourceConfig; -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.BasicTest; - -public class TestDocFacadeSource extends BasicTest { +class TestDocFacadeSource { private boolean textSupportedParser( boolean expected, int sourceType ) { return SafeFunction.get( () -> { boolean supported = DocFacadeSource.getInstance().isSourceSupported(sourceType); - assertEquals( "Failed doc parser supported check", expected , supported ); + assertEquals( expected , supported ); return supported; } ); } @Test - public void testParserXml() { - Assert.assertTrue( this.textSupportedParser( true, DocFacadeSource.SOURCE_TYPE_XML ) ); + void testParserXml() { + Assertions.assertTrue( this.textSupportedParser( true, DocFacadeSource.SOURCE_TYPE_XML ) ); } @Test - public void textParserDefault() { - Assert.assertTrue( this.textSupportedParser( true, DocFacadeSource.SOURCE_TYPE_DEFAULT ) ); + void textParserDefault() { + Assertions.assertTrue( this.textSupportedParser( true, DocFacadeSource.SOURCE_TYPE_DEFAULT ) ); } @Test - public void testParserJson() { - Assert.assertFalse( this.textSupportedParser( false, DocFacadeSource.SOURCE_TYPE_JSON ) ); + void testParserJson() { + Assertions.assertFalse( this.textSupportedParser( false, DocFacadeSource.SOURCE_TYPE_JSON ) ); } @Test - public void testParserYaml() { - Assert.assertFalse( this.textSupportedParser( false, DocFacadeSource.SOURCE_TYPE_YAML ) ); + void testParserYaml() { + Assertions.assertFalse( this.textSupportedParser( false, DocFacadeSource.SOURCE_TYPE_YAML ) ); } @Test - public void testParseKO1() throws IOException { + void testParseKO1() throws IOException { try ( Reader reader = new StringReader( "" ) ) { DocFacadeSource facade = DocFacadeSource.getInstance(); assertThrows( ConfigRuntimeException.class , () -> facade.parseRE(reader, DocFacadeSource.SOURCE_TYPE_XML) ); @@ -57,7 +55,7 @@ public void testParseKO1() throws IOException { } @Test - public void testParseKO2() throws IOException { + void testParseKO2() throws IOException { try ( Reader reader = new StringReader( "{}" ) ) { DocFacadeSource facade = DocFacadeSource.getInstance(); assertThrows( DocException.class , () -> facade.parse(reader, DocFacadeSource.SOURCE_TYPE_JSON) ); @@ -65,19 +63,19 @@ public void testParseKO2() throws IOException { } @Test - public void testParseKO3() throws IOException { + void testParseKO3() { DocFacadeSource facade = new DocFacadeSource( new DocFacadeSourceConfig( true ) ); assertThrows( ConfigRuntimeException.class , () -> facade.getParserForSource(DocFacadeSource.SOURCE_TYPE_JSON_NG) ); } @Test - public void testParseKO4() throws IOException { + void testParseKO4() { DocFacadeSource facade = new DocFacadeSource( new DocFacadeSourceConfig().withFailOnSourceModuleNotFound(true) ); - Assert.assertNull( facade.getParserForSource(-1) ); + Assertions.assertNull( facade.getParserForSource(-1) ); } @Test - public void textCleanInputStream() throws IOException { + void textCleanInputStream() throws IOException { String input = "test"; assertEquals( input, StreamIO.readString( DocFacadeSource.cleanSource( new StringReader(input), DocFacadeSource.SOURCE_TYPE_XML ) ) ); assertEquals( input, StreamIO.readString( DocFacadeSource.cleanSource( new StringReader(input), DocFacadeSource.SOURCE_TYPE_JSON ) ) ); @@ -85,7 +83,7 @@ public void textCleanInputStream() throws IOException { } @Test - public void textCleanInput() { + void textCleanInput() { String input = "test"; assertEquals( input, DocFacadeSource.cleanSource( input, DocFacadeSource.SOURCE_TYPE_XML ) ); assertEquals( input, DocFacadeSource.cleanSource( input, DocFacadeSource.SOURCE_TYPE_JSON ) ); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFacade.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFacade.java index 249ab91e3..f698ab167 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFacade.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFacade.java @@ -17,60 +17,60 @@ import org.fugerit.java.doc.base.facade.DocHandlerFacade; import org.fugerit.java.doc.base.facade.DocHandlerFactory; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownBasicTypeHandler; -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 TestDocHandlerFacade { +class TestDocHandlerFacade { private static final String XML_TEST_PATH = "coverage/xml/default_doc.xml"; @Test - public void testDocFacade() throws Exception { + void testDocFacade() throws Exception { // test register DocHandlerFacade facade = new DocHandlerFacade(); String testId = "test-id"; facade.registerHandlerAndId( "test-id" , SimpleMarkdownBasicTypeHandler.HANDLER ); - Assert.assertNotNull( facade.findHandler( testId ) ); + Assertions.assertNotNull( facade.findHandler( testId ) ); facade.registerHandlerAndId( testId, SimpleMarkdownBasicTypeHandler.HANDLER, true ); // only log duplicate - Assert.assertThrows( ConfigRuntimeException.class , () -> facade.registerHandlerAndId( testId, SimpleMarkdownBasicTypeHandler.HANDLER, false ) ); + Assertions.assertThrows( ConfigRuntimeException.class , () -> facade.registerHandlerAndId( testId, SimpleMarkdownBasicTypeHandler.HANDLER, false ) ); facade.registerHandler( SimpleMarkdownBasicTypeHandler.HANDLER, true, false ); // only log duplicate - Assert.assertThrows( ConfigException.class , () -> facade.registerHandler( SimpleMarkdownBasicTypeHandler.HANDLER, true, true ) ); + Assertions.assertThrows( ConfigException.class , () -> facade.registerHandler( SimpleMarkdownBasicTypeHandler.HANDLER, true, true ) ); // test direct 1 ok try ( Reader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( XML_TEST_PATH ) ); ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { facade.direct( reader , SimpleMarkdownBasicTypeHandler.HANDLER.getType() , baos ); - Assert.assertNotEquals( 0 , baos.toByteArray().length ); + Assertions.assertNotEquals( 0 , baos.toByteArray().length ); } // test direct 2 ok try ( Reader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( XML_TEST_PATH ) ); ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { facade.direct( reader , SimpleMarkdownBasicTypeHandler.HANDLER.getType() , DocOutput.newOutput(baos) ); - Assert.assertNotEquals( 0 , baos.toByteArray().length ); + Assertions.assertNotEquals( 0 , baos.toByteArray().length ); } // test direct 3 ko try ( Reader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( XML_TEST_PATH ) ); ByteArrayOutputStream baos = new ByteArrayOutputStream() ) { - Assert.assertThrows( ConfigException.class , () -> facade.direct( reader , "not-exists" , baos ) ); + Assertions.assertThrows( ConfigException.class , () -> facade.direct( reader , "not-exists" , baos ) ); } // print handlers for ( DocTypeHandler handler : facade.handlers() ) { log.info( "current handler {}", handler ); } DocHandlerFactory.register( new FactoryCatalog() ); - Assert.assertFalse( facade.listHandlersForType( SimpleMarkdownBasicTypeHandler.HANDLER.getType() ).isEmpty() ); + Assertions.assertFalse( facade.listHandlersForType( SimpleMarkdownBasicTypeHandler.HANDLER.getType() ).isEmpty() ); facade.logHandlersInfo(); // findHandlerRequired - Assert.assertNotNull( facade.findHandlerRequired( DocConfig.TYPE_MD ) ); - Assert.assertThrows( ConfigRuntimeException.class, () -> facade.findHandlerRequired( "not-found" ) ); + Assertions.assertNotNull( facade.findHandlerRequired( DocConfig.TYPE_MD ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> facade.findHandlerRequired( "not-found" ) ); } @Test - public void testFullMap() { + void testFullMap() { DocHandlerFacade facade = new DocHandlerFacade(); - Assert.assertNotNull( SafeFunction.get( () -> { + Assertions.assertNotNull( SafeFunction.get( () -> { // for full map testing facade.registerHandlerAndId( "test-1" , new TestDocTypeHandler( DocConfig.TYPE_PDF , DocConfig.FORMAT_PDF_A_1B ), true ); facade.registerHandlerAndId( "test-2" , new TestDocTypeHandler( DocConfig.TYPE_PDF , DocConfig.TYPE_PDF ), true ); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFactory.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFactory.java index ac96c89fe..863e755a0 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFactory.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocHandlerFactory.java @@ -10,13 +10,13 @@ import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.base.facade.DocHandlerFacade; import org.fugerit.java.doc.base.facade.DocHandlerFactory; -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 TestDocHandlerFactory { +class TestDocHandlerFactory { private static final String XML_CONFIG_PATH = "coverage/config/doc-handler-sample.xml"; @@ -25,32 +25,32 @@ public class TestDocHandlerFactory { private static final String DEFAULT_CATALOG_ID = "default-complete"; @Test - public void testFacatoryUseCatalog() { + void testFacatoryUseCatalog() { DocHandlerFacade facade = DocHandlerFactory.register( StreamHelper.PATH_CLASSLOADER+XML_CONFIG_PATH, TEST_CATALOG_ID ); - Assert.assertNotNull( facade.findHandler( DocConfig.TYPE_MD ) ); + Assertions.assertNotNull( facade.findHandler( DocConfig.TYPE_MD ) ); } @Test - public void testFacatoryDefaultCatalog() { + void testFacatoryDefaultCatalog() { DocHandlerFacade facade = DocHandlerFactory.register( StreamHelper.PATH_CLASSLOADER+XML_CONFIG_PATH ); - Assert.assertNotNull( facade.findHandler( DocConfig.TYPE_MD ) ); + Assertions.assertNotNull( facade.findHandler( DocConfig.TYPE_MD ) ); } @Test - public void testNewInstace() { + void testNewInstace() { DocHandlerFactory factory = DocHandlerFactory.newInstance( StreamHelper.PATH_CLASSLOADER+XML_CONFIG_PATH ); - Assert.assertEquals( DEFAULT_CATALOG_ID , factory.getUseCatalog() ); + Assertions.assertEquals( DEFAULT_CATALOG_ID , factory.getUseCatalog() ); log.info( "hash code : {}", factory.hashCode() ); boolean eqCheck = factory.equals( factory ); - Assert.assertTrue( eqCheck ); + Assertions.assertTrue( eqCheck ); } @Test - public void testFromCatalog() throws IOException { + void testFromCatalog() throws IOException { FactoryCatalog catalog = new FactoryCatalog(); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( XML_CONFIG_PATH ) ) { GenericListCatalogConfig.load( is , catalog ); - Assert.assertNotNull( DocHandlerFactory.register( catalog.getDataList( DEFAULT_CATALOG_ID ) ) ); + Assertions.assertNotNull( DocHandlerFactory.register( catalog.getDataList( DEFAULT_CATALOG_ID ) ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestSourceResolverHelper.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestSourceResolverHelper.java index 4bcb0aee5..b4be033e3 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestSourceResolverHelper.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestSourceResolverHelper.java @@ -7,26 +7,26 @@ import org.fugerit.java.core.lang.helpers.ClassHelper; import org.fugerit.java.doc.base.helper.SourceResolverHelper; import org.fugerit.java.doc.base.model.DocImage; -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 TestSourceResolverHelper { +class TestSourceResolverHelper { @Test - public void test1() throws IOException { + void test1() throws IOException { DocImage docImage = new DocImage(); - Assert.assertThrows( IOException.class , () -> SourceResolverHelper.resolveImageToBase64( docImage ) ); - Assert.assertThrows( IOException.class , () -> SourceResolverHelper.resolveImage( docImage ) ); + Assertions.assertThrows( IOException.class , () -> SourceResolverHelper.resolveImageToBase64( docImage ) ); + Assertions.assertThrows( IOException.class , () -> SourceResolverHelper.resolveImage( docImage ) ); String pathImg = "test/img_test_blue.png"; String base64 = Base64.getEncoder().encodeToString( StreamIO.readBytes( ClassHelper.loadFromDefaultClassLoader( pathImg ) ) ); docImage.setBase64(base64); - Assert.assertNotNull( SourceResolverHelper.resolveImage(docImage) ); + Assertions.assertNotNull( SourceResolverHelper.resolveImage(docImage) ); docImage.setBase64( null ); docImage.setUrl( "https://github.com/fugerit-org/fj-doc/blob/main/fj-doc-base/src/test/resources/test/img_test_red.png" ); - Assert.assertNotNull( SourceResolverHelper.resolveImage(docImage) ); + Assertions.assertNotNull( SourceResolverHelper.resolveImage(docImage) ); log.info( "docImage : {}", docImage ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestTextWrapHelper.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestTextWrapHelper.java index f7ab613a8..e2d4647f8 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestTextWrapHelper.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/helper/TestTextWrapHelper.java @@ -1,17 +1,17 @@ package test.org.fugerit.java.doc.base.helper; import org.fugerit.java.doc.base.helper.TextWrapHelper; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestTextWrapHelper { +class TestTextWrapHelper { @Test - public void testWrap() { + void testWrap() { String input = "123"; String test = "1"+TextWrapHelper.ZERO_WITH_SPACE+"2"+TextWrapHelper.ZERO_WITH_SPACE+"3"+TextWrapHelper.ZERO_WITH_SPACE; String out = TextWrapHelper.padZeroWithSpace( input ); - Assert.assertEquals( test, out ); + Assertions.assertEquals( test, out ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/md/TestMDHandlers.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/md/TestMDHandlers.java index aaa28a7e6..805bfb8f0 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/md/TestMDHandlers.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/md/TestMDHandlers.java @@ -11,36 +11,36 @@ import org.fugerit.java.doc.base.typehandler.markdown.MarkdownExtDocFacade; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownBasicTypeHandlerNoCommentsUTF8; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandlerNoCommentsUTF8; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestMDHandlers { +class TestMDHandlers { @Test - public void testSimpleMarkdownBasicTypeHandlerNoCommentsUTF8() throws IOException { - Assert.assertNotNull( new SimpleMarkdownBasicTypeHandlerNoCommentsUTF8() ); + void testSimpleMarkdownBasicTypeHandlerNoCommentsUTF8() throws IOException { + Assertions.assertNotNull( new SimpleMarkdownBasicTypeHandlerNoCommentsUTF8() ); } @Test - public void testSimpleMarkdownExtTypeHandlerNoCommentsUTF8() throws IOException { - Assert.assertNotNull( new SimpleMarkdownExtTypeHandlerNoCommentsUTF8() ); + void testSimpleMarkdownExtTypeHandlerNoCommentsUTF8() throws IOException { + Assertions.assertNotNull( new SimpleMarkdownExtTypeHandlerNoCommentsUTF8() ); } @Test - public void testMarkdownBasicDocFacade1() throws IOException, DocException { + void testMarkdownBasicDocFacade1() throws IOException, DocException { try ( PrintWriter writer = new PrintWriter( System.out ) ) { MarkdownBasicDocFacade facade = new MarkdownBasicDocFacade( writer ); - Assert.assertNotNull( facade ); + Assertions.assertNotNull( facade ); DocBase docBase = new DocBase(); facade.handleDoc(docBase); } } @Test - public void testMarkdownBasicDocFacade2() throws IOException, DocException { + void testMarkdownBasicDocFacade2() throws IOException, DocException { try ( PrintWriter writer = new PrintWriter( System.out ) ) { MarkdownBasicDocFacade facade = new MarkdownBasicDocFacade( writer, false ); - Assert.assertNotNull( facade ); + Assertions.assertNotNull( facade ); DocBase docBase = new DocBase(); DocList docList = new DocList(); docList.addElement( new DocPara() ); // impossible situation, just for coverage @@ -50,10 +50,10 @@ public void testMarkdownBasicDocFacade2() throws IOException, DocException { } @Test - public void testMarkdownExtDocFacade1() throws IOException, DocException { + void testMarkdownExtDocFacade1() throws IOException, DocException { try ( PrintWriter writer = new PrintWriter( System.out ) ) { MarkdownExtDocFacade facade = new MarkdownExtDocFacade( writer ); - Assert.assertNotNull( facade ); + Assertions.assertNotNull( facade ); DocBase docBase = new DocBase(); facade.handleDoc(docBase); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/HelperDocT.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/HelperDocT.java index 5725dc176..ccf980803 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/HelperDocT.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/HelperDocT.java @@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j -public class HelperDocT { +class HelperDocT { public static final String TEST_ID = "1"; diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestBarcode.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestBarcode.java index 42fb70f0c..8d475ea51 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestBarcode.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestBarcode.java @@ -1,23 +1,23 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocBarcode; -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 TestBarcode { +class TestBarcode { @Test - public void test1() { + void test1() { DocBarcode model = new DocBarcode(); model.setId( "a" ); model.setText( "text" ); model.setType( "EAN16" ); model.setSize( 10 ); log.info( "model -> {}, {}, {}, {}", model.getId(), model.getText(), model.getSize(), model.getType() ); - Assert.assertNotNull( model ); + Assertions.assertNotNull( model ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBackground.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBackground.java index 838347815..46d6b75db 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBackground.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBackground.java @@ -1,10 +1,10 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocBackground; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestDocBackground extends HelperDocT { +class TestDocBackground extends HelperDocT { private String worker( DocBackground element ) { this.baseTest(element); @@ -12,10 +12,10 @@ private String worker( DocBackground element ) { } @Test - public void testElement() { + void testElement() { DocBackground element = new DocBackground(); element.setId( TEST_ID ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBase.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBase.java index 291d319fc..336492fb8 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBase.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBase.java @@ -6,16 +6,16 @@ import org.fugerit.java.doc.base.model.DocHeader; import org.fugerit.java.doc.base.model.DocInfo; import org.fugerit.java.doc.base.model.DocPara; -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 TestDocBase { +class TestDocBase { @Test - public void test1() { + void test1() { DocBase docBase = new DocBase(); docBase.setDocMeta( new DocContainer() ); DocInfo info = new DocInfo(); @@ -47,9 +47,9 @@ public void test1() { log.info( "info 8 : {}", docBase.isUseFooter() ); log.info( "info 9 : {}", docBase.isUseHeader() ); DocBase.print(docBase, System.out); - Assert.assertNotNull( docBase ); - Assert.assertNull( docBase.getDocBackground() ); - Assert.assertNull( docBase.getDocBookmarkTree() ); + Assertions.assertNotNull( docBase ); + Assertions.assertNull( docBase.getDocBackground() ); + Assertions.assertNull( docBase.getDocBookmarkTree() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBoders.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBoders.java index 8318cd8ed..fea56cd51 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBoders.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBoders.java @@ -3,13 +3,13 @@ import java.util.Properties; import org.fugerit.java.doc.base.model.DocBorders; -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 TestDocBoders extends HelperDocT { +class TestDocBoders extends HelperDocT { private static final String DEFAULT_WIDTH_AND_PADDING = "2"; @@ -19,20 +19,20 @@ private String worker( DocBorders element ) { } @Test - public void testElement() { + void testElement() { DocBorders element = new DocBorders(); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } @Test - public void testFrom() { + void testFrom() { Properties atts = new Properties(); atts.setProperty( DocBorders.ATTRIBUTE_NAME_BORDER_WIDTH , DEFAULT_WIDTH_AND_PADDING ); DocBorders element = DocBorders.createBorders(atts, DEFAULT_WIDTH_AND_PADDING ); DocBorders copyFull = new DocBorders( element ); DocBorders copyVoid = new DocBorders( null ); - Assert.assertEquals( DEFAULT_WIDTH_AND_PADDING , String.valueOf( copyFull.getBorderWidthBottom() ) ); - Assert.assertNotEquals( DEFAULT_WIDTH_AND_PADDING , String.valueOf( copyVoid.getBorderWidthBottom() ) ); + Assertions.assertEquals( DEFAULT_WIDTH_AND_PADDING , String.valueOf( copyFull.getBorderWidthBottom() ) ); + Assertions.assertNotEquals( DEFAULT_WIDTH_AND_PADDING , String.valueOf( copyVoid.getBorderWidthBottom() ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBookmark.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBookmark.java index 4da44ba3a..2c7abf560 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBookmark.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocBookmark.java @@ -1,13 +1,13 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocBookmark; -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 TestDocBookmark extends HelperDocT { +class TestDocBookmark extends HelperDocT { private String worker( DocBookmark element ) { this.baseTest( element ); @@ -17,12 +17,12 @@ private String worker( DocBookmark element ) { } @Test - public void testElement() { + void testElement() { DocBookmark element = new DocBookmark(); element.setId( TEST_ID ); element.setRef( "test" ); element.setTitle( "title" ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocCell.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocCell.java index 37b1cb53f..46018cc3e 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocCell.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocCell.java @@ -1,23 +1,23 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocCell; -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 TestDocCell { +class TestDocCell { @Test - public void test1() { + void test1() { DocCell model = new DocCell(); model.setRSpan(0); model.setCSpan(0); log.info( "model -> {}", model ); - Assert.assertEquals( 1 , model.getRowSpan() ); - Assert.assertEquals( 1 , model.getColumnSpan() ); - Assert.assertFalse( model.isHeader() ); + Assertions.assertEquals( 1 , model.getRowSpan() ); + Assertions.assertEquals( 1 , model.getColumnSpan() ); + Assertions.assertFalse( model.isHeader() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocHeaderFooter.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocHeaderFooter.java index cabb3828b..d66637333 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocHeaderFooter.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocHeaderFooter.java @@ -1,21 +1,21 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocHeaderFooter; -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 TestDocHeaderFooter { +class TestDocHeaderFooter { @Test - public void test1() { + void test1() { DocHeaderFooter model = new DocHeaderFooter(); model.setNumbered( true ); log.info( "model {} - {} - {}", model.getExpectedSize(), model.getAlign(), model.getBorderWidth() ); - Assert.assertTrue( model.isNumbered() ); - Assert.assertTrue( model.isBasic() ); + Assertions.assertTrue( model.isNumbered() ); + Assertions.assertTrue( model.isBasic() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocImage.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocImage.java index 29d4ef47f..cc33cca8a 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocImage.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocImage.java @@ -1,21 +1,21 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocImage; -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 TestDocImage extends HelperDocT { +class TestDocImage extends HelperDocT { @Test - public void testElement1() { + void testElement1() { DocImage image = new DocImage(); image.setUrl( DocImage.TYPE_JPG ); - Assert.assertEquals( DocImage.TYPE_JPG, image.getResolvedType() ); + Assertions.assertEquals( DocImage.TYPE_JPG, image.getResolvedType() ); image.setType( DocImage.TYPE_PNG ); - Assert.assertEquals( DocImage.TYPE_PNG, image.getResolvedType() ); + Assertions.assertEquals( DocImage.TYPE_PNG, image.getResolvedType() ); log.info( "accepted types : {}", DocImage.getAcceptedImageTypes() ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocLi.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocLi.java index 4b135621d..c81c02003 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocLi.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocLi.java @@ -3,13 +3,13 @@ import org.fugerit.java.doc.base.model.DocLi; import org.fugerit.java.doc.base.model.DocList; import org.fugerit.java.doc.base.model.DocPara; -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 TestDocLi extends HelperDocT { +class TestDocLi extends HelperDocT { private String worker( DocLi element ) { @@ -24,36 +24,36 @@ private String worker( DocLi element ) { } @Test - public void testElement1() { + void testElement1() { DocLi element = new DocLi(); element.setId( TEST_ID ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocPara() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocList() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } @Test - public void testElement2() { + void testElement2() { DocLi element = new DocLi(); element.setId( TEST_ID ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocPara() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocPara() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } @Test - public void testElement3() { + void testElement3() { DocLi element = new DocLi(); element.setId( TEST_ID ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocList() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.getElementList().add( new DocList() ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocList.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocList.java index 1f8bf65e1..674442616 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocList.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocList.java @@ -1,13 +1,13 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocList; -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 TestDocList extends HelperDocT { +class TestDocList extends HelperDocT { private String worker( DocList element ) { @@ -18,25 +18,25 @@ private String worker( DocList element ) { } @Test - public void testElement() { + void testElement() { DocList element = new DocList(); element.setId( TEST_ID ); element.setListType( DocList.LIST_TYPE_OL ); - Assert.assertNotNull( this.worker( element ) ); - Assert.assertFalse( element.isUnordered() ); - Assert.assertTrue( element.isOrdered() ); + Assertions.assertNotNull( this.worker( element ) ); + Assertions.assertFalse( element.isUnordered() ); + Assertions.assertTrue( element.isOrdered() ); element.setListType( DocList.LIST_TYPE_OLL ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.setListType( DocList.LIST_TYPE_OLN ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.setListType( DocList.LIST_TYPE_UL ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.setListType( DocList.LIST_TYPE_ULD ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); element.setListType( DocList.LIST_TYPE_ULM ); - Assert.assertNotNull( this.worker( element ) ); - Assert.assertTrue( element.isUnordered() ); - Assert.assertFalse( element.isOrdered() ); + Assertions.assertNotNull( this.worker( element ) ); + Assertions.assertTrue( element.isUnordered() ); + Assertions.assertFalse( element.isOrdered() ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocNbsp.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocNbsp.java index f225792fc..aeec365e0 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocNbsp.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocNbsp.java @@ -1,13 +1,13 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocNbsp; -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 TestDocNbsp extends HelperDocT { +class TestDocNbsp extends HelperDocT { private String worker( DocNbsp element ) { this.baseTest( element ); @@ -16,11 +16,11 @@ private String worker( DocNbsp element ) { } @Test - public void testElement() { + void testElement() { DocNbsp element = new DocNbsp(); element.setId( TEST_ID ); element.setLength( 10 ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPara.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPara.java index f9b6d821a..669944f5d 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPara.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPara.java @@ -4,16 +4,16 @@ import org.fugerit.java.doc.base.model.DocPara; import org.fugerit.java.doc.base.typehelper.generic.FormatTypeConsts; -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 TestDocPara { +class TestDocPara { @Test - public void testNumber() { + void testNumber() { DocPara model = new DocPara(); model.setText( "100000.0" ); model.setType( FormatTypeConsts.TYPE_NUMBER ); @@ -23,18 +23,18 @@ public void testNumber() { model.setFormat( "#,###" ); n = FormatTypeConsts.standardNumberParse( model.getText() , model.getFormat() ); log.info( "n : {} -> {}", n.getClass(), n ); - Assert.assertEquals( 100000L , n ); + Assertions.assertEquals( 100000L , n ); } @Test - public void testDate() { + void testDate() { DocPara model = new DocPara(); model.setText( "2023-10-03" ); model.setType( FormatTypeConsts.TYPE_DATE ); log.info( "test : {}, type : {}", model.getText(), model.getType() ); Date d = FormatTypeConsts.standardDateParse( model.getText() , model.getFormat() ); log.info( "d : {} -> {}", d.getClass(), d ); - Assert.assertEquals( java.sql.Date.valueOf( model.getText() ), d ); + Assertions.assertEquals( java.sql.Date.valueOf( model.getText() ), d ); model.setFormat( "yyyy-MM-dd" ); FormatTypeConsts.standardDateParse( model.getText() , model.getFormat() ); log.info( "d : {} -> {}", d.getClass(), d ); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPhrase.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPhrase.java index 37132516b..73fdcdc58 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPhrase.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocPhrase.java @@ -1,29 +1,29 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocPhrase; -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 TestDocPhrase { +class TestDocPhrase { @Test - public void testModel() { + void testModel() { DocPhrase model = new DocPhrase(); model.setForeColor( "#00000" ); model.setBackColor( "#ffffff" ); model.setFontName( "Arial" ); model.setWhiteSpaceCollapse( "true" ); - Assert.assertFalse( model.isInternal() ); + Assertions.assertFalse( model.isInternal() ); model.setLink( "www.test.it" ); - Assert.assertFalse( model.isInternal() ); + Assertions.assertFalse( model.isInternal() ); model.setLink( "#test" ); log.info( "fore-color : {} , back-color : {}", model.getForeColor(), model.getBackColor() ); log.info( "font-name : {} , white-space-ignore : {}", model.getFontName(), model.getWhiteSpaceCollapse() ); - Assert.assertTrue( model.isInternal() ); - Assert.assertEquals( "test" , model.getInternalLink() ); + Assertions.assertTrue( model.isInternal() ); + Assertions.assertEquals( "test" , model.getInternalLink() ); model.setLeading( 1.0F ); log.info( "leading : {}, originaStyle", model.getLeading(), model.getOriginalStyle() ); } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocText.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocText.java index 4f71d58fc..75de72635 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocText.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/model/TestDocText.java @@ -1,13 +1,13 @@ package test.org.fugerit.java.doc.base.model; import org.fugerit.java.doc.base.model.DocText; -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 TestDocText extends HelperDocT { +class TestDocText extends HelperDocT { private String worker( DocText element ) { @@ -18,12 +18,12 @@ private String worker( DocText element ) { } @Test - public void testElement() { + void testElement() { DocText element = new DocText(); element.setId( TEST_ID ); element.setHAlign( 1 ); element.setVAlign( 2 ); - Assert.assertNotNull( this.worker( element ) ); + Assertions.assertNotNull( this.worker( element ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/process/TestDocProcessContext.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/process/TestDocProcessContext.java index e898941cd..705734288 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/process/TestDocProcessContext.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/process/TestDocProcessContext.java @@ -8,30 +8,30 @@ import org.fugerit.java.doc.base.facade.DocFacadeSource; import org.fugerit.java.doc.base.model.DocBase; 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 lombok.extern.slf4j.Slf4j; @Slf4j -public class TestDocProcessContext { +class TestDocProcessContext { @Test - public void testContext1() { + void testContext1() { DocProcessContext context = DocProcessContext.newContext( "c", "d" ).withSourceType(DocFacadeSource.SOURCE_TYPE_XML) .withAtt( "a" , "b" ).withDocBase( new DocBase() ).withDocType( DocConfig.TYPE_PDF ); log.info( "context : {}", context ); - Assert.assertEquals( "b" , context.getAttribute( "a" ) ); - Assert.assertEquals( DocFacadeSource.SOURCE_TYPE_XML , context.getSourceType() ); + Assertions.assertEquals( "b" , context.getAttribute( "a" ) ); + Assertions.assertEquals( DocFacadeSource.SOURCE_TYPE_XML , context.getSourceType() ); } @Test - public void testContext2() { + void testContext2() { Map map = new HashMap<>(); map.put( "a" , "b" ); DocProcessContext context = DocProcessContext.newContext( map ).withDocInput( DocInput.newInput( DocConfig.TYPE_PDF, new DocBase()) ); log.info( "context : {}", context ); - Assert.assertEquals( "b" , context.getAttribute( "a" ) ); + Assertions.assertEquals( "b" , context.getAttribute( "a" ) ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocModelUtils.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocModelUtils.java index f43bd64fd..271c56ee1 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocModelUtils.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocModelUtils.java @@ -3,14 +3,14 @@ import java.awt.Color; import org.fugerit.java.doc.base.xml.DocModelUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestDocModelUtils { +class TestDocModelUtils { @Test - public void test1() { - Assert.assertEquals( Color.WHITE , DocModelUtils.parseHtmlColor("#FFFFFF") ); + void test1() { + Assertions.assertEquals( Color.WHITE , DocModelUtils.parseHtmlColor("#FFFFFF") ); } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocValidator.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocValidator.java index f88b50684..bbe419737 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocValidator.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocValidator.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.base.xml; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.InputStream; import java.io.InputStreamReader; @@ -10,14 +10,15 @@ import org.fugerit.java.core.xml.XMLException; import org.fugerit.java.core.xml.sax.SAXParseResult; import org.fugerit.java.doc.base.xml.DocValidator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import org.fugerit.java.test.helper.core.io.ReaderFail; import lombok.extern.slf4j.Slf4j; -import test.org.fugerit.java.helpers.io.ReaderFail; @Slf4j -public class TestDocValidator { +class TestDocValidator { private static final String VALID_XML_PATH = "sample/doc_test_01.xml"; @@ -28,7 +29,7 @@ private void failEx( Exception e ) { } @Test - public void testValidate() { + void testValidate() { String fullPath = VALID_XML_PATH; log.info( "validate -> {}", fullPath ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( fullPath ); @@ -37,14 +38,14 @@ public void testValidate() { boolean ok = result.isPartialSuccess(); DocValidator.logResult(result, log); log.info( "Validation result {}", ok ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } catch (Exception e) { this.failEx(e); } } @Test - public void testValidateVersion() { + void testValidateVersion() { String fullPath = VALID_XML_PATH; log.info( "validate -> {}", fullPath ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( fullPath ); @@ -53,43 +54,43 @@ public void testValidateVersion() { boolean ok = result.isPartialSuccess(); DocValidator.logResult(result, log); log.info( "Validation result {}", ok ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } catch (Exception e) { this.failEx(e); } } @Test - public void testValidateLoggerKo() { + void testValidateLoggerKo() { String fullPath = "sample/doc_test_02_ko.xml"; log.info( "validate -> {}", fullPath ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( fullPath ); Reader reader = new InputStreamReader(is)) { boolean ok = DocValidator.logValidation(reader, log); log.info( "Validation result {}", ok ); - Assert.assertTrue( !ok ); + Assertions.assertTrue( !ok ); } catch (Exception e) { this.failEx(e); } } @Test - public void testValidateLoggerOk() { + void testValidateLoggerOk() { String fullPath = VALID_XML_PATH; log.info( "validate -> {}", fullPath ); try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( fullPath ); Reader reader = new InputStreamReader(is)) { boolean ok = DocValidator.logValidation(reader, log); log.info( "Validation result {}", ok ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } catch (Exception e) { this.failEx(e); } } @Test - public void testValidateFail() { - Assert.assertThrows( XMLException.class, () -> { + void testValidateFail() { + Assertions.assertThrows( XMLException.class, () -> { try ( Reader reader = new ReaderFail() ) { SAXParseResult result = DocValidator.validate( reader ); fail( "Should not get here : "+result ); @@ -98,8 +99,8 @@ public void testValidateFail() { } @Test - public void testValidateVersionFail() { - Assert.assertThrows( XMLException.class, () -> { + void testValidateVersionFail() { + Assertions.assertThrows( XMLException.class, () -> { try ( Reader reader = new ReaderFail() ) { SAXParseResult result = DocValidator.validateVersion( reader ); fail( "Should not get here : "+result ); @@ -108,8 +109,8 @@ public void testValidateVersionFail() { } @Test - public void testValidateLoggerFail() { - Assert.assertThrows( XMLException.class, () -> { + void testValidateLoggerFail() { + Assertions.assertThrows( XMLException.class, () -> { try ( Reader reader = new ReaderFail() ) { boolean result = DocValidator.logValidation( reader, log ); fail( "Should not get here : "+result ); @@ -118,8 +119,8 @@ public void testValidateLoggerFail() { } @Test - public void testGetXsdVersion() { - Assert.assertThrows( XMLException.class, () -> { + void testGetXsdVersion() { + Assertions.assertThrows( XMLException.class, () -> { try ( Reader reader = new ReaderFail() ) { String result = DocValidator.getXsdVersion(reader); fail( "Should not get here : "+result ); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXMLUtils.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXMLUtils.java index d2127e4d9..705279a53 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXMLUtils.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXMLUtils.java @@ -6,25 +6,25 @@ import org.fugerit.java.doc.base.facade.DocFacadeSource; import org.fugerit.java.doc.base.model.DocBase; import org.fugerit.java.doc.base.xml.DocXMLUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; -public class TestDocXMLUtils { +class TestDocXMLUtils { @Test - public void cleanXml() throws IOException, DocException { + void cleanXml() throws IOException, DocException { try ( InputStream stream = ClassHelper.loadFromDefaultClassLoader( "sample/default_doc_toclean.xml" ) ) { String text = StreamIO.readString( stream ); try (StringReader reader = new StringReader( text ) ) { - Assert.assertThrows( DocException.class, () -> DocFacadeSource.getInstance().parse( reader, DocFacadeSource.SOURCE_TYPE_XML ) ); + Assertions.assertThrows( DocException.class, () -> DocFacadeSource.getInstance().parse( reader, DocFacadeSource.SOURCE_TYPE_XML ) ); } try (StringReader reader = new StringReader(DocXMLUtils.cleanXML( text )) ) { DocBase docBase = DocFacadeSource.getInstance().parse( reader, DocFacadeSource.SOURCE_TYPE_XML ); - Assert.assertNotNull( docBase ); + Assertions.assertNotNull( docBase ); } } } diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXmlParser.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXmlParser.java index 904fb499f..82b2aea85 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXmlParser.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestDocXmlParser.java @@ -5,6 +5,7 @@ import java.io.InputStreamReader; import java.io.Reader; +import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.function.SimpleValue; import org.fugerit.java.core.io.helper.StreamHelper; import org.fugerit.java.core.lang.helpers.ClassHelper; @@ -19,15 +20,13 @@ import org.fugerit.java.doc.base.parser.DocValidationResult; import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler; import org.fugerit.java.doc.base.xml.DocXmlParser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; -import test.org.fugerit.java.BasicTest; - -public class TestDocXmlParser extends BasicTest { +class TestDocXmlParser { public static final boolean VALID = true; public static final boolean NOT_VALID = false; @@ -38,17 +37,17 @@ public class TestDocXmlParser extends BasicTest { private final static Logger logger = LoggerFactory.getLogger( TestDocXmlParser.class ); @Test - public void testFillDocValidationResultHelper() { + void testFillDocValidationResultHelper() { SAXParseResult result = new SAXParseResult(); result.putWarning( new SAXException( "warning" ) ); DocValidationResult docResult = new DocValidationResult( Result.RESULT_CODE_OK ); DocXmlParser.fillDocValidationResultHelper(result, docResult); - Assert.assertFalse( docResult.getInfoList().isEmpty() ); + Assertions.assertFalse( docResult.getInfoList().isEmpty() ); } private boolean validateWorker( String path, boolean valid, boolean exception ) { SimpleValue res = new SimpleValue<>( true ); - runTestEx( () -> { + SafeFunction.apply( () -> { String fullPath = "sample/"+path+".xml"; logger.info( "validate -> {}, valid : {}, exception : {}", fullPath, valid, exception ); DocParser parser = new DocXmlParser(); @@ -61,7 +60,7 @@ private boolean validateWorker( String path, boolean valid, boolean exception ) for ( String error : result.getInfoList() ) { logger.info( "Validation info {}", error ); } - Assert.assertEquals( "Validation result" , valid, result.isResultOk() ); + Assertions.assertEquals( valid, result.isResultOk() ); } } ); return res.getValue(); @@ -69,7 +68,7 @@ private boolean validateWorker( String path, boolean valid, boolean exception ) private boolean parseWorker( String path ) { SimpleValue res = new SimpleValue<>( true ); - runTestEx( () -> { + SafeFunction.apply( () -> { DocTypeHandler handler = SimpleMarkdownExtTypeHandler.HANDLER; try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "sample/"+path+".xml" ); FileOutputStream fos = new FileOutputStream( "target/"+path+"."+handler.getType() ) ) { @@ -85,39 +84,39 @@ private boolean parseWorker( String path ) { } @Test - public void testParseCoverage01() { - Assert.assertTrue( this.parseWorker( "default_doc" ) ); + void testParseCoverage01() { + Assertions.assertTrue( this.parseWorker( "default_doc" ) ); } @Test - public void testParseCoverage02() { - Assert.assertTrue( this.parseWorker( "default_doc_alt" ) ); + void testParseCoverage02() { + Assertions.assertTrue( this.parseWorker( "default_doc_alt" ) ); } @Test - public void testParseCoverage03() { - Assert.assertTrue( this.parseWorker( "default_doc_fail1" ) ); + void testParseCoverage03() { + Assertions.assertTrue( this.parseWorker( "default_doc_fail1" ) ); } @Test - public void testParse01() { - Assert.assertTrue( this.parseWorker( "doc_test_01" ) ); + void testParse01() { + Assertions.assertTrue( this.parseWorker( "doc_test_01" ) ); } @Test - public void testValidateOk01() { - Assert.assertTrue( this.validateWorker( "doc_test_01", VALID, NO_EXCEPTION) ); + void testValidateOk01() { + Assertions.assertTrue( this.validateWorker( "doc_test_01", VALID, NO_EXCEPTION) ); } @Test - public void testValidateKo02() { - Assert.assertTrue( this.validateWorker( "doc_test_02_ko", NOT_VALID, NO_EXCEPTION) ); + void testValidateKo02() { + Assertions.assertTrue( this.validateWorker( "doc_test_02_ko", NOT_VALID, NO_EXCEPTION) ); } @Test - public void parseVersion01() { + void parseVersion01() { SimpleValue res = new SimpleValue<>( false ); - runTestEx( () -> { + SafeFunction.apply( () -> { String fullPath = "cl://sample/doc_test_01.xml"; logger.info( "validate -> {}", fullPath ); DocParser parser = new DocXmlParser(); @@ -126,13 +125,13 @@ public void parseVersion01() { res.setValue( Result.RESULT_CODE_OK == pr ); } } ); - Assert.assertTrue( res.getValue().booleanValue() ); + Assertions.assertTrue( res.getValue().booleanValue() ); } @Test - public void parseFail() { + void parseFail() { boolean failOnElementNotFound = true; - Assert.assertThrows( DocException.class , () -> { + Assertions.assertThrows( DocException.class , () -> { String fullPath = "cl://coverage/xml/default_doc_fail2.xml"; logger.info( "validate -> {}", fullPath ); DocParser parser = new DocXmlParser( failOnElementNotFound ); diff --git a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestSAXUtils.java b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestSAXUtils.java index 1b97073f1..c46a7c70f 100644 --- a/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestSAXUtils.java +++ b/fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/xml/TestSAXUtils.java @@ -5,25 +5,25 @@ import org.fugerit.java.core.cfg.ConfigRuntimeException; import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.doc.base.xml.SAXUtils; -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 TestSAXUtils { +class TestSAXUtils { @Test - public void testNewSafeInstance() { - Assert.assertNotNull(SafeFunction.get( () -> SAXUtils.newSafeFactory() ) ); + void testNewSafeInstance() { + Assertions.assertNotNull(SafeFunction.get( () -> SAXUtils.newSafeFactory() ) ); } @Test - public void testNewInstanceFail() { + void testNewInstanceFail() { Map features = new HashMap<>(); features.put( "http://xml.org/sax/features/external-general-entities" , false); features.put( "feature-not-exists" , false); - Assert.assertThrows( ConfigRuntimeException.class, () -> SAXUtils.newSafeFactory(features) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> SAXUtils.newSafeFactory(features) ); } } diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml index b4c12ade8..c45027f69 100644 --- a/fj-doc-freemarker/pom.xml +++ b/fj-doc-freemarker/pom.xml @@ -108,6 +108,12 @@ test + + junit + junit + test + + org.fugerit.java fj-test-helper8 diff --git a/fj-doc-guide/pom.xml b/fj-doc-guide/pom.xml index f7dc1034e..6eb1f6021 100644 --- a/fj-doc-guide/pom.xml +++ b/fj-doc-guide/pom.xml @@ -222,18 +222,6 @@ org.fugerit.java fj-doc-freemarker - - - org.fugerit.java - fj-test-helper8 - test - - - * - * - - - diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml index d1b315213..4230ebdd0 100644 --- a/fj-doc-lib-autodoc/pom.xml +++ b/fj-doc-lib-autodoc/pom.xml @@ -109,6 +109,12 @@ runtime + + junit + junit + test + + diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml index fbc0e4ada..edddf930e 100644 --- a/fj-doc-lib-simpletable-import/pom.xml +++ b/fj-doc-lib-simpletable-import/pom.xml @@ -60,6 +60,12 @@ fj-doc-mod-opencsv + + junit + junit + test + + diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml index 692ca7073..796e9dc7c 100644 --- a/fj-doc-lib-simpletable/pom.xml +++ b/fj-doc-lib-simpletable/pom.xml @@ -45,6 +45,12 @@ fj-doc-freemarker + + junit + junit + test + + org.fugerit.java fj-test-helper8 diff --git a/fj-doc-maven-plugin/pom.xml b/fj-doc-maven-plugin/pom.xml index ba72da575..3da9e0455 100644 --- a/fj-doc-maven-plugin/pom.xml +++ b/fj-doc-maven-plugin/pom.xml @@ -89,6 +89,12 @@ 1.3.2 + + junit + junit + test + + diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml index ca06861b5..a3cb0c165 100644 --- a/fj-doc-mod-fop/pom.xml +++ b/fj-doc-mod-fop/pom.xml @@ -94,6 +94,12 @@ fj-doc-freemarker + + junit + junit + test + + org.fugerit.java fj-test-helper8 diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml index 49f3ee446..b8c5f92a8 100644 --- a/fj-doc-mod-opencsv/pom.xml +++ b/fj-doc-mod-opencsv/pom.xml @@ -81,8 +81,14 @@ org.fugerit.java fj-doc-base - - + + + + junit + junit + test + + diff --git a/fj-doc-mod-openpdf-ext/pom.xml b/fj-doc-mod-openpdf-ext/pom.xml index ba3490d76..0b70c47b5 100644 --- a/fj-doc-mod-openpdf-ext/pom.xml +++ b/fj-doc-mod-openpdf-ext/pom.xml @@ -47,8 +47,14 @@ org.fugerit.java fj-doc-freemarker test - - + + + + junit + junit + test + + diff --git a/fj-doc-mod-openrtf-ext/pom.xml b/fj-doc-mod-openrtf-ext/pom.xml index 459d2157c..9204c61bd 100644 --- a/fj-doc-mod-openrtf-ext/pom.xml +++ b/fj-doc-mod-openrtf-ext/pom.xml @@ -52,8 +52,14 @@ org.fugerit.java fj-doc-freemarker test - - + + + + junit + junit + test + + diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index dd7d5c380..86b82f760 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -84,8 +84,14 @@ org.fugerit.java fj-doc-base - - + + + + junit + junit + test + + diff --git a/fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/GenerateRestTest.java b/fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/GenerateRestTest.java index 8b0ea6dd5..8c2df039b 100644 --- a/fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/GenerateRestTest.java +++ b/fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/GenerateRestTest.java @@ -9,7 +9,6 @@ import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade; import org.fugerit.java.doc.lib.simpletable.model.SimpleTable; import org.fugerit.java.doc.playground.doc.GenerateRest; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -25,7 +24,7 @@ class GenerateRestTest { void testAddRow() { SimpleTable simpleTable = SimpleTableFacade.newTable(100); GenerateRest.addRow(simpleTable, 1, "error", "test"); - Assert.assertEquals(1, simpleTable.getRows().size()); + Assertions.assertEquals(1, simpleTable.getRows().size()); } private byte[] getInput(String path) { diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index cedcf5984..2c3ab610d 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -113,8 +113,14 @@ org.fugerit.java fj-doc-mod-openrtf-ext - - + + + + junit + junit + test + + diff --git a/fj-doc-tool/pom.xml b/fj-doc-tool/pom.xml index 436fab1f2..3389f9767 100644 --- a/fj-doc-tool/pom.xml +++ b/fj-doc-tool/pom.xml @@ -44,8 +44,14 @@ org.fugerit.java fj-doc-freemarker - - + + + + junit + junit + test + + diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml index f1557eb48..5b0413ac7 100644 --- a/fj-doc-val-core/pom.xml +++ b/fj-doc-val-core/pom.xml @@ -35,6 +35,12 @@ fj-core + + junit + junit + test + + diff --git a/fj-doc-val-p7m/pom.xml b/fj-doc-val-p7m/pom.xml index 2b458ab4a..3530d9495 100644 --- a/fj-doc-val-p7m/pom.xml +++ b/fj-doc-val-p7m/pom.xml @@ -47,6 +47,12 @@ test + + junit + junit + test + + org.bouncycastle bcpkix-jdk18on diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml index 17f1de369..997f1c6b9 100644 --- a/fj-doc-val-pdfbox/pom.xml +++ b/fj-doc-val-pdfbox/pom.xml @@ -47,6 +47,12 @@ ${pdfbox-version} + + junit + junit + test + + diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml index 577172b28..15d7975bd 100644 --- a/fj-doc-val-poi/pom.xml +++ b/fj-doc-val-poi/pom.xml @@ -50,6 +50,12 @@ poi-scratchpad + + junit + junit + test + + diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml index 7a4715463..688b2fa9a 100644 --- a/fj-doc-val/pom.xml +++ b/fj-doc-val/pom.xml @@ -55,6 +55,12 @@ fj-doc-val-p7m + + junit + junit + test + + diff --git a/pom.xml b/pom.xml index f70d6a9bb..09b50f366 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.fugerit.java fj-bom - 1.7.2 + 1.7.3 @@ -343,12 +343,7 @@ org.hsqldb hsqldb test - - - junit - junit - test - +