Skip to content

Commit d6fa090

Browse files
fugerit79fugerit79
authored
Merge pull request #365 from fugerit-org/317-chore-migrate-junit4-to-junit5
[fj-doc-maven-plugin] migrate junit4 to junit5 #360
2 parents a0d1102 + 7f1de61 commit d6fa090

File tree

7 files changed

+80
-80
lines changed

7 files changed

+80
-80
lines changed

‎fj-doc-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
</dependency>
9191

9292
<dependency>
93-
<groupId>junit</groupId>
94-
<artifactId>junit</artifactId>
93+
<groupId>org.junit.jupiter</groupId>
94+
<artifactId>junit-jupiter-api</artifactId>
9595
<scope>test</scope>
9696
</dependency>
9797

‎fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
import org.fugerit.java.doc.project.facade.BasicVenusFacade;
1111
import org.fugerit.java.doc.project.facade.VenusContext;
1212
import org.fugerit.java.doc.project.facade.AddVenusFacade;
13-
import org.junit.Assert;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.Assertions;
14+
import org.junit.jupiter.api.Test;
1515

1616
import java.io.File;
1717
import java.io.IOException;
1818
import java.util.Arrays;
1919
import java.util.UUID;
2020

2121
@Slf4j
22-
public class TestAddVenusFacade {
22+
class TestAddVenusFacade {
2323

2424
private String getVersion() {
2525
return "8.6.1";
@@ -34,12 +34,12 @@ private File initConfigWorker(String configId ) throws IOException {
3434
}
3535

3636
@Test
37-
public void testAddVenus() throws IOException {
37+
void testAddVenus() throws IOException {
3838
int count = 0;
3939
for ( String currentConfig : Arrays.asList( "ok1-pom", "ok2-pom", "ok3-pom", "ok4-pom" ) ) {
4040
File projectDir = this.initConfigWorker( currentConfig );
4141
log.info( "projectDir: {}, exists:{}", projectDir, projectDir.exists() );
42-
Assert.assertTrue( projectDir.exists() );
42+
Assertions.assertTrue( projectDir.exists() );
4343
String moduleList = "fj-doc-base,base-json,mod-fop,mod-opencsv,mod-poi";
4444
boolean addFacade = false;
4545
boolean excludeXmlApis = false;
@@ -65,14 +65,14 @@ public void testAddVenus() throws IOException {
6565
context.setAddLombok( addLombok );
6666
context.setAddDependencyOnTop( addDependencyOnTop );
6767
boolean result = AddVenusFacade.addToProject( context );
68-
Assert.assertTrue( result );
69-
Assert.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) );
68+
Assertions.assertTrue( result );
69+
Assertions.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) );
7070
count++;
7171
}
7272
}
7373

7474
@Test
75-
public void testMojoAdd() throws IOException, MojoExecutionException, MojoFailureException {
75+
void testMojoAdd() throws IOException, MojoExecutionException, MojoFailureException {
7676
for ( String currentConfig : Arrays.asList( "ok3-pom" ) ) {
7777
File projectDir = this.initConfigWorker( currentConfig );
7878
MojoAdd mojoAdd = new MojoAdd() {
@@ -91,12 +91,12 @@ public void execute() throws MojoExecutionException, MojoFailureException {
9191
}
9292
};
9393
mojoAdd.execute();
94-
Assert.assertTrue( projectDir.exists() );
94+
Assertions.assertTrue( projectDir.exists() );
9595
}
9696
}
9797

9898
@Test
99-
public void testMojoAddSimpleModel() throws IOException, MojoExecutionException, MojoFailureException {
99+
void testMojoAddSimpleModel() throws IOException, MojoExecutionException, MojoFailureException {
100100
for ( String current : Arrays.asList( "ok3-pom", "ok5-pom" ) ) {
101101
for ( String currentConfig : Arrays.asList( current ) ) {
102102
File projectDir = this.initConfigWorker( currentConfig );
@@ -114,38 +114,38 @@ public void execute() throws MojoExecutionException, MojoFailureException {
114114
}
115115
};
116116
mojoAdd.execute();
117-
Assert.assertTrue( projectDir.exists() );
117+
Assertions.assertTrue( projectDir.exists() );
118118
}
119119
}
120120
}
121121

122122

123123
@Test
124-
public void testFail() {
124+
void testFail() {
125125
VenusContext context = new VenusContext( new File( "target" ), this.getVersion(),"base" );
126126
boolean result = AddVenusFacade.addToProject( context );
127-
Assert.assertFalse( result );
127+
Assertions.assertFalse( result );
128128
}
129129

130130
@Test
131-
public void testFailNoModule() throws IOException {
131+
void testFailNoModule() throws IOException {
132132
for ( String currentConfig : Arrays.asList( "ko1-pom" ) ) {
133133
File projectDir = this.initConfigWorker(currentConfig);
134134
VenusContext context = new VenusContext( projectDir, this.getVersion(), "base,not-exists" );
135-
Assert.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) );
135+
Assertions.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) );
136136
}
137137
}
138138

