Skip to content

Commit 98c372c

Browse files
fugerit79fugerit79
authored
Merge pull request #94 from fugerit-org/93-chore-upgrade-from-junit4-to-junit5
93 chore upgrade from junit4 to junit5
2 parents 08369f3 + a9f2fd0 commit 98c372c

File tree

139 files changed

+1822
-1794
lines changed

Some content is hidden

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

139 files changed

+1822
-1794
lines changed

‎fj-core-jvfs/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@
116116
<scope>test</scope>
117117
</dependency>
118118

119+
<dependency>
120+
<groupId>org.junit.jupiter</groupId>
121+
<artifactId>junit-jupiter-api</artifactId>
122+
<scope>test</scope>
123+
</dependency>
124+
119125
<dependency>
120126
<groupId>org.fugerit.java</groupId>
121127
<artifactId>fj-test-helper8</artifactId>

‎fj-core-jvfs/src/test/java/org/fugerit/java/core/jvfs/db/daogen/junit4test/model/DbJvfsFileJunit4ModelTest.java renamed to ‎fj-core-jvfs/src/test/java/org/fugerit/java/core/jvfs/db/daogen/junit5test/model/DbJvfsFileJunit5ModelTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
package org.fugerit.java.core.jvfs.db.daogen.junit4test.model;
1+
package org.fugerit.java.core.jvfs.db.daogen.junit5test.model;
22

33
import org.fugerit.java.core.jvfs.db.daogen.def.facade.DbJvfsFileFinder;
44
import org.fugerit.java.core.jvfs.db.daogen.helper.HelperDbJvfsFile;
55
import org.fugerit.java.core.jvfs.db.daogen.helper.WrapperDbJvfsFile;
66
import org.fugerit.java.core.jvfs.db.daogen.model.ModelDbJvfsFile;
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
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

1212
// custom import start ( code above here will be overwritten )
1313
// custom import end ( code below here will be overwritten )
1414

