diff --git a/fj-doc-mod-openrtf-ext/pom.xml b/fj-doc-mod-openrtf-ext/pom.xml index de928db45..e280cc58e 100644 --- a/fj-doc-mod-openrtf-ext/pom.xml +++ b/fj-doc-mod-openrtf-ext/pom.xml @@ -55,8 +55,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDefaultDoc.java b/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDefaultDoc.java index a3dbf78ed..330bbb347 100644 --- a/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDefaultDoc.java +++ b/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDefaultDoc.java @@ -2,12 +2,12 @@ import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler; -import org.junit.Assert; -import org.junit.Test; import com.lowagie.text.pdf.BaseFont; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestDefaultDoc extends TestDocBase { +class TestDefaultDoc extends TestDocBase { private static final String CUSTOM_FONT = "TitilliumWeb"; @@ -16,50 +16,50 @@ public class TestDefaultDoc extends TestDocBase { private static final String DEFAULT_DOC_ALT = "default_doc_alt"; @Test - public void testOpenFailPDF() { - Assert.assertThrows( AssertionError.class , () -> this.testDocWorker( "default_doc_fail1" , DocConfig.TYPE_PDF ) ); + void testOpenFailPDF() { + Assertions.assertThrows( AssertionError.class , () -> this.testDocWorker( "default_doc_fail1" , DocConfig.TYPE_PDF ) ); } @Test - public void testCustomFont() { + void testCustomFont() { BaseFont font = OpenPpfDocHandler.findFont( CUSTOM_FONT ); - Assert.assertNotNull(font); + Assertions.assertNotNull(font); } @Test - public void testOpenPDF() { + void testOpenPDF() { boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_PDF ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } @Test - public void testOpenHTML() { + void testOpenHTML() { boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_HTML ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } @Test - public void testOpenRTF() { + void testOpenRTF() { boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_RTF ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } @Test - public void testOpenAltPDF() { + void testOpenAltPDF() { boolean ok = this.testDocWorker( DEFAULT_DOC_ALT , DocConfig.TYPE_PDF ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } @Test - public void testOpenAltHTML() { + void testOpenAltHTML() { boolean ok = this.testDocWorker( DEFAULT_DOC_ALT , DocConfig.TYPE_HTML ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } @Test - public void testOpenAltRTF() { + void testOpenAltRTF() { boolean ok = this.testDocWorker( DEFAULT_DOC_ALT , DocConfig.TYPE_RTF ); - Assert.assertTrue(ok); + Assertions.assertTrue(ok); } } diff --git a/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDocBase.java b/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDocBase.java index 0cd4ca1a1..b81d2fffd 100644 --- a/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDocBase.java +++ b/fj-doc-mod-openrtf-ext/src/test/java/test/org/fugerit/java/doc/mod/openrtf/ext/TestDocBase.java @@ -1,6 +1,6 @@ package test.org.fugerit.java.doc.mod.openrtf.ext; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileOutputStream; @@ -17,7 +17,7 @@ import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; @Slf4j -public class TestDocBase { +class TestDocBase { private FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://fm-test-mod-openpdf-config.xml" );