diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index d22be21c4..5ebc046ef 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -87,8 +87,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPOIUtils.java b/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPOIUtils.java index 5924f3e95..a5f7b7f8e 100644 --- a/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPOIUtils.java +++ b/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPOIUtils.java @@ -12,18 +12,18 @@ import org.fugerit.java.doc.base.model.DocCell; import org.fugerit.java.doc.mod.poi.PoiUtils; import org.fugerit.java.doc.mod.poi.WorkbookHelper; -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 TestPOIUtils { +class TestPOIUtils { @Test - public void xlsxFormatStyle() { - Assert.assertTrue( SafeFunction.get( () -> { + void xlsxFormatStyle() { + Assertions.assertTrue( SafeFunction.get( () -> { boolean ok = Boolean.TRUE; PoiUtils.xlsxFormatStyle(null, null, null); PoiUtils.xlsxFormatStyle(null, new XSSFCellStyle( null), null ); @@ -32,8 +32,8 @@ public void xlsxFormatStyle() { } @Test - public void xlsxFontStyle() { - Assert.assertTrue( SafeFunction.get( () -> { + void xlsxFontStyle() { + Assertions.assertTrue( SafeFunction.get( () -> { boolean ok = Boolean.TRUE; PoiUtils.xlsxFontStyle(null, null, null); return ok; @@ -41,8 +41,8 @@ public void xlsxFontStyle() { } @Test - public void lsxFormat() { - Assert.assertTrue( SafeFunction.get( () -> { + void lsxFormat() { + Assertions.assertTrue( SafeFunction.get( () -> { boolean ok = Boolean.TRUE; try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "coverage/xls_as_xls.xls" ); HSSFWorkbook workbook = new HSSFWorkbook( is ) ) { @@ -56,9 +56,9 @@ public void lsxFormat() { } @Test - public void testFindColor() { + void testFindColor() { Short test = 31; - Assert.assertEquals( test, SafeFunction.get( () -> { + Assertions.assertEquals( test, SafeFunction.get( () -> { try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "coverage/xls_as_xls.xls" ); HSSFWorkbook workbook = new HSSFWorkbook( is ) ) { short index = PoiUtils.findClosestColorIndex( workbook , "#dddddd" ); @@ -69,15 +69,15 @@ public void testFindColor() { } @Test - public void testNewHelper() { + void testNewHelper() { SafeFunction.apply( () -> { try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "coverage/xls_as_xls.xls" ); WorkbookHelper helper = PoiUtils.newHelper( false , is ) ) { log.info( "test 1 -> {}", helper.getIndexedColorMap() ); - Assert.assertNotNull( helper ); + Assertions.assertNotNull( helper ); } } ); - Assert.assertNotNull( SafeFunction.get( () -> { + Assertions.assertNotNull( SafeFunction.get( () -> { try ( InputStream is = ClassHelper.loadFromDefaultClassLoader( "coverage/xlsx_as_xlsx.xlsx" ); WorkbookHelper helper = PoiUtils.newHelper( true , is ) ) { log.info( "test 2 -> {}", helper.getIndexedColorMap() ); @@ -89,10 +89,10 @@ public void testNewHelper() { private static final IOException FAIL_EX = new IOException( "scenario exception" ); @Test - public void testAutoresizeFailhandler() { + void testAutoresizeFailhandler() { PoiUtils.autoresizeFailHandler( false ).accept( FAIL_EX ); Consumer exHandlerFail = PoiUtils.autoresizeFailHandler( true ); - Assert.assertThrows( ConfigRuntimeException.class , () -> exHandlerFail.accept( FAIL_EX ) ); + Assertions.assertThrows( ConfigRuntimeException.class , () -> exHandlerFail.accept( FAIL_EX ) ); } } diff --git a/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPoiCoverage.java b/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPoiCoverage.java index ea323aab6..457676e73 100644 --- a/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPoiCoverage.java +++ b/fj-doc-mod-poi/src/test/java/test/org/fugerit/java/doc/mod/poi/coverage/TestPoiCoverage.java @@ -12,10 +12,10 @@ import org.fugerit.java.doc.base.config.DocTypeHandler; import org.fugerit.java.doc.mod.poi.XlsPoiTypeHandler; import org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestPoiCoverage { +class TestPoiCoverage { private final static String[] TEST_LIST = { "default_doc", "default_doc_alt", "default_doc_fail1" }; @@ -37,11 +37,11 @@ private boolean worker( String path ) { } @Test - public void test01() { + void test01() { Arrays.asList( TEST_LIST ).stream().forEach( c -> { - Assert.assertTrue( this.worker( "coverage/xml/"+c+".xml" ) ); + Assertions.assertTrue( this.worker( "coverage/xml/"+c+".xml" ) ); } ); - Assert.assertTrue( Boolean.TRUE ); + Assertions.assertTrue( Boolean.TRUE ); } }