Skip to content

Commit 2b8da08

Browse files
fugerit79fugerit79
authored
Merge pull request #368 from fugerit-org/317-chore-migrate-junit4-to-junit5
[fj-doc-mod-openpdf-ext] migrate junit4 to junit5 #364
2 parents 32cf85d + 921f97f commit 2b8da08

File tree

8 files changed

+56
-56
lines changed

8 files changed

+56
-56
lines changed

‎fj-doc-mod-openpdf-ext/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
</dependency>
5151

5252
<dependency>
53-
<groupId>junit</groupId>
54-
<artifactId>junit</artifactId>
53+
<groupId>org.junit.jupiter</groupId>
54+
<artifactId>junit-jupiter-api</artifactId>
5555
<scope>test</scope>
5656
</dependency>
5757

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDefaultDoc.java

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

33
import org.fugerit.java.doc.base.config.DocConfig;
44
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler;
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 com.lowagie.text.pdf.BaseFont;
99

10-
public class TestDefaultDoc extends TestDocBase {
10+
class TestDefaultDoc extends TestDocBase {
1111

1212
private static final String CUSTOM_FONT = "TitilliumWeb";
1313

@@ -20,50 +20,50 @@ public class TestDefaultDoc extends TestDocBase {
2020
private static final String DEFAULT_DOC_PDFA = "default_doc_pdfa";
2121

2222
@Test
23-
public void testOpenFailPDF() {
24-
Assert.assertThrows( AssertionError.class , () -> this.testDocWorker( "default_doc_fail1" , DocConfig.TYPE_PDF ) );
23+
void testOpenFailPDF() {
24+
Assertions.assertThrows( AssertionError.class , () -> this.testDocWorker( "default_doc_fail1" , DocConfig.TYPE_PDF ) );
2525
}
2626

2727
@Test
28-
public void testCustomFont() {
28+
void testCustomFont() {
2929
BaseFont font = OpenPpfDocHandler.findFont( CUSTOM_FONT );
30-
Assert.assertNotNull(font);
30+
Assertions.assertNotNull(font);
3131
}
3232

3333
@Test
34-
public void testOpenPDF() {
34+
void testOpenPDF() {
3535
boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_PDF );
36-
Assert.assertTrue(ok);
36+
Assertions.assertTrue(ok);
3737
}
3838

3939
@Test
40-
public void testOpenHTML() {
40+
void testOpenHTML() {
4141
boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_HTML );
42-
Assert.assertTrue(ok);
42+
Assertions.assertTrue(ok);
4343
}
4444

4545
@Test
46-
public void testOpenAltPDF() {
46+
void testOpenAltPDF() {
4747
boolean ok = this.testDocWorker( DEFAULT_DOC_ALT , DocConfig.TYPE_PDF );
48-
Assert.assertTrue(ok);
48+
Assertions.assertTrue(ok);
4949
}
5050

5151
@Test
52-
public void testOpenAltHTML() {
52+
void testOpenAltHTML() {
5353
boolean ok = this.testDocWorker( DEFAULT_DOC_ALT , DocConfig.TYPE_HTML );
54-
Assert.assertTrue(ok);
54+
Assertions.assertTrue(ok);
5555
}
5656

5757
@Test
58-
public void testOpenSimple() {
58+
void testOpenSimple() {
5959
boolean ok = this.testDocWorker( DEFAULT_DOC_SIMPLE , DocConfig.TYPE_PDF );
60-
Assert.assertTrue(ok);
60+
Assertions.assertTrue(ok);
6161
}
6262

6363
@Test
64-
public void testOpenPDFA() {
64+
void testOpenPDFA() {
6565
// still working on font embedding
66-
Assert.assertThrows( AssertionError.class , () -> this.testDocWorker( DEFAULT_DOC_PDFA , DocConfig.TYPE_PDF ));
66+
Assertions.assertThrows( AssertionError.class , () -> this.testDocWorker( DEFAULT_DOC_PDFA , DocConfig.TYPE_PDF ));
6767
}
6868

6969
}

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDocBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package test.org.fugerit.java.doc.mod.openpdf.ext;
22

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

55
import java.io.File;
66
import java.io.FileOutputStream;
@@ -17,7 +17,7 @@
1717
import lombok.extern.slf4j.Slf4j;
1818

1919
@Slf4j
20-
public class TestDocBase {
20+
class TestDocBase {
2121

2222
private FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://fm-test-mod-openpdf-config.xml" );
2323

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestOpenPdfFontHelper.java

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

55
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPdfFontHelper;
66
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPdfHelper;
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
import com.lowagie.text.DocumentException;
1111
import com.lowagie.text.Font;
1212

13-
public class TestOpenPdfFontHelper {
13+
class TestOpenPdfFontHelper {
1414

1515
@Test
16-
public void testCreateFont() throws DocumentException, IOException {
16+
void testCreateFont() throws DocumentException, IOException {
1717
Font font = OpenPdfFontHelper.createFont( "TestTitilliumWeb" , "src/test/resources/font/TitilliumWeb-Regular.ttf", 10, Font.NORMAL, new OpenPdfHelper(), null );
18-
Assert.assertNotNull( font );
18+
Assertions.assertNotNull( font );
1919
}
2020

2121
}

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestOpenPdfHelper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@
1111
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPdfHelper;
1212
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler;
1313
import org.fugerit.java.doc.mod.openpdf.ext.helpers.PhraseParent;
14-
import org.junit.Assert;
15-
import org.junit.Test;
14+
import org.junit.jupiter.api.Assertions;
15+
import org.junit.jupiter.api.Test;
1616

1717
import com.lowagie.text.Paragraph;
1818
import com.lowagie.text.Phrase;
1919

2020
import java.io.IOException;
2121

22-
public class TestOpenPdfHelper {
22+
class TestOpenPdfHelper {
2323

2424
@Test
25-
public void test001() throws Exception {
25+
void test001() throws Exception {
2626
PhraseParent parent = new PhraseParent( new Phrase() );
2727
parent.add( new Paragraph() );
28-
Assert.assertNotNull( parent );
28+
Assertions.assertNotNull( parent );
2929
}
3030

3131
@Test
32-
public void testList() {
32+
void testList() {
3333
OpenPdfHelper helper = new OpenPdfHelper();
3434
try ( Document document = new Document() ) {
3535
DocList list1 = new DocList();
3636
list1.addElement( new DocTable() );
3737
list1.setListType(DocList.LIST_TYPE_OL);
38-
Assert.assertThrows( IOException.class, () -> OpenPpfDocHandler.getElement( document, list1, false, helper ) );
38+
Assertions.assertThrows( IOException.class, () -> OpenPpfDocHandler.getElement( document, list1, false, helper ) );
3939
DocList list2 = new DocList();
4040
list2.setListType(DocList.LIST_TYPE_UL);
4141
DocLi li2 = new DocLi();

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestPdfHelper.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@
44
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPdfFontHelper;
55
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler;
66
import org.fugerit.java.doc.mod.openpdf.ext.helpers.PdfHelper;
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
import lombok.extern.slf4j.Slf4j;
1111

1212
@Slf4j
13-
public class TestPdfHelper {
13+
class TestPdfHelper {
1414

1515
@Test
16-
public void testSetGet() {
16+
void testSetGet() {
1717
PdfHelper helper = new PdfHelper( null );
1818
log.info( "getCurrentPageNumber -> {}", helper.getCurrentPageNumber() );
1919
int current = 10;
2020
helper.setPageNumberAlignment(current);
2121
log.info( "getPageNumberAlignment -> {}", helper.getPageNumberAlignment() );
22-
Assert.assertEquals( current , helper.getPageNumberAlignment() );
22+
Assertions.assertEquals( current , helper.getPageNumberAlignment() );
2323
}
2424

2525

2626
@Test
27-
public void testTandleElementSafe() {
28-
Assert.assertThrows( NullPointerException.class , () -> OpenPpfDocHandler.handleElementsSafe(null, null, null) );
27+
void testTandleElementSafe() {
28+
Assertions.assertThrows( NullPointerException.class , () -> OpenPpfDocHandler.handleElementsSafe(null, null, null) );
2929
}
3030

3131
@Test
32-
public void testCreateFontSafe() {
33-
Assert.assertThrows( RuntimeException.class , () -> OpenPdfFontHelper.createBaseFontSafe(null, null, false) );
32+
void testCreateFontSafe() {
33+
Assertions.assertThrows( RuntimeException.class , () -> OpenPdfFontHelper.createBaseFontSafe(null, null, false) );
3434
}
3535

3636
@Test
37-
public void testCreateFontSafe1() {
38-
Assert.assertThrows( ConfigRuntimeException.class , () -> OpenPdfFontHelper.createBaseFontSafe( "no", "no", false) );
37+
void testCreateFontSafe1() {
38+
Assertions.assertThrows( ConfigRuntimeException.class , () -> OpenPdfFontHelper.createBaseFontSafe( "no", "no", false) );
3939
}
4040
}

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestPhraseParent.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import java.util.Properties;
44

55
import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPdfHelper;
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 lombok.extern.slf4j.Slf4j;
1010

1111
@Slf4j
12-
public class TestPhraseParent {
12+
class TestPhraseParent {
1313

1414
@Test
15-
public void test001() throws Exception {
15+
void test001() throws Exception {
1616
OpenPdfHelper helper = new OpenPdfHelper();
1717
helper.setParams( new Properties() );
1818
log.info( "helper.getDefFontStyle() -> {}", helper.getDefFontStyle() );
19-
Assert.assertNotNull( helper.getParams() );
19+
Assertions.assertNotNull( helper.getParams() );
2020
}
2121

2222
}

‎fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestSpec.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package test.org.fugerit.java.doc.mod.openpdf.ext;
22

33
import org.fugerit.java.doc.base.config.DocConfig;
4-
import org.junit.Assert;
5-
import org.junit.Test;
4+
import org.junit.jupiter.api.Assertions;
5+
import org.junit.jupiter.api.Test;
66

7-
public class TestSpec extends TestDocBase {
7+
class TestSpec extends TestDocBase {
88

99
private static final String DEFAULT_DOC = "test";
1010

1111
@Test
12-
public void testOpenPDF() {
12+
void testOpenPDF() {
1313
boolean ok = this.testDocWorker( DEFAULT_DOC , DocConfig.TYPE_PDF );
14-
Assert.assertTrue(ok);
14+
Assertions.assertTrue(ok);
1515
}
1616

1717
}

0 commit comments

Comments
 (0)