diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml index 2e18ee740..5306ceb6b 100644 --- a/fj-doc-lib-autodoc/pom.xml +++ b/fj-doc-lib-autodoc/pom.xml @@ -110,8 +110,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/TestAutodocModule.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/TestAutodocModule.java index cfeb6ddbf..59f1b1e1e 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/TestAutodocModule.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/TestAutodocModule.java @@ -1,14 +1,14 @@ package test.org.fugerit.java.doc.lib.autodoc; import org.fugerit.java.doc.lib.autodoc.AutodocModule; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestAutodocModule { +class TestAutodocModule { @Test - public void testModule() { - Assert.assertEquals( AutodocModule.CURRENT_VERSION , new AutodocModule().getVersion() ); + void testModule() { + Assertions.assertEquals( AutodocModule.CURRENT_VERSION , new AutodocModule().getVersion() ); } } diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDetailFacade.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDetailFacade.java index e21351bfc..54d7fdb94 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDetailFacade.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDetailFacade.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.facade; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -9,18 +9,18 @@ import org.fugerit.java.doc.lib.autodoc.detail.model.AutodocDetail; import org.fugerit.java.doc.lib.autodoc.facade.AutodocDetailFacade; import org.fugerit.java.doc.lib.autodoc.parser.model.AutodocModel; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestAutodocDetailFacade { +class TestAutodocDetailFacade { private static final Logger logger = LoggerFactory.getLogger( TestAutodocDetailFacade.class ); private static final String TARGET = "target/autodoc-detail.xml"; @Test - public void testParseXsdModel() { + void testParseXsdModel() { try ( FileOutputStream fos = new FileOutputStream( new File( TARGET ) ) ) { AutodocModel autodocModel = VenusAutodocFacade.parseLast(); AutodocDetail autodocDetail = AutodocDetailFacade.populateStub(autodocModel); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfig.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfig.java index d1ad32f11..686e92659 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfig.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfig.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.facade; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -8,11 +8,11 @@ import org.fugerit.java.doc.lib.autodoc.AutodocDocConfig; import org.fugerit.java.doc.lib.autodoc.VenusAutodocFacade; import org.fugerit.java.doc.lib.autodoc.parser.model.AutodocModel; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestAutodocDocConfig { +class TestAutodocDocConfig { private static final Logger logger = LoggerFactory.getLogger( TestAutodocDocConfig.class ); @@ -21,7 +21,7 @@ public class TestAutodocDocConfig { //private static final String TARGET = "target/doc_xsd_config_ref.html"; @Test - public void testParseXsdModel() { + void testParseXsdModel() { try ( FileOutputStream fos = new FileOutputStream( new File( TARGET ) ) ) { AutodocModel autodocModel = VenusAutodocFacade.parseLast(); AutodocDocConfig docConfig = AutodocDocConfig.newConfig(); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfigDetail.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfigDetail.java index 4181969e9..2d956537e 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfigDetail.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocConfigDetail.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.facade; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileInputStream; @@ -10,11 +10,11 @@ import org.fugerit.java.doc.lib.autodoc.detail.AutodocDetailModel; import org.fugerit.java.doc.lib.autodoc.detail.model.AutodocDetail; import org.fugerit.java.doc.lib.autodoc.facade.AutodocDetailFacade; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestAutodocDocConfigDetail { +class TestAutodocDocConfigDetail { private static final Logger logger = LoggerFactory.getLogger( TestAutodocDocConfigDetail.class ); @@ -23,7 +23,7 @@ public class TestAutodocDocConfigDetail { private static final String TARGET = "target/autodoc_detail.html"; @Test - public void testGenerateAutodocDetail() { + void testGenerateAutodocDetail() { try ( FileInputStream fis = new FileInputStream( new File( SOURCE ) ); FileOutputStream fos = new FileOutputStream( new File( TARGET ) ) ) { AutodocDetail autodocDetail = AutodocDetailFacade.unmarshal( fis ); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocSchemaConfig.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocSchemaConfig.java index ef0d651a7..67e1fa966 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocSchemaConfig.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestAutodocDocSchemaConfig.java @@ -5,17 +5,17 @@ import org.fugerit.java.doc.lib.autodoc.AutodocDocConfig; import org.fugerit.java.doc.lib.autodoc.facade.XsdParserFacade; import org.fugerit.java.doc.lib.autodoc.parser.model.AutodocModel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileOutputStream; import java.util.Properties; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; @Slf4j -public class TestAutodocDocSchemaConfig { +class TestAutodocDocSchemaConfig { private static final String TARGET = "target"; @@ -31,7 +31,7 @@ private static AutodocModel parseSample1() throws ConfigException { } @Test - public void testParseXsdModel() { + void testParseXsdModel() { File outputFile = new File( TARGET, "xsd_ref_sample_1.html" ); try ( FileOutputStream fos = new FileOutputStream( outputFile ) ) { AutodocModel autodocModel = parseSample1(); @@ -40,7 +40,7 @@ public void testParseXsdModel() { docConfig.processAutodocSchemaHtmlDefault(autodocModel, fos, params); autodocModel.getTypes().forEach( t -> log.info( "key : {}", t.getKey() ) ); autodocModel.getSimpleTypes().forEach( st -> log.info( "note : {}", st.getNote() ) ); - Assert.assertTrue( outputFile.exists() ); + Assertions.assertTrue( outputFile.exists() ); } catch (Exception e) { String message = "Error : "+e; log.error( message, e ); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestFreemarkerAutodocDocConfig.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestFreemarkerAutodocDocConfig.java index 8230ede34..b9be20a4c 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestFreemarkerAutodocDocConfig.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestFreemarkerAutodocDocConfig.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.facade; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -9,18 +9,18 @@ import org.fugerit.java.doc.lib.autodoc.AutodocDocConfig; import org.fugerit.java.doc.lib.autodoc.VenusFreemarkerAutodocFacade; import org.fugerit.java.doc.lib.autodoc.parser.model.AutodocModel; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TestFreemarkerAutodocDocConfig { +class TestFreemarkerAutodocDocConfig { private static final Logger logger = LoggerFactory.getLogger( TestFreemarkerAutodocDocConfig.class ); private static final String TARGET = "../fj-doc-freemarker/src/main/docs/fdp_xsd_config_ref.html"; @Test - public void testParseXsdModel() { + void testParseXsdModel() { try ( FileOutputStream fos = new FileOutputStream( new File( TARGET ) ); FileOutputStream fosSchema = new FileOutputStream( new File( "target/test-schema.html" ) ) ) { AutodocModel autodocModel = VenusFreemarkerAutodocFacade.parseLast(); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestXsdParserFacade.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestXsdParserFacade.java index a97623628..a85c61f24 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestXsdParserFacade.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/facade/TestXsdParserFacade.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.facade; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -15,15 +15,15 @@ import org.fugerit.java.doc.lib.autodoc.parser.model.AutodocModel; import org.fugerit.java.doc.lib.simpletable.SimpleTableDocConfig; import org.fugerit.java.doc.lib.simpletable.model.SimpleTable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j; @Slf4j -public class TestXsdParserFacade { +class TestXsdParserFacade { @Test - public void testParseXsdModel() { + void testParseXsdModel() { DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER; try ( FileOutputStream fos = new FileOutputStream( new File( "target/autodoc."+handler.getType() ) ) ) { AutodocModel autodocModel = VenusAutodocFacade.parseLast(); @@ -66,7 +66,7 @@ private static AutodocModel parseCustom() throws ConfigException { } @Test - public void testParseXsdModelCustom() { + void testParseXsdModelCustom() { DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER; try ( FileOutputStream fos = new FileOutputStream( new File( "target/autodoc."+handler.getType() ) ) ) { AutodocModel autodocModel = parseCustom(); diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/fun/TestAnnotationAsSingleStringFun.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/fun/TestAnnotationAsSingleStringFun.java index 90447575d..37a644217 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/fun/TestAnnotationAsSingleStringFun.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/fun/TestAnnotationAsSingleStringFun.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import org.fugerit.java.doc.lib.autodoc.fun.AnnotationAsSingleStringFun; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import freemarker.template.TemplateModelException; -public class TestAnnotationAsSingleStringFun { +class TestAnnotationAsSingleStringFun { @Test - public void testNoParam() { + void testNoParam() { AnnotationAsSingleStringFun fun = new AnnotationAsSingleStringFun(); - Assert.assertThrows( TemplateModelException.class , () -> fun.exec( new ArrayList() ) ); + Assertions.assertThrows( TemplateModelException.class , () -> fun.exec( new ArrayList() ) ); } } diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/GenerateDocHelper.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/GenerateDocHelper.java index a55fd7796..8d16dcb63 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/GenerateDocHelper.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/GenerateDocHelper.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.lib.autodoc.meta; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.File; @@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j -public class GenerateDocHelper { +class GenerateDocHelper { protected boolean docWorker( String sourcePath, String destPath, DocTypeHandler handler ) { boolean ok = false; diff --git a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/TestGenerateDocMetaInfo.java b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/TestGenerateDocMetaInfo.java index 0c7aea640..1d08222d0 100644 --- a/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/TestGenerateDocMetaInfo.java +++ b/fj-doc-lib-autodoc/src/test/java/test/org/fugerit/java/doc/lib/autodoc/meta/TestGenerateDocMetaInfo.java @@ -1,15 +1,15 @@ package test.org.fugerit.java.doc.lib.autodoc.meta; import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestGenerateDocMetaInfo extends GenerateDocHelper { +class TestGenerateDocMetaInfo extends GenerateDocHelper { @Test - public void generateHtml() { + void generateHtml() { boolean ok = this.docWorker( "docs/meta_xml/adm_standard_meta_info.xml" , "../docs/html/doc_meta_info.html", FreeMarkerHtmlTypeHandler.HANDLER_UTF8 ); - Assert.assertTrue( ok ); + Assertions.assertTrue( ok ); } }