Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit bfa59ed

Browse files
Adven27Adven27
committed
release 6.0.0-beta-9
1 parent da3e79d commit bfa59ed

File tree

26 files changed

+73
-59
lines changed

26 files changed

+73
-59
lines changed

‎build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.0'
3-
ext.ktor_version = '1.6.6'
4-
ext.exposed_version = '0.36.2'
5-
ext.restAssured_version = '4.4.0'
6-
ext.klogging_version = '2.0.11'
7-
ext.libVersion = '6.0.0-beta-8'
2+
ext.kotlin_version = '1.6.10'
3+
ext.ktor_version = '1.6.7'
4+
ext.exposed_version = '0.37.3'
5+
ext.restAssured_version = '4.5.0'
6+
ext.klogging_version = '2.1.21'
7+
ext.libVersion = '6.0.0-beta-9'
88
repositories {
99
mavenCentral()
1010
}
@@ -38,14 +38,14 @@ subprojects {
3838
compileKotlin {
3939
kotlinOptions {
4040
freeCompilerArgs = ['-Xjsr305=strict']
41-
jvmTarget = '1.8'
41+
jvmTarget = '11'
4242
}
4343
}
4444

4545
compileTestKotlin {
4646
kotlinOptions {
4747
freeCompilerArgs = ['-Xjsr305=strict']
48-
jvmTarget = '1.8'
48+
jvmTarget = '11'
4949
}
5050
}
5151

‎exam-core/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ apply from: "$rootDir/gradle/publish.gradle"
66

77
dependencies {
88
api 'org.awaitility:awaitility:4.1.1'
9-
api 'net.javacrumbs.json-unit:json-unit:2.28.0'
10-
api 'org.xmlunit:xmlunit-core:2.8.3'
9+
api 'net.javacrumbs.json-unit:json-unit:2.31.0'
10+
api 'org.xmlunit:xmlunit-core:2.9.0'
1111
api 'com.github.jknack:handlebars:4.3.0'
1212
api 'org.concordion:concordion:3.1.3'
1313
api "io.github.microutils:kotlin-logging:$klogging_version"
14-
implementation 'ch.qos.logback:logback-classic:1.2.7'
14+
implementation 'ch.qos.logback:logback-classic:1.2.10'
1515
implementation "io.rest-assured:rest-assured:$restAssured_version"
16-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
16+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
1717

1818
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
1919
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
2020
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
21-
testImplementation 'org.assertj:assertj-core:3.21.0'
21+
testImplementation 'org.assertj:assertj-core:3.22.0'
2222
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ open class JsonVerifier(private val configuration: Configuration) : ContentVerif
172172
override fun assertThat(expected: String, actual: String) {
173173
validate(actual)
174174
try {
175-
JsonAssert.assertJsonEquals(expected, actual, configuration)
175+
// set tolerance because of https://github.com/lukas-krecan/JsonUnit/issues/468
176+
JsonAssert.assertJsonEquals(expected, actual, configuration.withTolerance(0.0))
176177
} catch (ae: AssertionError) {
177178
throw ae
178179
} catch (e: Exception) {

‎exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/handlebars/misc/MiscHelpers.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ enum class MiscHelpers(
2525
getOr("""{{getOr var "default value"}}""", mapOf(), "default value", mapOf()) {
2626
override fun invoke(context: Any?, options: Options): Any? = context ?: options.param<String>(0)
2727
},
28+
map("""{{map key='value'}}""", mapOf(), mapOf("key" to "value"), mapOf()) {
29+
override fun invoke(context: Any?, options: Options): Any? = options.hash
30+
},
2831
NULL("{{NULL}}", emptyMap(), null) {
2932
override fun invoke(context: Any?, options: Options): Any? = null
3033
},

‎exam-core/src/main/resources/exam.xsd‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
<xs:attribute type="xs:string" name="datasets" use="required"/>
200200
<xs:attribute type="xs:string" name="dir" default="/data/db/"/>
201201
<xs:attribute type="xs:string" name="ds"/>
202+
<xs:attribute type="xs:string" name="vars" default="v1=1, v2={{now}}"/>
203+
<xs:attribute type="xs:string" name="varsSeparator" default=","/>
202204
<xs:attribute type="xs:string" name="debug"/>
203205
<xs:attribute ref="operation"/>
204206
</xs:complexType>
@@ -207,6 +209,8 @@
207209
<xs:attribute type="xs:string" name="dir" default="/data/db/"/>
208210
<xs:attribute type="xs:string" name="ds"/>
209211
<xs:attribute type="xs:string" name="orderBy" default="age, name"/>
212+
<xs:attribute type="xs:string" name="vars" default="v1=1, v2={{now}}"/>
213+
<xs:attribute type="xs:string" name="varsSeparator" default=","/>
210214
<xs:attribute type="xs:integer" name="awaitAtMostSec" default="4"/>
211215
<xs:attribute type="xs:integer" name="awaitPollDelayMillis" default="0"/>
212216
<xs:attribute type="xs:integer" name="awaitPollIntervalMillis" default="1000"/>

‎exam-db/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ dependencies {
88
api project(':exam-core')
99
api 'org.dbunit:dbunit:2.7.2'
1010
implementation 'org.postgresql:postgresql:42.3.1'
11-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.0'
11+
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1'
1212
}

‎exam-mq-rabbit/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ apply from: "$rootDir/gradle/publish.gradle"
66

77
dependencies {
88
api project(':exam-mq')
9-
implementation "com.rabbitmq:amqp-client:5.10.0"
9+
implementation "com.rabbitmq:amqp-client:5.14.1"
1010
}

‎exam-mq-redis/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ apply from: "$rootDir/gradle/publish.gradle"
66

77
dependencies {
88
api project(':exam-mq')
9-
api "redis.clients:jedis:3.3.0"
9+
api "redis.clients:jedis:4.1.0"
1010
}

‎exam-mq/src/main/java/io/github/adven27/concordion/extensions/exam/mq/MqCommands.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class MessageAttrs(root: Html, evaluator: Evaluator) {
4040
val from: FromAttrs = FromAttrs(root, evaluator, verifyAs ?: formatAs)
4141
val vars: VarsAttrs = VarsAttrs(root, evaluator)
4242
val headers: Map<String, String> = root.takeAwayAttr(HEADERS).attrToMap()
43+
val params: Map<String, String> = root.takeAwayAttr(PARAMS).attrToMap()
4344

4445
companion object {
4546
private const val VERIFY_AS = "verifyAs"

‎exam-mq/src/main/java/io/github/adven27/concordion/extensions/exam/mq/commands/QueueParsers.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ class HtmlQueueParser : QueueParser {
7373
private fun root(command: CommandCall) = command.element
7474

7575
private fun toMsg(msg: Element, evaluator: Evaluator) = with(MessageAttrs(Html(msg), evaluator)) {
76-
ParametrizedTypedMessage(from.contentType, from.content, headers)
76+
ParametrizedTypedMessage(
77+
from.contentType,
78+
from.content,
79+
headers.mapValues { evaluator.resolveNoType(it.value) },
80+
params.mapValues { evaluator.resolveNoType(it.value) }
81+
)
7782
}
7883
}

0 commit comments

Comments
 (0)