Skip to content

93 chore upgrade from junit4 to junit5 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fj-core-jvfs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.fugerit.java</groupId>
<artifactId>fj-test-helper8</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
package org.fugerit.java.core.jvfs.db.daogen.junit4test.model;
package org.fugerit.java.core.jvfs.db.daogen.junit5test.model;

import org.fugerit.java.core.jvfs.db.daogen.def.facade.DbJvfsFileFinder;
import org.fugerit.java.core.jvfs.db.daogen.helper.HelperDbJvfsFile;
import org.fugerit.java.core.jvfs.db.daogen.helper.WrapperDbJvfsFile;
import org.fugerit.java.core.jvfs.db.daogen.model.ModelDbJvfsFile;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

/**
* DbJvfsFileJunit4ModelTest, version : 1.0.0
* DbJvfsFileJunit5ModelTest, version : 1.0.0
*
* author: fugerit
*
* warning!: auto generated object, insert custom code only between comments :
* // custom code start ( code above here will be overwritten )
* // custom code end ( code below here will be overwritten )
*/
public class DbJvfsFileJunit4ModelTest {
class DbJvfsFileJunit5ModelTest {

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

private static final Logger logger = LoggerFactory.getLogger( DbJvfsFileJunit4ModelTest.class );
private static final Logger logger = LoggerFactory.getLogger( DbJvfsFileJunit5ModelTest.class );

public void printAll( ModelDbJvfsFile current ) {
logger.info( "FILE_NAME-> {}", current.getFileName() );
Expand All @@ -41,36 +41,36 @@ public void printAll( ModelDbJvfsFile current ) {
public ModelDbJvfsFile newInstance() {
ModelDbJvfsFile model = new HelperDbJvfsFile();
WrapperDbJvfsFile current = new WrapperDbJvfsFile( model );
Assert.assertTrue( current.isEmpty() );
Assertions.assertTrue( current.isEmpty() );
current.setFileName("1");
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setParentPath("1");
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setFileProps("1");
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setCreationTime(new java.util.Date());
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setUpdateTime(new java.util.Date());
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setFileSize(new java.math.BigDecimal( "1" ));
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
current.setFileContent(null);
Assert.assertFalse( current.isEmpty() );
Assertions.assertFalse( current.isEmpty() );
logger.info( "unwrap : {}", current.unwrap( current ) );
return current;
}

@Test
public void testJUnit4ModelDbJvfsFile() {
void testJUnit5ModelDbJvfsFile() {
ModelDbJvfsFile current = this.newInstance();
this.printAll( current );
logger.info( "current toString() : {}", current );
Assert.assertNotNull( current );
Assertions.assertNotNull( current );
DbJvfsFileFinder finder1 = new DbJvfsFileFinder();
finder1.setModel( current );
logger.info( "finder1.getModel() -> {}", finder1.getModel() );
Assert.assertNotNull( DbJvfsFileFinder.newInstance( current ) );
Assert.assertNotNull( finder1 );
Assertions.assertNotNull( DbJvfsFileFinder.newInstance( current ) );
Assertions.assertNotNull( finder1 );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import org.fugerit.java.core.jvfs.JVFS;
import org.fugerit.java.core.jvfs.file.RealJMount;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class TestCopyClToReal extends TestJVFSHelper {
class TestCopyClToReal extends TestJVFSHelper {

@Test
public void testCopy03() {
void testCopy03() {
try {
File dest = new File( "target/test_copy_02" );
JVFS from = TestJMountHelper.getClassLoaderJVFSDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import org.fugerit.java.core.jvfs.JVFS;
import org.fugerit.java.core.jvfs.db.JMountDaogenDB;
import org.junit.Test;
import org.junit.jupiter.api.Test;

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

public class TestCopyRealToDb extends TestJVFSHelper {
class TestCopyRealToDb extends TestJVFSHelper {

@Test
public void testCopy02() {
void testCopy02() {
try {
JVFS from = TestJMountHelper.getRealJVFSDefault();
JVFS to = JMountDaogenDB.createJVFS( MemJvfsDBHelper.newCF(), this.facade );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import org.fugerit.java.core.jvfs.JVFS;
import org.fugerit.java.core.jvfs.file.RealJMount;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class TestCopyRealToReal extends TestJVFSHelper {
class TestCopyRealToReal extends TestJVFSHelper {

@Test
public void testCopy01() {
void testCopy01() {
try {
File dest = new File( "target/test_copy_01" );
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
import org.fugerit.java.core.jvfs.db.daogen.helper.HelperDbJvfsFile;
import org.fugerit.java.core.jvfs.db.daogen.helper.WrapperDbJvfsFile;
import org.fugerit.java.core.jvfs.db.impl.facade.data.DataEntityDbJvfsFileFacade;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import lombok.extern.slf4j.Slf4j;
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;

@Slf4j
public class TestDBJMount extends TestJVFSHelper {
class TestDBJMount extends TestJVFSHelper {

@Test
public void testInitMemDB() {
void testInitMemDB() {
try {
String tableName = "FUGERIT.ALT2_DB_JVFS_FILE";
DataEntityDbJvfsFileFacade facade = DataEntityDbJvfsFileFacade.newInstanceWithTable(tableName);
Expand All @@ -32,10 +32,10 @@ public void testInitMemDB() {
this.tryDumpTestDb( facade );
JFile newFile = jvfs.getJFile( "/test-mount/core-jvfs/JMountDaogenDB_renamed.md" );
boolean testRename = testFile.rename( newFile );
Assert.assertTrue( testRename );
Assertions.assertTrue( testRename );
JFile newDir = jvfs.getJFile( "/core-jvfs-renamed/" );
boolean testRenameDir = testFile.getParent().rename( newDir );
Assert.assertTrue( testRenameDir );
Assertions.assertTrue( testRenameDir );
this.tryDumpTestDb( facade );
log.info( "toString() : {}", testFile );
WrapperDbJvfsFile wrapper = new WrapperDbJvfsFile( new HelperDbJvfsFile() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import org.fugerit.java.core.jvfs.JVFS;
import org.fugerit.java.core.jvfs.db.JMountDaogenDB;
import org.fugerit.java.core.jvfs.db.impl.facade.data.DataEntityDbJvfsFileFacade;
import org.junit.Test;
import org.junit.jupiter.api.Test;

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

public class TestDeleteRealToDb extends TestJVFSHelper {
class TestDeleteRealToDb extends TestJVFSHelper {

@Test
public void testDelete01() {
void testDelete01() {
try {
File dest = new File( "target/test_delete_01" );
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import org.fugerit.java.core.jvfs.JVFS;
import org.fugerit.java.core.jvfs.file.RealJMount;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class TestDeleteRealToReal extends TestJVFSHelper {
class TestDeleteRealToReal extends TestJVFSHelper {

@Test
public void testDelete01() {
void testDelete01() {
try {
File dest = new File( "target/test_delete_01" );
logger.info( "create dest dir : {} -> {}", dest, dest.mkdirs() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
import org.fugerit.java.core.jvfs.util.JFileUtilCP;
import org.fugerit.java.core.jvfs.util.JFileUtilRM;
import org.fugerit.java.core.lang.helpers.StringUtils;
import org.junit.BeforeClass;

import org.junit.jupiter.api.BeforeAll;
import test.org.fugerit.java.BasicTest;
import test.org.fugerit.java.core.jvfs.db.helper.MemJvfsDBHelper;

public class TestJVFSHelper extends BasicTest {

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

@BeforeClass
@BeforeAll
public static void init() {
MemJvfsDBHelper.init();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@

import org.fugerit.java.core.jvfs.helpers.JFileUtils;
import org.fugerit.java.core.jvfs.helpers.PathDescriptor;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import test.org.fugerit.java.BasicTest;

public class TestPathDescriptor extends BasicTest {
class TestPathDescriptor extends BasicTest {

private void testWorker( String path, String parentPathExpected, String nameExpected ) {
try {
PathDescriptor descriptor = JFileUtils.pathDescriptor( path );
logger.info( "path:{}, descriptor:{}", path, descriptor );
Assert.assertEquals( "Expected name" , nameExpected, descriptor.getName() );
Assert.assertEquals( "Expected parent path" , parentPathExpected, descriptor.getParentPath() );
Assertions.assertEquals( nameExpected, descriptor.getName(), "Expected name" );
Assertions.assertEquals( parentPathExpected, descriptor.getParentPath(), "Expected parent path" );
} catch (Exception e) {
this.failEx(e);
}
}

@Test
public void test01Root() {
void test01Root() {
this.testWorker( "/", "", "/" );
}

@Test
public void test02() {
void test02() {
this.testWorker( "/test/", "/", "test/" );
}

@Test
public void test03() {
void test03() {
this.testWorker( "/test/core/check.txt", "/test/core/", "check.txt" );
}

@Test
public void test04() {
void test04() {
this.testWorker( "/test/check.txt", "/test/", "check.txt" );
}

@Test
public void test05() {
void test05() {
this.testWorker( "/test/core/file/check.xml", "/test/core/file/", "check.xml" );
}

@Test
public void test06() {
void test06() {
this.testWorker( "/test/core/file/", "/test/core/", "file/" );
}

Expand Down
Loading