release 6.0.0-alpha-1

Author: Adven27

README.md

@@ -21,15 +21,15 @@
 
 ```groovy
 // Typical microservices setup (Web API + DB + MQ) testing:
-testImplementation "io.github.adven27:exam-ms:6.0.0-bet-9"
+testImplementation "io.github.adven27:exam-ms:6.0.0-alpha-1"
 
 //same as:
-//testImplementation "io.github.adven27:exam-ws:6.0.0-bet-9"
-//testImplementation "io.github.adven27:exam-db:6.0.0-bet-9"
-//testImplementation "io.github.adven27:exam-mq:6.0.0-bet-9"
+//testImplementation "io.github.adven27:exam-ws:6.0.0-alpha-1"
+//testImplementation "io.github.adven27:exam-db:6.0.0-alpha-1"
+//testImplementation "io.github.adven27:exam-mq:6.0.0-alpha-1"
 
 // UI testing
-testImplementation "io.github.adven27:exam-ui:6.0.0-bet-9"
+testImplementation "io.github.adven27:exam-ui:6.0.0-alpha-1"
 ```
 ### 2) Use
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext.exposed_version = '0.37.3'
     ext.restAssured_version = '4.5.0'
     ext.klogging_version = '2.1.21'
-    ext.libVersion = '6.0.0-beta-9'
+    ext.libVersion = '6.0.0-alpha-1'
     repositories {
         mavenCentral()
     }

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/Content.kt

@@ -141,7 +141,7 @@ interface ContentVerifier {
     companion object : KLogging()
 }
 
