diff --git a/fj-doc-base-kotlin/pom.xml b/fj-doc-base-kotlin/pom.xml index 629a2b351..eab91fed5 100644 --- a/fj-doc-base-kotlin/pom.xml +++ b/fj-doc-base-kotlin/pom.xml @@ -91,16 +91,9 @@ ${kotlin.version} - - junit - junit - test - - org.junit.jupiter junit-jupiter-api - ${junit-jupiter-api-version} test diff --git a/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/model/DocAltTest.kt b/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/model/DocAltTest.kt index 4275054a0..fbe79ae42 100644 --- a/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/model/DocAltTest.kt +++ b/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/model/DocAltTest.kt @@ -1,12 +1,12 @@ package test.org.fugerit.java.doc.base.kotlin.model -import junit.framework.TestCase import org.fugerit.java.core.cfg.ConfigRuntimeException import org.fugerit.java.doc.base.config.DocInput import org.fugerit.java.doc.base.config.DocOutput import org.fugerit.java.doc.base.kotlin.dsl.* import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandlerUTF8 import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test import org.slf4j.Logger import org.slf4j.LoggerFactory import java.io.ByteArrayOutputStream @@ -18,7 +18,7 @@ import javax.script.ScriptEngineManager /** * DocDsl testing. */ -class DocAltTest : TestCase() { +class DocAltTest { private val log: Logger = LoggerFactory.getLogger(this.javaClass) @@ -58,6 +58,7 @@ class DocAltTest : TestCase() { /** * testScriptCoverage */ + @Test fun testScriptCoverage() = arrayListOf( "src/test/resources/doc-dsl-sample/sample-2-coverage-a.kts", "src/test/resources/doc-dsl-sample/sample-2-coverage-b.kts", @@ -79,6 +80,7 @@ class DocAltTest : TestCase() { /** * testScript */ + @Test fun testScript() = Assertions.assertEquals( "http://javacoredoc.fugerit.org", testScriptWorker( "src/test/resources/doc-dsl-sample/sample-2.kts" ).attributes["xmlns"] @@ -95,6 +97,7 @@ class DocAltTest : TestCase() { /** * testScriptParams */ + @Test fun testScriptParams() = Assertions.assertEquals( "http://javacoredoc.fugerit.org", testScriptWorkerBind( "src/test/resources/doc-dsl-sample/sample-2-params.kts", true, params ).attributes["xmlns"] @@ -112,6 +115,7 @@ class DocAltTest : TestCase() { /** * testFail */ + @Test fun testFail() { val helper = HelperDSL() val textTag = HelperDSL.TextElement( "text" ) diff --git a/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/parse/TestKotlinParser.java b/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/parse/TestKotlinParser.java index 6338da066..e4623c6bc 100644 --- a/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/parse/TestKotlinParser.java +++ b/fj-doc-base-kotlin/src/test/java/test/org/fugerit/java/doc/base/kotlin/parse/TestKotlinParser.java @@ -14,8 +14,8 @@ import org.fugerit.java.doc.base.typehandler.markdown.SimpleMarkdownExtTypeHandler; import org.fugerit.java.script.helper.EvalScript; import org.fugerit.java.script.helper.EvalScriptWithDataModel; -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; @@ -24,13 +24,13 @@ import java.util.HashMap; import java.util.Map; -public class TestKotlinParser { +class TestKotlinParser { - public static final boolean VALID = true; - public static final boolean NOT_VALID = false; + static final boolean VALID = true; + static final boolean NOT_VALID = false; - public static final boolean NO_EXCEPTION = false; - public static final boolean EXCEPTION = true; + static final boolean NO_EXCEPTION = false; + static final boolean EXCEPTION = true; private static final Logger logger = LoggerFactory.getLogger( TestKotlinParser.class ); @@ -48,7 +48,7 @@ private boolean validateWorker( String path, boolean valid, boolean exception, b for ( String error : result.getInfoList() ) { logger.info( "Validation info {}", error ); } - Assert.assertEquals( "Validation result" , valid, result.isResultOk() ); + Assertions.assertEquals( valid, result.isResultOk() ); return result.isResultOk(); } } ); @@ -71,29 +71,29 @@ private boolean parseWorker( String path ) { } @Test - public void testValidate() { - Assert.assertTrue( this.validateWorker( "sample-2", true, false, false ) ); - Assert.assertTrue( this.validateWorker( "sample-2", true, false, true ) ); + void testValidate() { + Assertions.assertTrue( this.validateWorker( "sample-2", true, false, false ) ); + Assertions.assertTrue( this.validateWorker( "sample-2", true, false, true ) ); } @Test - public void testParse() { - Assert.assertTrue( this.parseWorker( "sample-2" ) ); - Assert.assertTrue( this.parseWorker( "sample-2-coverage" ) ); + void testParse() { + Assertions.assertTrue( this.parseWorker( "sample-2" ) ); + Assertions.assertTrue( this.parseWorker( "sample-2-coverage" ) ); } @Test - public void testDslDocToXml() throws IOException { + void testDslDocToXml() throws IOException { Map dataModel = new HashMap<>(); DocEvalWithDataModel eval = new DocKotlinParser(); try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "doc-dsl-sample/sample-2.kts" ) ) ) { String xml = eval.evalWithDataModel( reader, dataModel ); - Assert.assertNotNull( xml ); + Assertions.assertNotNull( xml ); } } @Test - public void testWithComplexDataModel() throws IOException { + void testWithComplexDataModel() throws IOException { Map dataModel = new HashMap<>(); dataModel.put( "docTitle", "Complex map conversion example title" ); dataModel.put( "listPeople", Arrays.asList(new People("Luthien", "Tinuviel", "Queen"), new People("Thorin", "Oakshield", "King"))); @@ -101,7 +101,7 @@ public void testWithComplexDataModel() throws IOException { try ( InputStreamReader reader = new InputStreamReader( ClassHelper.loadFromDefaultClassLoader( "doc-dsl-sample/sample-map.kts" ) ) ) { String xml = eval.handle( reader, dataModel ).toString(); logger.info( "xml : \n{}", xml ); - Assert.assertNotNull( xml ); + Assertions.assertNotNull( xml ); } }