Skip to content

Commit 4b11c50

Browse files
fugerit79fugerit79
authored
Merge pull request #373 from fugerit-org/317-chore-migrate-junit4-to-junit5
317 chore migrate junit4 to junit5
2 parents 1fdf4a4 + b561814 commit 4b11c50

File tree

66 files changed

+392
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+392
-416
lines changed

‎fj-doc-sample/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
</dependency>
117117

118118
<dependency>
119-
<groupId>junit</groupId>
120-
<artifactId>junit</artifactId>
119+
<groupId>org.junit.jupiter</groupId>
120+
<artifactId>junit-jupiter-api</artifactId>
121121
<scope>test</scope>
122122
</dependency>
123123

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/config/TestDocHandlerFactory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package test.org.fugerit.java.doc.sample.config;
22

3-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.fail;
44

55
import org.fugerit.java.doc.base.facade.DocHandlerFactory;
6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
99

10-
public class TestDocHandlerFactory {
10+
class TestDocHandlerFactory {
1111

1212
private final static Logger logger = LoggerFactory.getLogger( TestDocHandlerFactory.class );
1313

1414
@Test
15-
public void initDocFactoryTest() {
15+
void initDocFactoryTest() {
1616
try {
1717
String path = "cl://config/doc-handler-sample.xml";
1818
DocHandlerFactory factory = DocHandlerFactory.newInstance( path );

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/coverage/TestCoverageHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
1616
import org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler;
1717
import org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler;
18-
import org.junit.Test;
18+
import org.junit.jupiter.api.Test;
1919

2020
import lombok.extern.slf4j.Slf4j;
2121

2222
@Slf4j
23-
public class TestCoverageHelper {
23+
class TestCoverageHelper {
2424

2525
private static final DocTypeHandler[] HANDLERS = { SimpleMarkdownBasicTypeHandler.HANDLER,
2626
SimpleMarkdownExtTypeHandler.HANDLER, PdfFopTypeHandler.HANDLER,
@@ -32,7 +32,7 @@ public class TestCoverageHelper {
3232
"coverage/default_doc.xml" };
3333

3434
@Test
35-
public void testHandlers() {
35+
void testHandlers() {
3636
Arrays.asList(HANDLERS).stream().forEach(handler -> {
3737
Arrays.asList(TEMPLATES).stream().forEach(template -> {
3838
SafeFunction.apply(() -> {

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/AutodocDetailFullDocHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public class AutodocDetailFullDocHelper extends BasicFacadeTest {
88

99
public AutodocDetailFullDocHelper() {
10-
super( "full_doc_header_footer", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
10+
super.setup( "full_doc_header_footer", DocConfig.TYPE_HTML, DocConfig.TYPE_HTML_FRAGMENT, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
1111
}
1212

1313
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/DevHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.fugerit.java.doc.mod.fop.FopConfigDefault;
3131
import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler;
3232
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
33-
import org.junit.BeforeClass;
33+
import org.junit.jupiter.api.BeforeAll;
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

@@ -40,8 +40,8 @@ public class DevHelper {
4040

4141
private final static Logger logger = LoggerFactory.getLogger( DevHelper.class );
4242

43-
@BeforeClass
44-
public static void initPath() {
43+
@BeforeAll
44+
static void initPath() {
4545
File baseOut = new File( BasicFacadeTest.BASIC_OUTPUT_PATH );
4646
if ( !baseOut.exists() ) {
4747
logger.info( "create base dir -> {} -> {}", baseOut.getAbsolutePath(), baseOut.mkdirs() );

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestFo01.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import java.io.File;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Assertions;
6+
import org.junit.jupiter.api.Test;
77

88
import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest;
99

10-
public class TestFo01 extends DevHelper {
10+
class TestFo01 extends DevHelper {
1111

1212
@Test
13-
public void test01() throws Exception {
13+
void test01() throws Exception {
1414
String testCase = "test-fo-01";
1515
boolean res = this.workerFoToPdf( new File( "src/test/resources/dev/"+testCase+".fo" ),
1616
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+".pdf" ) );
17-
Assert.assertTrue( res );
17+
Assertions.assertTrue( res );
1818
}
1919
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestHtml01.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
import java.io.File;
44

55
import org.fugerit.java.doc.base.config.DocConfig;
6-
import org.junit.Assert;
7-
import org.junit.Test;
6+
import org.junit.jupiter.api.Assertions;
7+
import org.junit.jupiter.api.Test;
88

99
import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest;
1010

11-
public class TestHtml01 extends DevHelper {
11+
class TestHtml01 extends DevHelper {
1212

1313
@Test
14-
public void test01() throws Exception {
14+
void test01() throws Exception {
1515
String testCase = "test-xml-01";
1616
boolean res = this.workerXmlToHtml( new File( "src/test/resources/dev/"+testCase+"."+DocConfig.TYPE_XML ),
1717
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+DocConfig.TYPE_HTML) );
18-
Assert.assertTrue( res );
18+
Assertions.assertTrue( res );
1919
}
2020
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestItext2.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
import org.fugerit.java.doc.base.facade.DocFacade;
1515
import org.fugerit.java.doc.base.model.DocBase;
1616
import org.fugerit.java.doc.mod.openpdf.ext.PdfTypeHandler;
17-
import org.junit.Assert;
18-
import org.junit.Test;
17+
import org.junit.jupiter.api.Assertions;
18+
import org.junit.jupiter.api.Test;
1919

2020
import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest;
2121

22-
public class TestItext2 extends DevHelper {
22+
class TestItext2 extends DevHelper {
2323

2424
@Test
25-
public void test01FoPdf() throws Exception {
25+
void test01FoPdf() throws Exception {
2626
Locale.setDefault( Locale.UK );
2727
String testCase = "test-xml-01";
2828
String type = DocConfig.TYPE_PDF;
@@ -32,7 +32,7 @@ public void test01FoPdf() throws Exception {
3232
DocBase doc = DocFacade.parse( input );
3333
handler.handle( DocInput.newInput( type, doc) , DocOutput.newOutput( output ) );
3434
}
35-
Assert.assertTrue( true );
35+
Assertions.assertTrue( true );
3636
}
3737

3838

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestMarkdown01.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
import org.fugerit.java.doc.base.config.DocTypeHandler;
77
import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler;
8-
import org.junit.Assert;
9-
import org.junit.Test;
8+
import org.junit.jupiter.api.Assertions;
9+
import org.junit.jupiter.api.Test;
1010

1111
import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest;
1212

13-
public class TestMarkdown01 extends DevHelper {
13+
class TestMarkdown01 extends DevHelper {
1414

1515
@Test
16-
public void test01() throws Exception {
16+
void test01() throws Exception {
1717
Locale.setDefault( Locale.UK );
1818
String testCase = "test-xml-01";
1919
DocTypeHandler handler = SimpleMarkdownExtTypeHandler.HANDLER;
2020
boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ),
2121
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler );
22-
Assert.assertTrue( res );
22+
Assertions.assertTrue( res );
2323
}
2424

2525
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,42 @@
66
import org.fugerit.java.doc.base.config.DocTypeHandler;
77
import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler;
88
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
9-
import org.junit.Assert;
10-
import org.junit.Test;
9+
import org.junit.jupiter.api.Assertions;
10+
import org.junit.jupiter.api.Test;
1111

1212
import test.org.fugerit.java.doc.sample.facade.BasicFacadeTest;
1313

14-
public class TestXml01 extends DevHelper {
14+
class TestXml01 extends DevHelper {
1515

1616
//@Test
17-
public void test01() throws Exception {
17+
void test01() throws Exception {
1818
Locale.setDefault( Locale.UK );
1919
String testCase = "test-xml-01";
2020
DocTypeHandler handler = PdfFopTypeHandler.HANDLER;
2121
boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ),
2222
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler );
23-
Assert.assertTrue( res );
23+
Assertions.assertTrue( res );
2424
}
2525

2626
@Test
27-
public void test01FoPdf() throws Exception {
27+
void test01FoPdf() throws Exception {
2828
Locale.setDefault( Locale.UK );
2929
String testCase = "test-xml-01";
3030
DocTypeHandler handler = PdfFopTypeHandler.HANDLER;
3131
boolean res = this.workerXmlToFoToPdf( new File( "src/test/resources/dev/"+testCase+".xml" ),
3232
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+".fo" ),
3333
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ) );
34-
Assert.assertTrue( res );
34+
Assertions.assertTrue( res );
3535
}
3636

3737
@Test
38-
public void test01Html() throws Exception {
38+
void test01Html() throws Exception {
3939
Locale.setDefault( Locale.UK );
4040
String testCase = "test-xml-01";
4141
DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER;
4242
boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ),
4343
new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler );
44-
Assert.assertTrue( res );
44+
Assertions.assertTrue( res );
4545
}
4646

4747
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/BasicFacadeTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.fugerit.java.doc.base.parser.DocValidationResult;
2323
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig;
2424
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade;
25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828

@@ -51,11 +51,11 @@ public class BasicFacadeTest {
5151
private boolean validate;
5252

5353
public BasicFacadeTest() {
54-
this( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML );
54+
this.setup( "basic", DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML );
5555
this.validate = VALIDATE_DEFAULT;
5656
}
5757

58-
protected BasicFacadeTest( String nameBase, String ...typeList ) {
58+
protected void setup( String nameBase, String ...typeList ) {
5959
this.checkpoints = Checkpoints.newInstance( CheckpointFormatHelper.DEFAULT_DECORATION );
6060
this.nameBase = nameBase;
6161
this.types = new ArrayList<>();
@@ -164,7 +164,7 @@ public void produce( File outputFolder, String facadeId, DocBase doc, Reader rea
164164
}
165165

166166
@Test
167-
public void produce() throws Exception {
167+
void produce() throws Exception {
168168
File baseFile = new File(BASIC_OUTPUT_PATH);
169169
if (!baseFile.exists()) {
170170
logger.info("Create base path : {} ({})", baseFile.mkdirs(), baseFile.getCanonicalPath());

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestAutodocHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.fugerit.java.doc.base.config.DocConfig;
44

5-
public class TestAutodocHelper extends BasicFacadeTest {
5+
class TestAutodocHelper extends BasicFacadeTest {
66

77
public TestAutodocHelper() {
8-
super( "autodoc_helper", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLSX, DocConfig.TYPE_HTML );
8+
super.setup( "autodoc_helper", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLSX, DocConfig.TYPE_HTML );
99
}
1010

1111
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocCatalogSample.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
package test.org.fugerit.java.doc.sample.facade;
22

3-
import static org.junit.Assert.assertNotNull;
4-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.assertNotNull;
4+
import static org.junit.jupiter.api.Assertions.fail;
55

66
import org.fugerit.java.core.io.StreamIO;
77
import org.fugerit.java.core.util.collection.ListMapStringKey;
88
import org.fugerit.java.doc.sample.facade.DocCatalogEntry;
99
import org.fugerit.java.doc.sample.facade.DocCatalogSample;
10-
import org.junit.Test;
10+
import org.junit.jupiter.api.Test;
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313

14-
public class TestDocCatalogSample {
14+
class TestDocCatalogSample {
1515

1616
private static final Logger logger = LoggerFactory.getLogger( TestDocCatalogSample.class );
1717

1818
@Test
19-
public void testConfig() {
19+
void testConfig() {
2020
try {
2121
DocCatalogSample catalog = DocCatalogSample.getInstance();
22-
assertNotNull( "catalog must exists", catalog );
22+
assertNotNull( catalog );
2323
ListMapStringKey<DocCatalogEntry> list = catalog.getPlaygroundCoreCatalog();
2424
DocCatalogEntry entry = list.get( "default" );
25-
assertNotNull( "default entry must exists", entry );
25+
assertNotNull( entry );
2626
String content = StreamIO.readString( catalog.entryReader(entry) );
2727
logger.info( "entry -> {}, content -> {}", entry, content );
2828
assertNotNull( "entry content must exists", content );

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestDocFacadeSource.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
import org.fugerit.java.doc.base.facade.DocFacadeSource;
55
import org.fugerit.java.doc.base.kotlin.parse.DocKotlinParser;
66
import org.fugerit.java.doc.base.parser.DocParser;
7-
import org.junit.Assert;
8-
import org.junit.Test;
7+
import org.junit.jupiter.api.Assertions;
8+
import org.junit.jupiter.api.Test;
99

1010
@Slf4j
11-
public class TestDocFacadeSource {
11+
class TestDocFacadeSource {
1212

1313
@Test
14-
public void testKotlinYaml() {
14+
void testKotlinYaml() {
1515
DocParser docParser = DocFacadeSource.getInstance().getParserForSource( DocFacadeSource.SOURCE_TYPE_YAML );
1616
log.info( "docParser yaml : {}", docParser );
17-
Assert.assertNotNull( docParser );
17+
Assertions.assertNotNull( docParser );
1818
}
1919

2020
@Test
21-
public void testKotlinSource() {
21+
void testKotlinSource() {
2222
DocParser docParser = DocFacadeSource.getInstance().getParserForSource( DocFacadeSource.SOURCE_TYPE_KOTLIN );
2323
log.info( "docParser kotlin : {}", docParser );
24-
Assert.assertNotNull( docParser );
24+
Assertions.assertNotNull( docParser );
2525
}
2626

2727
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.fugerit.java.doc.base.config.DocConfig;
44

5-
public class TestIntro01 extends BasicFacadeTest {
5+
class TestIntro01 extends BasicFacadeTest {
66

77
public TestIntro01() {
8-
super( "intro_01", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML );
8+
super.setup( "intro_01", DocConfig.TYPE_XML, DocConfig.TYPE_PDF, DocConfig.TYPE_XLS, DocConfig.TYPE_HTML );
99
}
1010

1111
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Json.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import org.fugerit.java.doc.base.config.DocConfig;
44

5-
public class TestIntro01Json extends BasicFacadeTest {
5+
class TestIntro01Json extends BasicFacadeTest {
66

77
public TestIntro01Json() {
8-
super( "intro_01.json", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
9-
//super( "intro_01.json", DocConfig.TYPE_MD );
8+
super.setup( "intro_01.json", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
109
}
1110

1211
}

‎fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/facade/TestIntro01Yaml.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.fugerit.java.doc.base.config.DocConfig;
44

5-
public class TestIntro01Yaml extends BasicFacadeTest {
5+
class TestIntro01Yaml extends BasicFacadeTest {
66

77
public TestIntro01Yaml() {
8-
super( "intro_01.yaml", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
8+
super.setup( "intro_01.yaml", DocConfig.TYPE_MD, DocConfig.TYPE_HTML, DocConfig.TYPE_PDF, DocConfig.TYPE_FO );
99
}
1010

1111
}

0 commit comments

Comments
 (0)