From 7f1de61d59344892447892ce64122d59b807bbf2 Mon Sep 17 00:00:00 2001 From: "Matteo Franci a.k.a. Fugerit" Date: Wed, 26 Mar 2025 23:14:39 +0100 Subject: [PATCH] [fj-doc-maven-plugin] migrate junit4 to junit5 #360 fix #360 --- fj-doc-maven-plugin/pom.xml | 4 +- .../project/facade/TestAddVenusFacade.java | 36 +++++++-------- .../facade/TestFlavourExtraConfigFacade.java | 20 ++++----- .../java/doc/project/facade/TestInit.java | 44 +++++++++---------- .../doc/project/facade/TestMojoVerify.java | 22 +++++----- .../doc/project/facade/TestVenusContext.java | 18 ++++---- .../doc/project/facade/TestVersionCheck.java | 16 +++---- 7 files changed, 80 insertions(+), 80 deletions(-) diff --git a/fj-doc-maven-plugin/pom.xml b/fj-doc-maven-plugin/pom.xml index a9e287b4e..b2f8b5b46 100644 --- a/fj-doc-maven-plugin/pom.xml +++ b/fj-doc-maven-plugin/pom.xml @@ -90,8 +90,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java index 1b0e9e0e1..e592a9b16 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java @@ -10,8 +10,8 @@ import org.fugerit.java.doc.project.facade.BasicVenusFacade; import org.fugerit.java.doc.project.facade.VenusContext; import org.fugerit.java.doc.project.facade.AddVenusFacade; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; @@ -19,7 +19,7 @@ import java.util.UUID; @Slf4j -public class TestAddVenusFacade { +class TestAddVenusFacade { private String getVersion() { return "8.6.1"; @@ -34,12 +34,12 @@ private File initConfigWorker(String configId ) throws IOException { } @Test - public void testAddVenus() throws IOException { + void testAddVenus() throws IOException { int count = 0; for ( String currentConfig : Arrays.asList( "ok1-pom", "ok2-pom", "ok3-pom", "ok4-pom" ) ) { File projectDir = this.initConfigWorker( currentConfig ); log.info( "projectDir: {}, exists:{}", projectDir, projectDir.exists() ); - Assert.assertTrue( projectDir.exists() ); + Assertions.assertTrue( projectDir.exists() ); String moduleList = "fj-doc-base,base-json,mod-fop,mod-opencsv,mod-poi"; boolean addFacade = false; boolean excludeXmlApis = false; @@ -65,14 +65,14 @@ public void testAddVenus() throws IOException { context.setAddLombok( addLombok ); context.setAddDependencyOnTop( addDependencyOnTop ); boolean result = AddVenusFacade.addToProject( context ); - Assert.assertTrue( result ); - Assert.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) ); + Assertions.assertTrue( result ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) ); count++; } } @Test - public void testMojoAdd() throws IOException, MojoExecutionException, MojoFailureException { + void testMojoAdd() throws IOException, MojoExecutionException, MojoFailureException { for ( String currentConfig : Arrays.asList( "ok3-pom" ) ) { File projectDir = this.initConfigWorker( currentConfig ); MojoAdd mojoAdd = new MojoAdd() { @@ -91,12 +91,12 @@ public void execute() throws MojoExecutionException, MojoFailureException { } }; mojoAdd.execute(); - Assert.assertTrue( projectDir.exists() ); + Assertions.assertTrue( projectDir.exists() ); } } @Test - public void testMojoAddSimpleModel() throws IOException, MojoExecutionException, MojoFailureException { + void testMojoAddSimpleModel() throws IOException, MojoExecutionException, MojoFailureException { for ( String current : Arrays.asList( "ok3-pom", "ok5-pom" ) ) { for ( String currentConfig : Arrays.asList( current ) ) { File projectDir = this.initConfigWorker( currentConfig ); @@ -114,38 +114,38 @@ public void execute() throws MojoExecutionException, MojoFailureException { } }; mojoAdd.execute(); - Assert.assertTrue( projectDir.exists() ); + Assertions.assertTrue( projectDir.exists() ); } } } @Test - public void testFail() { + void testFail() { VenusContext context = new VenusContext( new File( "target" ), this.getVersion(),"base" ); boolean result = AddVenusFacade.addToProject( context ); - Assert.assertFalse( result ); + Assertions.assertFalse( result ); } @Test - public void testFailNoModule() throws IOException { + void testFailNoModule() throws IOException { for ( String currentConfig : Arrays.asList( "ko1-pom" ) ) { File projectDir = this.initConfigWorker(currentConfig); VenusContext context = new VenusContext( projectDir, this.getVersion(), "base,not-exists" ); - Assert.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> AddVenusFacade.addToProject( context ) ); } } @Test - public void testAdditional() { - Assert.assertNotNull( new BasicVenusFacade() {}); + void testAdditional() { + Assertions.assertNotNull( new BasicVenusFacade() {}); Dependency d = new Dependency(); d.setGroupId( "org.fugerit.java" ); d.setArtifactId( "fj-core" ); BasicVenusFacade.checkDependencies( true, d ); d.setArtifactId( "fj-doc-base" ); BasicVenusFacade.checkDependencies( true, d ); - Assert.assertThrows( ConfigRuntimeException.class, () -> BasicVenusFacade.checkDependencies( false, d ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> BasicVenusFacade.checkDependencies( false, d ) ); d.setGroupId( "junit" ); d.setArtifactId( "junit" ); BasicVenusFacade.checkDependencies( true, d ); diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestFlavourExtraConfigFacade.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestFlavourExtraConfigFacade.java index 1eafb55c7..44ac6c9f4 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestFlavourExtraConfigFacade.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestFlavourExtraConfigFacade.java @@ -10,8 +10,8 @@ import org.fugerit.java.doc.project.facade.flavour.extra.FlavourExtraConfig; import org.fugerit.java.doc.project.facade.flavour.extra.FlavourExtraConfigFacade; import org.fugerit.java.doc.project.facade.flavour.extra.ParamConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; @@ -20,29 +20,29 @@ import java.util.Arrays; @Slf4j -public class TestFlavourExtraConfigFacade { +class TestFlavourExtraConfigFacade { private static final String FLAVOURTEST_1 = "flavourtest-1"; private static final String PARAM_ADD_LOMBOK = "addLombok"; @Test - public void readConfig() throws IOException { + void readConfig() throws IOException { // test quarkus-3 config String flavourConfigPath = String.format( "config/flavour-extra-config/%s-config.yml", FLAVOURTEST_1 ); try (InputStream is = ClassHelper.loadFromDefaultClassLoader( flavourConfigPath ) ) { FlavourExtraConfig configQuarkus3 = FlavourExtraConfigFacade.readConfigBlankDefault( is ); - Assert.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( PARAM_ADD_LOMBOK )).getAcceptOnly().contains( "true" ) ); + Assertions.assertTrue( ((ParamConfig)configQuarkus3.getParamConfig().get( PARAM_ADD_LOMBOK )).getAcceptOnly().contains( "true" ) ); } // test config does not exist try (InputStream is = ClassHelper.loadFromDefaultClassLoader( "config/flavour-extra-config/do-not-exist.yml" ) ) { FlavourExtraConfig configNotExists = FlavourExtraConfigFacade.readConfig( is ); - Assert.assertNull( configNotExists ); + Assertions.assertNull( configNotExists ); } } @Test - public void testCheckFlavourExtraConfig() throws NoSuchFieldException { + void testCheckFlavourExtraConfig() throws NoSuchFieldException { File projectFolder = new File( "target/test-flavour-extra-config" ); String groupId = "test-group"; String artifactId = "test-artifact"; @@ -53,12 +53,12 @@ public void testCheckFlavourExtraConfig() throws NoSuchFieldException { context.setAddLombok( Boolean.TRUE ); FlavourFacade.checkFlavourExtraConfig( context, flavour ); context.setAddLombok( Boolean.FALSE ); - Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfig( context, flavour ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfig( context, flavour ) ); String testFlavourVersion = "3.19.4"; String propertyFlavourVersion = "flavourVersion"; context.setFlavourVersion( testFlavourVersion ); Field fieldFlavourVersion = FlavourContext.class.getDeclaredField( propertyFlavourVersion ); - Assert.assertEquals( testFlavourVersion, FlavourFacade.readField( context, fieldFlavourVersion, propertyFlavourVersion ) ); + Assertions.assertEquals( testFlavourVersion, FlavourFacade.readField( context, fieldFlavourVersion, propertyFlavourVersion ) ); // check params FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, null, FLAVOURTEST_1, null ); FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, new ParamConfig(), FLAVOURTEST_1, null ); @@ -68,7 +68,7 @@ public void testCheckFlavourExtraConfig() throws NoSuchFieldException { pc.setAcceptOnly( Arrays.asList( Boolean.TRUE.toString() ) ); return pc; } ); - Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, paramConfig, FLAVOURTEST_1, BooleanUtils.BOOLEAN_FALSE ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavourExtraConfigParam( PARAM_ADD_LOMBOK, paramConfig, FLAVOURTEST_1, BooleanUtils.BOOLEAN_FALSE ) ); } } diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestInit.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestInit.java index f650a5dc6..eb8f4641e 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestInit.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestInit.java @@ -10,15 +10,15 @@ import org.fugerit.java.doc.project.facade.FlavourFacade; import org.fugerit.java.doc.project.facade.ModuleFacade; import org.fugerit.java.doc.project.facade.VenusContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.UUID; @Slf4j -public class TestInit { +class TestInit { private static final String FREEMARKER_NATIVE_AVAILABLE = "8.11.9"; @@ -56,16 +56,16 @@ public void execute() throws MojoExecutionException, MojoFailureException { } @Test - public void testMojoQuarkus3GradleGroovyAndKts() throws MojoExecutionException, MojoFailureException { + void testMojoQuarkus3GradleGroovyAndKts() throws MojoExecutionException, MojoFailureException { for ( String currentFlavour : Arrays.asList( FlavourFacade.FLAVOUR_QUARKUS_3_GRADLE, FlavourFacade.FLAVOUR_QUARKUS_3_GRADLE_KTS ) ) { File projectDir = this.initConfigWorker(currentFlavour); createMojoInit( projectDir, currentFlavour ).execute(); - Assert.assertTrue( projectDir.exists() ); + Assertions.assertTrue( projectDir.exists() ); } } @Test - public void testMojoInit() throws MojoExecutionException, MojoFailureException { + void testMojoInit() throws MojoExecutionException, MojoFailureException { for ( String currentFlavour : FlavourFacade.SUPPORTED_FLAVOURS ) { if ( FlavourFacade.isGradleKtsFlavour( currentFlavour ) ) { log.info( "skip gradle flavour {}", currentFlavour ); @@ -73,9 +73,9 @@ public void testMojoInit() throws MojoExecutionException, MojoFailureException { File projectDir = this.initConfigWorker(currentFlavour); MojoInit mojoInit = createMojoInit( projectDir, currentFlavour ); mojoInit.execute(); - Assert.assertTrue( projectDir.exists() ); - Assert.assertThrows( MojoFailureException.class, () -> mojoInit.execute() ); - Assert.assertThrows( MojoFailureException.class, () -> mojoInit.apply( () -> { + Assertions.assertTrue( projectDir.exists() ); + Assertions.assertThrows( MojoFailureException.class, () -> mojoInit.execute() ); + Assertions.assertThrows( MojoFailureException.class, () -> mojoInit.apply( () -> { if ( Boolean.TRUE ) { throw new ConfigException( "Scenario excetion" ); } @@ -85,30 +85,30 @@ public void testMojoInit() throws MojoExecutionException, MojoFailureException { } @Test - public void testFlavourContext() { + void testFlavourContext() { File testFile = new File( "target" ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( null, null, null, null, null, null ) ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, null, null, null, null, null ) ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id1", null, null, null, null ) ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id2", "artifact-id2", null, null, null ) ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id3", "artifact-id3", "1.0.0-SNAPSHOT", null, null ) ); - Assert.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id4", "artifact-id4", "2.0.0-SNAPSHOT", "21", null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( null, null, null, null, null, null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, null, null, null, null, null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id1", null, null, null, null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id2", "artifact-id2", null, null, null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id3", "artifact-id3", "1.0.0-SNAPSHOT", null, null ) ); + Assertions.assertThrows( NullPointerException.class, () -> new FlavourContext( testFile, "group-id4", "artifact-id4", "2.0.0-SNAPSHOT", "21", null ) ); FlavourContext context = new FlavourContext( testFile, "group-id5", "artifact-id5", "3.0.0-SNAPSHOT", "8", "unsupported" ); context.setAddLombok( Boolean.TRUE ); - Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.initProject( context ) ); - Assert.assertThrows( ConfigRuntimeException.class, () -> ModuleFacade.toModuleList( "base,freemarker,unsupported" ) ); - Assert.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_3 ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.initProject( context ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> ModuleFacade.toModuleList( "base,freemarker,unsupported" ) ); + Assertions.assertThrows( ConfigRuntimeException.class, () -> FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_3 ) ); FlavourFacade.checkFlavour( context, FlavourFacade.FLAVOUR_QUARKUS_2 ); FlavourContext contextQuarkus2 = new FlavourContext( testFile, "group-id5", "artifact-id5", "3.0.0-SNAPSHOT", "11", "unsupported" ); contextQuarkus2.setAddLombok( Boolean.TRUE ); FlavourFacade.checkFlavour( contextQuarkus2, FlavourFacade.FLAVOUR_QUARKUS_2 ); context.setFlavourVersion( "test" ); FlavourFacade.checkFlavourVersion( context, FlavourFacade.FLAVOUR_QUARKUS_2 ); - Assert.assertEquals( "test", context.getFlavourVersion() ); + Assertions.assertEquals( "test", context.getFlavourVersion() ); context.setVersion( VenusContext.VERSION_NA_FREEMARKER_NATIVE ); - Assert.assertFalse( context.isFreeMarkerNativeAvailable() ); + Assertions.assertFalse( context.isFreeMarkerNativeAvailable() ); context.setVersion( FREEMARKER_NATIVE_AVAILABLE ); - Assert.assertTrue( context.isFreeMarkerNativeAvailable() ); + Assertions.assertTrue( context.isFreeMarkerNativeAvailable() ); } } diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestMojoVerify.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestMojoVerify.java index e6c6ccc0c..6aa62f426 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestMojoVerify.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestMojoVerify.java @@ -5,10 +5,10 @@ import org.fugerit.java.core.function.SimpleValue; import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.maven.MojoVerify; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class TestMojoVerify { +class TestMojoVerify { private static final String PATH_OK = "src/test/resources/fj_doc_test/template"; @@ -20,7 +20,7 @@ public class TestMojoVerify { @Test - public void testMojoVerifyOk() throws MojoExecutionException, MojoFailureException { + void testMojoVerifyOk() throws MojoExecutionException, MojoFailureException { SimpleValue res = new SimpleValue<>( Boolean.FALSE ); MojoVerify mojoVerify = new MojoVerify() { @Override @@ -35,11 +35,11 @@ public void execute() throws MojoExecutionException, MojoFailureException { } }; mojoVerify.execute(); - Assert.assertTrue( res.getValue() ); + Assertions.assertTrue( res.getValue() ); } @Test - public void testMojoVerifyKo() throws MojoExecutionException, MojoFailureException { + void testMojoVerifyKo() throws MojoExecutionException, MojoFailureException { SimpleValue res = new SimpleValue<>( Boolean.FALSE ); MojoVerify mojoVerify = new MojoVerify() { @Override @@ -51,11 +51,11 @@ public void execute() throws MojoExecutionException, MojoFailureException { } }; mojoVerify.execute(); - Assert.assertTrue( res.getValue() ); + Assertions.assertTrue( res.getValue() ); } @Test - public void testMojoVerifyKoFail() { + void testMojoVerifyKoFail() { SimpleValue res = new SimpleValue<>( Boolean.FALSE ); MojoVerify mojoVerify = new MojoVerify() { @Override @@ -69,11 +69,11 @@ public void execute() throws MojoExecutionException, MojoFailureException { res.setValue( Boolean.TRUE ); } }; - Assert.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() ); + Assertions.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() ); } @Test - public void testMojoVerifyKoPathNoFolder() { + void testMojoVerifyKoPathNoFolder() { SimpleValue res = new SimpleValue<>( Boolean.FALSE ); MojoVerify mojoVerify = new MojoVerify() { @Override @@ -84,7 +84,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { res.setValue( Boolean.TRUE ); } }; - Assert.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() ); + Assertions.assertThrows( MojoFailureException.class, () -> mojoVerify.execute() ); } } diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVenusContext.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVenusContext.java index 91af0062a..fa11cc28b 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVenusContext.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVenusContext.java @@ -2,28 +2,28 @@ import lombok.extern.slf4j.Slf4j; import org.fugerit.java.doc.project.facade.VenusContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; @Slf4j -public class TestVenusContext { +class TestVenusContext { private static final File TARGET = new File( "target/" ); @Test - public void testVenusContext() { + void testVenusContext() { VenusContext context = new VenusContext( TARGET, VenusContext.VERSION_NA_FULL_PROCESS, "fj-doc-base" ); - Assert.assertNotNull( context.getTestResourcesFolder() ); - Assert.assertNotNull( context.getMainResourcesFolder() ); - Assert.assertFalse( context.isAsciidocFreemarkerHandlerAvailable() ); + Assertions.assertNotNull( context.getTestResourcesFolder() ); + Assertions.assertNotNull( context.getMainResourcesFolder() ); + Assertions.assertFalse( context.isAsciidocFreemarkerHandlerAvailable() ); } @Test - public void testAsciiDocCheck() { + void testAsciiDocCheck() { VenusContext context = new VenusContext( TARGET, "8.10.8", "fj-doc-base" ); - Assert.assertTrue( context.isAsciidocFreemarkerHandlerAvailable() ); + Assertions.assertTrue( context.isAsciidocFreemarkerHandlerAvailable() ); } } diff --git a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVersionCheck.java b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVersionCheck.java index 1615e5f23..fd0230139 100644 --- a/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVersionCheck.java +++ b/fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestVersionCheck.java @@ -3,25 +3,25 @@ import lombok.extern.slf4j.Slf4j; import org.fugerit.java.doc.project.facade.VenusContext; import org.fugerit.java.doc.project.facade.VersionCheck; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; @Slf4j -public class TestVersionCheck { +class TestVersionCheck { private static final String V_8_6_2 = "8.6.2"; @Test - public void testVersionCheck() { - Assert.assertTrue(VersionCheck.isMajorThan( V_8_6_2, "8.6.1-SNAPSHOT" )); - Assert.assertFalse(VersionCheck.isMajorThan( "8.5.1", "8.5.2" )); + void testVersionCheck() { + Assertions.assertTrue(VersionCheck.isMajorThan( V_8_6_2, "8.6.1-SNAPSHOT" )); + Assertions.assertFalse(VersionCheck.isMajorThan( "8.5.1", "8.5.2" )); VenusContext context = new VenusContext( new File( "target" ), V_8_6_2, "base" ); - Assert.assertFalse( context.isPreVersion862() ); + Assertions.assertFalse( context.isPreVersion862() ); log.info( "version from null to : {}", VersionCheck.findVersion( null ) ); log.info( "version from null to : {}", VersionCheck.findVersion( VersionCheck.LATEST ) ); - Assert.assertEquals( V_8_6_2, VersionCheck.findFromPropsFile( "maven/pom.properties" ) ); + Assertions.assertEquals( V_8_6_2, VersionCheck.findFromPropsFile( "maven/pom.properties" ) ); } }