139139
@Test
140-
public void testAdditional() {
141-
Assert.assertNotNull( new BasicVenusFacade() {});
140+
void testAdditional() {
141+
Assertions.assertNotNull( new BasicVenusFacade() {});
142142
Dependency d = new Dependency();
143143
d.setGroupId( "org.fugerit.java" );
144144
d.setArtifactId( "fj-core" );
145145
BasicVenusFacade.checkDependencies( true, d );
146146
d.setArtifactId( "fj-doc-base" );
147147
BasicVenusFacade.checkDependencies( true, d );
148-
Assert.assertThrows( ConfigRuntimeException.class, () -> BasicVenusFacade.checkDependencies( false, d ) );
148+
Assertions.assertThrows( ConfigRuntimeException.class, () -> BasicVenusFacade.checkDependencies( false, d ) );
149149
d.setGroupId( "junit" );
150150
d.setArtifactId( "junit" );
151151
BasicVenusFacade.checkDependencies( true, d );

‎fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestFlavourExtraConfigFacade.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.fugerit.java.doc.project.facade.flavour.extra.FlavourExtraConfig;
1111
import org.fugerit.java.doc.project.facade.flavour.extra.FlavourExtraConfigFacade;
1212
import org.fugerit.java.doc.project.facade.flavour.extra.ParamConfig;
13-
import org.junit.Assert;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.Assertions;
14+
import org.junit.jupiter.api.Test;
1515

1616
import java.io.File;
1717
import java.io.IOException;
@@ -20,29 +20,29 @@
2020
import java.util.Arrays;
2121

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

2525
private static final String FLAVOURTEST_1 = "flavourtest-1";
2626

2727
private static final String PARAM_ADD_LOMBOK = "addLombok";
2828

2929
@Test
30-
public void readConfig() throws IOException {
30+
void readConfig() throws IOException {
3131
// test quarkus-3 config
3232
String flavourConfigPath = String.format( "config/flavour-extra-config/%s-config.yml", FLAVOURTEST_1 );
3333
try (InputStream is = ClassHelper.loadFromDefaultClassLoader( flavourConfigPath ) ) {
3434
FlavourExtraConfig configQuarkus3 = FlavourExtraConfigFacade.readConfigBlankDefault( is );
35-
Assert.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( PARAM_ADD_LOMBOK )).getAcceptOnly().contains( "true" ) );
35+
Assertions.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( PARAM_ADD_LOMBOK )).getAcceptOnly().contains( "true" ) );
3636
}
3737
// test config does not exist
3838
try (InputStream is = ClassHelper.loadFromDefaultClassLoader( "config/flavour-extra-config/do-not-exist.yml" ) ) {
3939
FlavourExtraConfig configNotExists = FlavourExtraConfigFacade.readConfig( is );
40-
Assert.assertNull( configNotExists );
40+
Assertions.assertNull( configNotExists );
4141
}
4242
}
4343

4444
@Test
45-
public void testCheckFlavourExtraConfig() throws NoSuchFieldException {
45+
void testCheckFlavourExtraConfig() throws NoSuchFieldException {
4646
File projectFolder = new File( "target/test-flavour-extra-config" );
4747
String groupId = "test-group";
4848
String artifactId = "test-artifact";
@@ -53,12 +53,12 @@ public void testCheckFlavourExtraConfig() throws NoSuchFieldException {
5353
context.setAddLombok( Boolean.TRUE );
5454
FlavourFacade.checkFlavourExtraConfig( context, flavour );
5555
context.setAddLombok( Boolean.FALSE );
56-
Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfig( context, flavour ) );
56+
Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfig( context, flavour ) );
5757
String testFlavourVersion = "3.19.4";
5858
String propertyFlavourVersion = "flavourVersion";
5959
context.setFlavourVersion( testFlavourVersion );
6060
Field fieldFlavourVersion = FlavourContext.class.getDeclaredField( propertyFlavourVersion );
61-
Assert.assertEquals( testFlavourVersion, FlavourFacade.readField( context, fieldFlavourVersion, propertyFlavourVersion ) );
61+
Assertions.assertEquals( testFlavourVersion, FlavourFacade.readField( context, fieldFlavourVersion, propertyFlavourVersion ) );
6262
// check params
6363
FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, null, FLAVOURTEST_1, null );
6464
FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, new ParamConfig(), FLAVOURTEST_1, null );
@@ -68,7 +68,7 @@ public void testCheckFlavourExtraConfig() throws NoSuchFieldException {
6868
pc.setAcceptOnly( Arrays.asList( Boolean.TRUE.toString() ) );
6969
return pc;
7070
} );
71-
Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, paramConfig, FLAVOURTEST_1, BooleanUtils.BOOLEAN_FALSE ) );
71+
Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, paramConfig, FLAVOURTEST_1, BooleanUtils.BOOLEAN_FALSE ) );
7272
}
7373