1515
/**
16-
* DbJvfsFileJunit4ModelTest, version : 1.0.0
16+
* DbJvfsFileJunit5ModelTest, version : 1.0.0
1717
*
1818
* author: fugerit
1919
*
2020
* warning!: auto generated object, insert custom code only between comments :
2121
* // custom code start ( code above here will be overwritten )
2222
* // custom code end ( code below here will be overwritten )
2323
*/
24-
public class DbJvfsFileJunit4ModelTest {
24+
class DbJvfsFileJunit5ModelTest {
2525

2626
// custom code start ( code above here will be overwritten )
2727
// custom code end ( code below here will be overwritten )
2828

29-
private static final Logger logger = LoggerFactory.getLogger( DbJvfsFileJunit4ModelTest.class );
29+
private static final Logger logger = LoggerFactory.getLogger( DbJvfsFileJunit5ModelTest.class );
3030

3131
public void printAll( ModelDbJvfsFile current ) {
3232
logger.info( "FILE_NAME-> {}", current.getFileName() );
@@ -41,36 +41,36 @@ public void printAll( ModelDbJvfsFile current ) {
4141
public ModelDbJvfsFile newInstance() {
4242
ModelDbJvfsFile model = new HelperDbJvfsFile();
4343
WrapperDbJvfsFile current = new WrapperDbJvfsFile( model );
44-
Assert.assertTrue( current.isEmpty() );
44+
Assertions.assertTrue( current.isEmpty() );
4545
current.setFileName("1");
46-
Assert.assertFalse( current.isEmpty() );
46+
Assertions.assertFalse( current.isEmpty() );
4747
current.setParentPath("1");
48-
Assert.assertFalse( current.isEmpty() );
48+
Assertions.assertFalse( current.isEmpty() );
4949
current.setFileProps("1");
50-
Assert.assertFalse( current.isEmpty() );
50+
Assertions.assertFalse( current.isEmpty() );
5151
current.setCreationTime(new java.util.Date());
52-
Assert.assertFalse( current.isEmpty() );
52+
Assertions.assertFalse( current.isEmpty() );
5353
current.setUpdateTime(new java.util.Date());
54-
Assert.assertFalse( current.isEmpty() );
54+
Assertions.assertFalse( current.isEmpty() );
5555
current.setFileSize(new java.math.BigDecimal( "1" ));
56-
Assert.assertFalse( current.isEmpty() );
56+
Assertions.assertFalse( current.isEmpty() );
5757
current.setFileContent(null);
58-
Assert.assertFalse( current.isEmpty() );
58+
Assertions.assertFalse( current.isEmpty() );
5959
logger.info( "unwrap : {}", current.unwrap( current ) );
6060
return current;
6161
}
6262

6363
@Test
64-
public void testJUnit4ModelDbJvfsFile() {
64+
void testJUnit5ModelDbJvfsFile() {
6565
ModelDbJvfsFile current = this.newInstance();
6666
this.printAll( current );
6767
logger.info( "current toString() : {}", current );
68-
Assert.assertNotNull( current );
68+
Assertions.assertNotNull( current );
6969
DbJvfsFileFinder finder1 = new DbJvfsFileFinder();
7070
finder1.setModel( current );
7171
logger.info( "finder1.getModel() -> {}", finder1.getModel() );
72-
Assert.assertNotNull( DbJvfsFileFinder.newInstance( current ) );
73-
Assert.assertNotNull( finder1 );
72+
Assertions.assertNotNull( DbJvfsFileFinder.newInstance( current ) );
73+
Assertions.assertNotNull( finder1 );
7474
}
7575

7676
}

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestCopyClToReal.java

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

55
import org.fugerit.java.core.jvfs.JVFS;
66
import org.fugerit.java.core.jvfs.file.RealJMount;
7-
import org.junit.Test;
7+
import org.junit.jupiter.api.Test;
88

9-
public class TestCopyClToReal extends TestJVFSHelper {
9+
class TestCopyClToReal extends TestJVFSHelper {
1010

1111
@Test
12-
public void testCopy03() {
12+
void testCopy03() {
1313
try {
1414
File dest = new File( "target/test_copy_02" );
1515
JVFS from = TestJMountHelper.getClassLoaderJVFSDefault();

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestCopyRealToDb.java

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

33
import org.fugerit.java.core.jvfs.JVFS;
44
import org.fugerit.java.core.jvfs.db.JMountDaogenDB;
5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;
88

9-
public class TestCopyRealToDb extends TestJVFSHelper {
9+
class TestCopyRealToDb extends TestJVFSHelper {
1010

1111
@Test
12-
public void testCopy02() {
12+
void testCopy02() {
1313
try {
1414
JVFS from = TestJMountHelper.getRealJVFSDefault();
1515
JVFS to = JMountDaogenDB.createJVFS( MemJvfsDBHelper.newCF(), this.facade );

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestCopyRealToReal.java

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

66
import org.fugerit.java.core.jvfs.JVFS;
77
import org.fugerit.java.core.jvfs.file.RealJMount;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

10-
public class TestCopyRealToReal extends TestJVFSHelper {
10+
class TestCopyRealToReal extends TestJVFSHelper {
1111

1212
@Test
13-
public void testCopy01() {
13+
void testCopy01() {
1414
try {
1515
File dest = new File( "target/test_copy_01" );
1616
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestDBJMount.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
import org.fugerit.java.core.jvfs.db.daogen.helper.HelperDbJvfsFile;
1111
import org.fugerit.java.core.jvfs.db.daogen.helper.WrapperDbJvfsFile;
1212
import org.fugerit.java.core.jvfs.db.impl.facade.data.DataEntityDbJvfsFileFacade;
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 lombok.extern.slf4j.Slf4j;
1717
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;
1818

1919
@Slf4j
20-
public class TestDBJMount extends TestJVFSHelper {
20+
class TestDBJMount extends TestJVFSHelper {
2121

2222
@Test
23-
public void testInitMemDB() {
23+
void testInitMemDB() {
2424
try {
2525
String tableName = "FUGERIT.ALT2_DB_JVFS_FILE";
2626
DataEntityDbJvfsFileFacade facade = DataEntityDbJvfsFileFacade.newInstanceWithTable(tableName);
@@ -32,10 +32,10 @@ public void testInitMemDB() {
3232
this.tryDumpTestDb( facade );
3333
JFile newFile = jvfs.getJFile( "/test-mount/core-jvfs/JMountDaogenDB_renamed.md" );
3434
boolean testRename = testFile.rename( newFile );
35-
Assert.assertTrue( testRename );
35+
Assertions.assertTrue( testRename );
3636
JFile newDir = jvfs.getJFile( "/core-jvfs-renamed/" );
3737
boolean testRenameDir = testFile.getParent().rename( newDir );
38-
Assert.assertTrue( testRenameDir );
38+
Assertions.assertTrue( testRenameDir );
3939
this.tryDumpTestDb( facade );
4040
log.info( "toString() : {}", testFile );
4141
WrapperDbJvfsFile wrapper = new WrapperDbJvfsFile( new HelperDbJvfsFile() );

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestDeleteRealToDb.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import org.fugerit.java.core.jvfs.JVFS;
77
import org.fugerit.java.core.jvfs.db.JMountDaogenDB;
88
import org.fugerit.java.core.jvfs.db.impl.facade.data.DataEntityDbJvfsFileFacade;
9-
import org.junit.Test;
9+
import org.junit.jupiter.api.Test;
1010

1111
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;
1212

13-
public class TestDeleteRealToDb extends TestJVFSHelper {
13+
class TestDeleteRealToDb extends TestJVFSHelper {
1414

1515
@Test
16-
public void testDelete01() {
16+
void testDelete01() {
1717
try {
1818
File dest = new File( "target/test_delete_01" );
1919
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestDeleteRealToReal.java

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

66
import org.fugerit.java.core.jvfs.JVFS;
77
import org.fugerit.java.core.jvfs.file.RealJMount;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

10-
public class TestDeleteRealToReal extends TestJVFSHelper {
10+
class TestDeleteRealToReal extends TestJVFSHelper {
1111

1212
@Test
13-
public void testDelete01() {
13+
void testDelete01() {
1414
try {
1515
File dest = new File( "target/test_delete_01" );
1616
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestJVFSHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
import org.fugerit.java.core.jvfs.util.JFileUtilCP;
1818
import org.fugerit.java.core.jvfs.util.JFileUtilRM;
1919
import org.fugerit.java.core.lang.helpers.StringUtils;
20-
import org.junit.BeforeClass;
2120

21+
import org.junit.jupiter.api.BeforeAll;
2222
import test.org.fugerit.java.BasicTest;
2323
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;
2424

2525
public class TestJVFSHelper extends BasicTest {
2626

2727
protected EntityDbJvfsFileFacade facade = DataEntityDbJvfsFileFacade.newInstanceWithPrefix( "FUGERIT." );
2828

29-
@BeforeClass
29+
@BeforeAll
3030
public static void init() {
3131
MemJvfsDBHelper.init();
3232
}

‎fj-core-jvfs/src/test/java/test/org/fugerit/java/core/jvfs/TestPathDescriptor.java

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

33
import org.fugerit.java.core.jvfs.helpers.JFileUtils;
44
import org.fugerit.java.core.jvfs.helpers.PathDescriptor;
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.BasicTest;
99

10-
public class TestPathDescriptor extends BasicTest {
10+
class TestPathDescriptor extends BasicTest {
1111

1212
private void testWorker( String path, String parentPathExpected, String nameExpected ) {
1313
try {
1414
PathDescriptor descriptor = JFileUtils.pathDescriptor( path );
1515
logger.info( "path:{}, descriptor:{}", path, descriptor );
16-
Assert.assertEquals( "Expected name" , nameExpected, descriptor.getName() );
17-
Assert.assertEquals( "Expected parent path" , parentPathExpected, descriptor.getParentPath() );
16+
Assertions.assertEquals( nameExpected, descriptor.getName(), "Expected name" );
17+
Assertions.assertEquals( parentPathExpected, descriptor.getParentPath(), "Expected parent path" );
1818
} catch (Exception e) {
1919
this.failEx(e);
2020
}
2121
}
2222

2323
@Test
24-
public void test01Root() {
24+
void test01Root() {
2525
this.testWorker( "/", "", "/" );
2626
}
2727

2828
@Test
29-
public void test02() {
29+
void test02() {
3030
this.testWorker( "/test/", "/", "test/" );
3131
}
3232

3333
@Test
34-
public void test03() {
34+
void test03() {
3535
this.testWorker( "/test/core/check.txt", "/test/core/", "check.txt" );
3636
}
3737

3838
@Test
39-
public void test04() {
39+
void test04() {
4040
this.testWorker( "/test/check.txt", "/test/", "check.txt" );
4141
}
4242

4343
@Test
44-
public void test05() {
44+
void test05() {
4545
this.testWorker( "/test/core/file/check.xml", "/test/core/file/", "check.xml" );
4646
}
4747

4848
@Test
49-
public void test06() {
49+
void test06() {
5050
this.testWorker( "/test/core/file/", "/test/core/", "file/" );
5151
}
5252

0 commit comments

Comments
 (0)