Skip to content

Commit cedd509

Browse files
fugerit79fugerit79
committed
[fj-doc-maven-plugin] migrate junit4 to junit5 #361
fix #361
1 parent d6fa090 commit cedd509

File tree

7 files changed

+64
-68
lines changed

7 files changed

+64
-68
lines changed

‎fj-doc-mod-fop/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
</dependency>
9696

9797
<dependency>
98-
<groupId>junit</groupId>
99-
<artifactId>junit</artifactId>
98+
<groupId>org.junit.jupiter</groupId>
99+
<artifactId>junit-jupiter-api</artifactId>
100100
<scope>test</scope>
101101
</dependency>
102102

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestAlt.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandlerUTF8;
1212
import org.fugerit.java.doc.mod.fop.InitFopHandler;
1313
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
14-
import org.junit.Assert;
15-
import org.junit.BeforeClass;
16-
import org.junit.Test;
14+
import org.junit.jupiter.api.Assertions;
15+
import org.junit.jupiter.api.BeforeAll;
16+
import org.junit.jupiter.api.Test;
1717

1818
import lombok.extern.slf4j.Slf4j;
1919
import test.org.fugerit.java.BasicTest;
2020

2121
@Slf4j
22-
public class TestAlt extends BasicTest {
22+
class TestAlt extends BasicTest {
2323

24-
@BeforeClass
24+
@BeforeAll
2525
public static void init() {
2626
SafeFunction.apply( () -> InitFopHandler.initDoc() );
2727
}
@@ -42,10 +42,10 @@ private boolean testHelper( DocTypeHandler handler ) {
4242
private static final DocTypeHandler[] HANDLERS = { PdfFopTypeHandler.HANDLER, new FreeMarkerFopTypeHandlerUTF8() };
4343

4444
@Test
45-
public void testAlt001Ok() {
45+
void testAlt001Ok() {
4646
for ( int k=0; k<HANDLERS.length; k++ ) {
4747
boolean ok = this.testHelper(HANDLERS[k]);
48-
Assert.assertTrue(ok);
48+
Assertions.assertTrue(ok);
4949
}
5050
}
5151

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestFopConfig.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@
44
import org.fugerit.java.core.function.SafeFunction;
55
import org.fugerit.java.doc.mod.fop.config.FopConfigClassLoaderWrapper;
66
import org.fugerit.java.doc.mod.fop.config.ResourceResolverWrapper;
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 test.org.fugerit.java.BasicTest;
1111

12-
public class TestFopConfig extends BasicTest {
12+
class TestFopConfig extends BasicTest {
1313

1414
@Test
15-
public void testResolver1() {
16-
Assert.assertNotNull( SafeFunction.get( () -> {
15+
void testResolver1() {
16+
Assertions.assertNotNull( SafeFunction.get( () -> {
1717
FopConfigClassLoaderWrapper wrapper = new FopConfigClassLoaderWrapper( "test", ResourceResolverFactory.createDefaultResourceResolver() );
1818
return this.fullSerializationTest( wrapper );
1919
} ) );
2020
}
2121

2222
@Test
23-
public void testResolver2() {
24-
Assert.assertNotNull( SafeFunction.get( () -> {
23+
void testResolver2() {
24+
Assertions.assertNotNull( SafeFunction.get( () -> {
2525
FopConfigClassLoaderWrapper wrapper = new FopConfigClassLoaderWrapper( "test" );
2626
return this.fullSerializationTest( wrapper );
2727
} ) );
2828
}
2929

3030
@Test
31-
public void testResolver3() {
32-
Assert.assertNotNull( SafeFunction.get( () -> {
31+
void testResolver3() {
32+
Assertions.assertNotNull( SafeFunction.get( () -> {
3333
ResourceResolverWrapper rrw = new ResourceResolverWrapper( ResourceResolverFactory.createDefaultResourceResolver() );
3434
FopConfigClassLoaderWrapper wrapper = new FopConfigClassLoaderWrapper( "test", rrw );
3535
return this.fullSerializationTest( wrapper );

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestInitFreeMarkerConfig.java

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

33
import org.fugerit.java.core.cfg.ConfigRuntimeException;
44
import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade;
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

8-
public class TestInitFreeMarkerConfig {
8+
class TestInitFreeMarkerConfig {
99

1010
@Test
1111
public void restError() {
1212
try {
1313
FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://fj-test-error-config.xml" );
1414
} catch (ConfigRuntimeException e) {
15-
Assert.assertTrue( e.getMessage().contains( "Cannot find fop config path" ) );
15+
Assertions.assertTrue( e.getMessage().contains( "Cannot find fop config path" ) );
1616
}
1717

1818
}

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestPdfFopTypeHandler.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
import org.fugerit.java.doc.mod.fop.FopConfigDefault;
1515
import org.fugerit.java.doc.mod.fop.InitFopHandler;
1616
import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
17-
import org.junit.Assert;
18-
import org.junit.BeforeClass;
19-
import org.junit.Test;
17+
import org.junit.jupiter.api.Assertions;
18+
import org.junit.jupiter.api.BeforeAll;
19+
import org.junit.jupiter.api.Test;
2020
import org.w3c.dom.Document;
2121

2222
import lombok.extern.slf4j.Slf4j;
2323
import test.org.fugerit.java.BasicTest;
2424

2525
@Slf4j
26-
public class TestPdfFopTypeHandler extends BasicTest {
26+
class TestPdfFopTypeHandler extends BasicTest {
2727

28-
@BeforeClass
28+
@BeforeAll
2929
public static void init() {
3030
SafeFunction.apply( () -> InitFopHandler.initDocAsync() );
3131
}
@@ -43,14 +43,14 @@ private boolean testHelper( DocTypeHandler handler ) {
4343
}
4444

4545
@Test
46-
public void test001Ok() {
46+
void test001Ok() {
4747
FopConfig config = new FopConfigDefault();
4848
PdfFopTypeHandler handler = new PdfFopTypeHandler();
4949
handler.setSuppressEvents( true );
5050
log.info( "suppress events : {}", handler.isSuppressEvents() );
5151
handler.setFopConfig( config );
5252
boolean ok = this.testHelper(handler);
53-
Assert.assertTrue(ok);
53+
Assertions.assertTrue(ok);
5454
}
5555

5656
private boolean configureHelper( String path ) {
@@ -67,22 +67,22 @@ private boolean configureHelper( String path ) {
6767
}
6868

6969
@Test
70-
public void test002Ko() {
71-
Assert.assertThrows( ConfigRuntimeException.class , () -> {
70+
void test002Ko() {
71+
Assertions.assertThrows( ConfigRuntimeException.class , () -> {
7272
this.configureHelper( "config/test_config_err1.xml" );
7373
});
7474
}
7575

7676

7777
@Test
78-
public void test003Ok() {
78+
void test003Ok() {
7979
boolean ok = this.configureHelper( "config/test_config_ok.xml" );
80-
Assert.assertTrue(ok);
80+
Assertions.assertTrue(ok);
8181
}
8282

8383
@Test
84-
public void test004Ko() {
85-
Assert.assertThrows( ConfigRuntimeException.class , () -> {
84+
void test004Ko() {
85+
Assertions.assertThrows( ConfigRuntimeException.class , () -> {
8686
this.configureHelper( "config/test_config_err2.xml" );
8787
});
8888
}

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestPdfFopTypePooledHandler.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,32 @@
1010
import org.fugerit.java.core.xml.dom.DOMIO;
1111
import org.fugerit.java.doc.base.config.DocInput;
1212
import org.fugerit.java.doc.base.config.DocOutput;
13-
import org.fugerit.java.doc.base.config.DocTypeHandler;
1413
import org.fugerit.java.doc.mod.fop.*;
15-
import org.junit.Assert;
16-
import org.junit.BeforeClass;
17-
import org.junit.Test;
18-
import org.w3c.dom.Document;
14+
import org.junit.jupiter.api.Assertions;
15+
import org.junit.jupiter.api.Test;
1916
import org.w3c.dom.Element;
2017
import test.org.fugerit.java.BasicTest;
2118

2219
import java.io.File;
2320
import java.io.FileOutputStream;
2421
import java.io.InputStreamReader;
2522
import java.util.ArrayList;
26-
import java.util.List;
2723
import java.util.UUID;
2824

2925
@Slf4j
30-
public class TestPdfFopTypePooledHandler extends BasicTest {
26+
class TestPdfFopTypePooledHandler extends BasicTest {
3127

3228
@Test
33-
public void testPoolUtils() throws ConfigException {
29+
void testPoolUtils() throws ConfigException {
3430
UnsafeSupplier<FopConfigWrap, ConfigException> supplier = () -> new FopConfigWrap( null, null );
3531
FopConfigWrap configWrap1 = PoolUtils.handleFopWrap( null, null, 1, 2, supplier );
36-
Assert.assertNotNull( configWrap1 );
32+
Assertions.assertNotNull( configWrap1 );
3733
FopConfigWrap configWrap2 = PoolUtils.handleFopWrap( null, new ArrayList<FopConfigWrap>(), 1, 2, supplier );
38-
Assert.assertNotNull( configWrap2 );
34+
Assertions.assertNotNull( configWrap2 );
3935
}
4036

4137
@Test
42-
public void pooledTest1() throws ConfigException, XMLException {
38+
void pooledTest1() throws ConfigException, XMLException {
4339
PdfFopTypeHandler handler = new PdfFopTypeHandler();
4440

4541
Element config = DOMIO.loadDOMDoc( "<conf><docHandlerCustomConfig fop-pool-min='1' fop-pool-max='1' fop-suppress-events='2'/></conf>" ).getDocumentElement();
@@ -50,7 +46,7 @@ public void pooledTest1() throws ConfigException, XMLException {
5046
try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "sample/doc_test_01.xml" ) );
5147
FileOutputStream fos = new FileOutputStream( outputFile ) ) {
5248
handler.handle( DocInput.newInput( handler.getType(), reader ) , DocOutput.newOutput( fos ) );
53-
Assert.assertTrue( outputFile.exists() );
49+
Assertions.assertTrue( outputFile.exists() );
5450
} catch (Exception e) {
5551
this.failEx( e );
5652
}
@@ -59,20 +55,20 @@ public void pooledTest1() throws ConfigException, XMLException {
5955
t.start();
6056
log.info( "thread started : {}", k );
6157
}
62-
Assert.assertTrue( Boolean.TRUE );
58+
Assertions.assertTrue( Boolean.TRUE );
6359
}
6460

6561

6662
@Test
67-
public void pooledTest2() {
63+
void pooledTest2() {
6864
PdfFopTypeHandler handler = new PdfFopTypeHandler();
6965
File outputFile = new File( "target/test"+System.currentTimeMillis()+"."+handler.getType() );
7066
try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "sample/doc_test_01.xml" ) );
7167
FileOutputStream fos = new FileOutputStream( outputFile ) ) {
7268
Element config = DOMIO.loadDOMDoc( "<conf><docHandlerCustomConfig fop-pool-min='10' fop-suppress-events='1'/></conf>" ).getDocumentElement();
7369
handler.configure( config );
7470
handler.handle( DocInput.newInput( handler.getType(), reader ) , DocOutput.newOutput( fos ) );
75-
Assert.assertTrue( outputFile.exists() );
71+
Assertions.assertTrue( outputFile.exists() );
7672
} catch (Exception e) {
7773
this.failEx( e );
7874
}

‎fj-doc-mod-fop/src/test/java/test/org/fugerit/java/doc/mod/fop/TestResourceResolver.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,57 @@
1515
import org.fugerit.java.doc.mod.fop.config.ClassLoaderResourceResolverWrapper;
1616
import org.fugerit.java.doc.mod.fop.config.FopConfigClassLoaderWrapper;
1717
import org.fugerit.java.doc.mod.fop.config.ResourceResolverWrapper;
18-
import org.junit.Assert;
19-
import org.junit.Test;
18+
import org.junit.jupiter.api.Assertions;
19+
import org.junit.jupiter.api.Test;
2020

2121
import lombok.extern.slf4j.Slf4j;
2222
import test.org.fugerit.java.BasicTest;
2323

2424
@Slf4j
25-
public class TestResourceResolver extends BasicTest {
25+
class TestResourceResolver extends BasicTest {
2626

2727
@Test
2828
public void testResourceResolverWrapper() throws IOException {
2929
File target = new File( "target" );
3030
ResourceResolverWrapper wrapper = new ResourceResolverWrapper( new DoNothingResourceResolver() );
3131
log.info( "wrapper : {} : {}", wrapper, wrapper.unwrap() );
32-
Assert.assertNotNull( this.fullSerializationTest( wrapper ) );
33-
Assert.assertNull( wrapper.getResource( target.toURI() ) );
34-
Assert.assertNull( wrapper.getOutputStream( target.toURI() ) );
32+
Assertions.assertNotNull( this.fullSerializationTest( wrapper ) );
33+
Assertions.assertNull( wrapper.getResource( target.toURI() ) );
34+
Assertions.assertNull( wrapper.getOutputStream( target.toURI() ) );
3535
}
3636

3737
@Test
38-
public void testClassLoaderResourceResolverWrapper() throws IOException, URISyntaxException {
38+
void testClassLoaderResourceResolverWrapper() throws IOException, URISyntaxException {
3939
ClassLoaderResourceResolverWrapper rr = new ClassLoaderResourceResolverWrapper();
4040
File target = new File( "target/test.txt" );
4141
rr.wrap( new DoNothingResourceResolver() );
4242
URI u = new URI( ClassLoaderResourceResolverWrapper.CLASSPATH_SCHEMA+"sample/doc_alt_01.xml" );
4343
log.info( "wrapper : {} : {}", rr, rr.unwrap() );
44-
Assert.assertNotNull( rr.getResource( u ) );
45-
Assert.assertNull( rr.getResource( target.toURI() ) );
46-
Assert.assertNull( rr.getOutputStream( target.toURI() ) );
44+
Assertions.assertNotNull( rr.getResource( u ) );
45+
Assertions.assertNull( rr.getResource( target.toURI() ) );
46+
Assertions.assertNull( rr.getOutputStream( target.toURI() ) );
4747
}
4848

4949
@Test
5050
public void testFopConfigClassLoaderWrapper() throws IOException, ConfigException {
5151
FopConfigClassLoaderWrapper config1 = new FopConfigClassLoaderWrapper( "fop-config.xml" );
52-
Assert.assertNotNull( config1.newFactory() );
52+
Assertions.assertNotNull( config1.newFactory() );
5353
FopConfigClassLoaderWrapper config2 = new FopConfigClassLoaderWrapper( "fop-config-pdfa.xml" );
54-
Assert.assertNotNull( config2.newFactory() );
54+
Assertions.assertNotNull( config2.newFactory() );
5555
FopConfigClassLoaderWrapper config3 = new FopConfigClassLoaderWrapper( "fop-config-pdfua.xml" );
56-
Assert.assertNotNull( config3.newFactory() );
57-
Assert.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 , config3) );
58-
Assert.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 , false, false ) );
59-
Assert.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 ) );
60-
Assert.assertNotNull( config1.getCustomResourceResolver() );
56+
Assertions.assertNotNull( config3.newFactory() );
57+
Assertions.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 , config3) );
58+
Assertions.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 , false, false ) );
59+
Assertions.assertNotNull( new PdfFopTypeHandler( StandardCharsets.UTF_8 ) );
60+
Assertions.assertNotNull( config1.getCustomResourceResolver() );
6161
}
6262

6363
@Test
6464
public void testFmConfig() throws Exception {
6565
FreemarkerDocProcessConfig config = FreemarkerDocProcessConfigFacade.loadConfigSafe( "cl://fm-config.xml" );
6666
for ( DocTypeHandler handler : config.getFacade().handlers() ) {
6767
log.info( "init handler : {}", handler );
68-
Assert.assertTrue( InitHandler.initDoc( handler ) );
68+
Assertions.assertTrue( InitHandler.initDoc( handler ) );
6969
}
7070
}
7171

0 commit comments

Comments
 (0)