7474
}

‎fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestInit.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import org.fugerit.java.doc.project.facade.FlavourFacade;
1111
import org.fugerit.java.doc.project.facade.ModuleFacade;
1212
import org.fugerit.java.doc.project.facade.VenusContext;
13-
import org.junit.Assert;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.Assertions;
14+
import org.junit.jupiter.api.Test;
1515

1616
import java.io.File;
1717
import java.util.Arrays;
1818
import java.util.UUID;
1919

2020
@Slf4j
21-
public class TestInit {
21+
class TestInit {
2222

2323
private static final String FREEMARKER_NATIVE_AVAILABLE = "8.11.9";
2424

@@ -56,26 +56,26 @@ public void execute() throws MojoExecutionException, MojoFailureException {
5656
}
5757

5858
@Test
59-
public void testMojoQuarkus3GradleGroovyAndKts() throws MojoExecutionException, MojoFailureException {
59+
void testMojoQuarkus3GradleGroovyAndKts() throws MojoExecutionException, MojoFailureException {
6060
for ( String currentFlavour : Arrays.asList( FlavourFacade.FLAVOUR_QUARKUS_3_GRADLE, FlavourFacade.FLAVOUR_QUARKUS_3_GRADLE_KTS ) ) {
6161
File projectDir = this.initConfigWorker(currentFlavour);
6262
createMojoInit( projectDir, currentFlavour ).execute();
63-
Assert.assertTrue( projectDir.exists() );
63+
Assertions.assertTrue( projectDir.exists() );
6464
}
6565
}
6666

6767
@Test
68-
public void testMojoInit() throws MojoExecutionException, MojoFailureException {
68+
void testMojoInit() throws MojoExecutionException, MojoFailureException {
6969
for ( String currentFlavour : FlavourFacade.SUPPORTED_FLAVOURS ) {
7070
if ( FlavourFacade.isGradleKtsFlavour( currentFlavour ) ) {
7171
log.info( "skip gradle flavour {}", currentFlavour );
7272
} else {
7373
File projectDir = this.initConfigWorker(currentFlavour);
7474
MojoInit mojoInit = createMojoInit( projectDir, currentFlavour );
7575
mojoInit.execute();
76-
Assert.assertTrue( projectDir.exists() );
77-
Assert.assertThrows( MojoFailureException.class, () -> mojoInit.execute() );
78-
Assert.assertThrows( MojoFailureException.class, () -> mojoInit.apply( () -> {
76+
Assertions.assertTrue( projectDir.exists() );
77+
Assertions.assertThrows( MojoFailureException.class, () -> mojoInit.execute() );
78+
Assertions.assertThrows( MojoFailureException.class, () -> mojoInit.apply( () -> {
7979
if ( Boolean.TRUE ) {
8080
throw new ConfigException( "Scenario excetion" );
8181
}
@@ -85,30 +85,30 @@ public void testMojoInit() throws MojoExecutionException, MojoFailureException {
8585
}
8686

8787
@Test
88-
public void testFlavourContext() {
88+
void testFlavourContext() {
8989
File testFile = new File( "target" );
90-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( null, null, null, null, null, null ) );
91-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, null, null, null, null, null ) );
92-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id1", null, null, null, null ) );
93-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id2", "artifact-id2", null, null, null ) );
94-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id3", "artifact-id3", "1.0.0-SNAPSHOT", null, null ) );
95-
Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id4", "artifact-id4", "2.0.0-SNAPSHOT", "21", null ) );
90+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( null, null, null, null, null, null ) );
91+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, null, null, null, null, null ) );
92+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id1", null, null, null, null ) );
93+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id2", "artifact-id2", null, null, null ) );
94+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id3", "artifact-id3", "1.0.0-SNAPSHOT", null, null ) );
95+
Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id4", "artifact-id4", "2.0.0-SNAPSHOT", "21", null ) );
9696
FlavourContext context = new FlavourContext( testFile, "group-id5", "artifact-id5", "3.0.0-SNAPSHOT", "8", "unsupported" );
9797
context.setAddLombok( Boolean.TRUE );
98-
Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.initProject( context ) );
99-
Assert.assertThrows( ConfigRuntimeException.class, () -> ModuleFacade.toModuleList( "base,freemarker,unsupported" ) );
100-
Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_3 ) );
98+
Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.initProject( context ) );
99+
Assertions.assertThrows( ConfigRuntimeException.class, () -> ModuleFacade.toModuleList( "base,freemarker,unsupported" ) );
100+
Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_3 ) );
101101
FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_2 );
102102
FlavourContext contextQuarkus2 = new FlavourContext( testFile, "group-id5", "artifact-id5", "3.0.0-SNAPSHOT", "11", "unsupported" );
103103
contextQuarkus2.setAddLombok( Boolean.TRUE );
104104
FlavourFacade.checkFlavour( contextQuarkus2, FlavourFacade.FLAVOUR_QUARKUS_2 );
105105
context.setFlavourVersion( "test" );
106106
FlavourFacade.checkFlavourVersion( context, FlavourFacade.FLAVOUR_QUARKUS_2 );
107-
Assert.assertEquals( "test", context.getFlavourVersion() );
107+
Assertions.assertEquals( "test", context.getFlavourVersion() );
108108
context.setVersion( VenusContext.VERSION_NA_FREEMARKER_NATIVE );
109-
Assert.assertFalse( context.isFreeMarkerNativeAvailable() );
109+
Assertions.assertFalse( context.isFreeMarkerNativeAvailable() );
110110
context.setVersion( FREEMARKER_NATIVE_AVAILABLE );
111-
Assert.assertTrue( context.isFreeMarkerNativeAvailable() );
111+
Assertions.assertTrue( context.isFreeMarkerNativeAvailable() );
112112
}
113113

114114
}