-open class XmlVerifier(private val nodeMatcher: NodeMatcher) : ContentVerifier.Default("xml") {
+open class XmlVerifier(protected val nodeMatcher: NodeMatcher) : ContentVerifier.Default("xml") {
 
     @JvmOverloads
     constructor(configureNodeMatcher: (NodeMatcher) -> NodeMatcher = { it }) :
@@ -164,16 +164,15 @@ open class XmlVerifier(private val nodeMatcher: NodeMatcher) : ContentVerifier.D
 }
 
 @Suppress("TooGenericExceptionCaught")
-open class JsonVerifier(private val configuration: Configuration) : ContentVerifier.Default("json") {
+open class JsonVerifier(protected val configuration: Configuration) : ContentVerifier.Default("json") {
 
     @JvmOverloads
     constructor(configure: (Configuration) -> Configuration = { it }) : this(configure(ExamExtension.DEFAULT_JSON_UNIT_CFG))
 
     override fun assertThat(expected: String, actual: String) {
         validate(actual)
         try {
-            // set tolerance because of https://github.com/lukas-krecan/JsonUnit/issues/468
-            JsonAssert.assertJsonEquals(expected, actual, configuration.withTolerance(0.0))
+            JsonAssert.assertJsonEquals(expected, actual, configuration)
         } catch (ae: AssertionError) {
             throw ae
         } catch (e: Exception) {

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/ExamExtension.kt

@@ -70,24 +70,6 @@ class ExamExtension constructor(private vararg var plugins: ExamPlugin) : Concor
         return this
     }
 
-    @Suppress("unused")
-    fun withContentVerifiers(addContentVerifiers: Map<String, ContentVerifier>): ExamExtension {
-        CONTENT_VERIFIERS += addContentVerifiers
-        return this
-    }
-
-    @Suppress("unused")
-    fun withContentResolvers(addContentResolvers: Map<String, ContentResolver>): ExamExtension {
-        CONTENT_RESOLVERS += addContentResolvers
-        return this
-    }
-
-    @Suppress("unused")
-    fun withContentPrinters(addContentPrinters: Map<String, ContentPrinter>): ExamExtension {
-        CONTENT_PRINTERS += addContentPrinters
-        return this
-    }
-
     /**
      * All examples but failed will be collapsed
      */
@@ -212,31 +194,6 @@ class ExamExtension constructor(private vararg var plugins: ExamPlugin) : Concor
                     "Provide it via ExamExtension(...).withContentTypeConfigs(...) method."
             )
 
-        private val CONTENT_VERIFIERS: MutableMap<String, ContentVerifier> = mutableMapOf(
-            "json" to JsonVerifier(),
-            "xml" to XmlVerifier(),
-            "text" to ContentVerifier.Default("text"),
-        )
-
-        @JvmStatic
-        fun contentVerifier(type: String): ContentVerifier = CONTENT_VERIFIERS[type]
-            ?: throw IllegalStateException(
-                "Content verifier for type '$type' not found. " +
-                    "Provide it via ExamExtension(...).withContentVerifiers(...) method."
-            )
-
-        private val CONTENT_RESOLVERS: MutableMap<String, ContentResolver> = mutableMapOf(
-            "json" to JsonResolver(),
-            "xml" to XmlResolver(),
-            "text" to JsonResolver(),
-        )
-
-        private val CONTENT_PRINTERS: MutableMap<String, ContentPrinter> = mutableMapOf(
-            "json" to JsonPrinter(),
-            "xml" to XmlPrinter(),
-            "text" to ContentPrinter.AsIs(),
-        )
-
         @JvmStatic
         fun prettyXml(text: String) = text.prettyXml()
 

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/ExamCommand.kt

@@ -19,15 +19,13 @@ import org.awaitility.core.ConditionFactory
 import org.concordion.api.AbstractCommand
 import org.concordion.api.Command
 import org.concordion.api.CommandCall
-import org.concordion.api.Element
 import org.concordion.api.Evaluator
 import org.concordion.api.Fixture
 import org.concordion.api.ResultRecorder
 import org.concordion.api.listener.ExecuteEvent
 import org.concordion.api.listener.ExecuteListener
 import org.concordion.internal.CatchAllExpectationChecker.normalize
 import org.concordion.internal.command.AssertEqualsCommand
-import org.concordion.internal.util.Announcer
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.util.concurrent.TimeUnit.SECONDS
 
@@ -55,7 +53,7 @@ open class ExamCommand(
     name: String,
     override val tag: String
 ) : BeforeParseExamCommand, BaseExamCommand(name) {
-    private val listeners = Announcer.to(ExecuteListener::class.java)
+    private val listener = ExecuteListener {}
 
     override fun execute(
         commandCall: CommandCall,
@@ -64,11 +62,8 @@ open class ExamCommand(
         fixture: Fixture
     ) {
         commandCall.children.processSequentially(evaluator, resultRecorder, fixture)
-        announceExecuteCompleted(commandCall.element)
+        listener.executeCompleted(ExecuteEvent(commandCall.element))
     }
-
-    private fun announceExecuteCompleted(element: Element) =
-        listeners.announce().executeCompleted(ExecuteEvent(element))
 }
 
 open class ExamAssertEqualsCommand(

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/handlebars/matchers/MatcherHelpers.kt

@@ -5,6 +5,7 @@ import com.github.jknack.handlebars.Options
 import io.github.adven27.concordion.extensions.exam.core.handlebars.ExamHelper
 import io.github.adven27.concordion.extensions.exam.core.handlebars.HB_RESULT
 import io.github.adven27.concordion.extensions.exam.core.utils.DateWithin.Companion.PARAMS_SEPARATOR
+import io.github.adven27.concordion.extensions.exam.core.utils.asString
 import org.concordion.api.Evaluator
 import java.util.regex.Pattern
 
@@ -165,7 +166,7 @@ enum class MatcherHelpers(
         expected = "\${json-unit.matches:after}2000-01-31T23:59:59.000"
     ) {
         override fun invoke(context: Any?, options: Options): Any =
-            "\${${placeholderType(options.context)}-unit.matches:$name}$context"
+            "\${${placeholderType(options.context)}-unit.matches:$name}${context!!.asString()}"
     },
     before(
         example = "{{before '2000-01-31T23:59:59.000'}}",

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/json/DefaultObjectMapperProvider.kt

@@ -14,7 +14,8 @@ open class DefaultObjectMapperProvider : Jackson2ObjectMapperProvider {
         configure(WRITE_BIGDECIMAL_AS_PLAIN, true)
     }
     private val lenientMapper: ObjectMapper = ObjectMapper().apply {
-        configure(ALLOW_UNQUOTED_FIELD_NAMES, true)
+        configure(USE_BIG_DECIMAL_FOR_FLOATS, true)
+        configure(WRITE_BIGDECIMAL_AS_PLAIN, true)
         configure(ALLOW_UNQUOTED_FIELD_NAMES, true)
         configure(ALLOW_COMMENTS, true)
         configure(ALLOW_SINGLE_QUOTES, true)

exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/utils/DateMatchers.kt

@@ -163,3 +163,8 @@ fun date(item: Any, pattern: String? = null): ZonedDateTime = when (item) {
     is Date -> item.toZonedDateTime()
     else -> item.toString().parseDate(pattern).toZonedDateTime()
 }
+
+fun Any.asString(): String = when (this) {
+    is Date -> toZonedDateTime().toString()
+    else -> toString()
+}

exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/DataSetCommands.kt

@@ -20,10 +20,8 @@ import org.concordion.api.Fixture
 import org.concordion.api.Result
 import org.concordion.api.Result.FAILURE
 import org.concordion.api.ResultRecorder
-import org.concordion.api.listener.AssertEqualsListener
 import org.concordion.api.listener.AssertFailureEvent
 import org.concordion.api.listener.AssertSuccessEvent
-import org.concordion.internal.util.Announcer
 import org.dbunit.assertion.DbComparisonFailure
 import org.dbunit.assertion.Difference
 import org.dbunit.dataset.ITable
@@ -87,11 +85,7 @@ class DataSetExecuteCommand(
 @Suppress("TooManyFunctions")
 class DataSetVerifyCommand(name: String, tag: String, val dbTester: DbTester, var valuePrinter: DbPlugin.ValuePrinter) :
     ExamCommand(name, tag) {
-    private val listeners = Announcer.to(AssertEqualsListener::class.java)
-
-    init {
-        listeners.addListener(DbResultRenderer())
-    }
+    private val listener = DbResultRenderer()
 
     override fun verify(
         commandCall: CommandCall,
@@ -213,13 +207,13 @@ class DataSetVerifyCommand(name: String, tag: String, val dbTester: DbTester, va
 
     private fun failure(resultRecorder: ResultRecorder, html: Html, actual: Any?, expected: String): Html {
         resultRecorder.record(FAILURE)
-        listeners.announce().failureReported(AssertFailureEvent(html.el, expected, actual))
+        listener.failureReported(AssertFailureEvent(html.el, expected, actual))
         return html
     }
 
     private fun success(resultRecorder: ResultRecorder, html: Html): Html {
         resultRecorder.record(Result.SUCCESS)
-        listeners.announce().successReported(AssertSuccessEvent(html.el))
+        listener.successReported(AssertSuccessEvent(html.el))
         return html
     }
 

exam-ws/src/main/java/io/github/adven27/concordion/extensions/exam/ws/WsPlugin.kt

@@ -1,16 +1,9 @@
 package io.github.adven27.concordion.extensions.exam.ws
 
 import com.github.jknack.handlebars.Options
-import io.github.adven27.concordion.extensions.exam.core.ContentPrinter
 import io.github.adven27.concordion.extensions.exam.core.ContentTypeConfig
-import io.github.adven27.concordion.extensions.exam.core.ContentVerifier
+import io.github.adven27.concordion.extensions.exam.core.ExamExtension.Companion.contentTypeConfig
 import io.github.adven27.concordion.extensions.exam.core.ExamPlugin
-import io.github.adven27.concordion.extensions.exam.core.JsonPrinter
-import io.github.adven27.concordion.extensions.exam.core.JsonResolver
-import io.github.adven27.concordion.extensions.exam.core.JsonVerifier
-import io.github.adven27.concordion.extensions.exam.core.XmlPrinter
-import io.github.adven27.concordion.extensions.exam.core.XmlResolver
-import io.github.adven27.concordion.extensions.exam.core.XmlVerifier
 import io.github.adven27.concordion.extensions.exam.core.commands.ExamCommand
 import io.github.adven27.concordion.extensions.exam.core.handlebars.ExamHelper
 import io.github.adven27.concordion.extensions.exam.core.handlebars.HANDLEBARS
@@ -34,9 +27,9 @@ class WsPlugin @JvmOverloads constructor(
     constructor(withBasePath: String, withPort: Int) : this(basePath = withBasePath, port = withPort)
 
     private val contentTypeConfigs: MutableMap<ContentType, ContentTypeConfig> = mutableMapOf(
-        ContentType.JSON to ContentTypeConfig(JsonResolver(), JsonVerifier(), JsonPrinter()),
-        ContentType.XML to ContentTypeConfig(XmlResolver(), XmlVerifier(), XmlPrinter()),
-        ContentType.TEXT to ContentTypeConfig(JsonResolver(), ContentVerifier.Default("text"), ContentPrinter.AsIs()),
+        ContentType.JSON to contentTypeConfig("json"),
+        ContentType.XML to contentTypeConfig("xml"),
+        ContentType.TEXT to contentTypeConfig("text"),
     )
 
     init {