‎fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestMojoVerify.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import org.fugerit.java.core.function.SimpleValue;
66
import org.fugerit.java.doc.base.config.DocConfig;
77
import org.fugerit.java.doc.maven.MojoVerify;
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

11-
public class TestMojoVerify {
11+
class TestMojoVerify {
1212

1313
private static final String PATH_OK = "src/test/resources/fj_doc_test/template";
1414

@@ -20,7 +20,7 @@ public class TestMojoVerify {
2020

2121

2222
@Test
23-
public void testMojoVerifyOk() throws MojoExecutionException, MojoFailureException {
23+
void testMojoVerifyOk() throws MojoExecutionException, MojoFailureException {
2424
SimpleValue<Boolean> res = new SimpleValue<>( Boolean.FALSE );
2525
MojoVerify mojoVerify = new MojoVerify() {
2626
@Override
@@ -35,11 +35,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
3535
}
3636
};
3737
mojoVerify.execute();
38-
Assert.assertTrue( res.getValue() );
38+
Assertions.assertTrue( res.getValue() );
3939
}
4040

4141
@Test
42-
public void testMojoVerifyKo() throws MojoExecutionException, MojoFailureException {
42+
void testMojoVerifyKo() throws MojoExecutionException, MojoFailureException {
4343
SimpleValue<Boolean> res = new SimpleValue<>( Boolean.FALSE );
4444
MojoVerify mojoVerify = new MojoVerify() {
4545
@Override
@@ -51,11 +51,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
5151
}
5252
};
5353
mojoVerify.execute();
54-
Assert.assertTrue( res.getValue() );
54+
Assertions.assertTrue( res.getValue() );
5555
}
5656

5757
@Test
58-
public void testMojoVerifyKoFail() {
58+
void testMojoVerifyKoFail() {
5959
SimpleValue<Boolean> res = new SimpleValue<>( Boolean.FALSE );
6060
MojoVerify mojoVerify = new MojoVerify() {
6161
@Override
@@ -69,11 +69,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
6969
res.setValue( Boolean.TRUE );
7070
}
7171
};
72-
Assert.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() );
72+
Assertions.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() );
7373
}
7474

7575
@Test
76-
public void testMojoVerifyKoPathNoFolder() {
76+
void testMojoVerifyKoPathNoFolder() {
7777
SimpleValue<Boolean> res = new SimpleValue<>( Boolean.FALSE );
7878
MojoVerify mojoVerify = new MojoVerify() {
7979
@Override
@@ -84,7 +84,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
8484
res.setValue( Boolean.TRUE );
8585
}
8686
};
87-
Assert.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() );
87+
Assertions.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() );
8888
}
8989

9090
}

0 commit comments

Comments
 (0)