Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	exam-core/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/EqCommand.kt
#	exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/commands/DbShowCommand.kt
#	exam-mq/src/main/java/io/github/adven27/concordion/extensions/exam/mq/commands/MqCheckRenderer.kt
#	exam-ws/src/main/java/io/github/adven27/concordion/extensions/exam/ws/HttpParser.kt
#	example/src/test/kotlin/specs/Specs.kt
#	example/src/test/resources/specs/MqCheckFailures.adoc
  • Loading branch information
toronik committed Feb 6, 2024
2 parents 4abc1e1 + 1bf5ddc commit 308e60b
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.concordion.internal.util.Check

open class EqCommand(val verifier: ContentVerifier) : AssertEqualsCommand() {
companion object : KLogging() {
fun objectToString(any: Any?): String = any?.toString() ?: "(null)"
fun objectToString(any: Any?): String = any?.toString() ?: "(null)"
}

override fun verify(command: CommandCall, eval: Evaluator, resultRecorder: ResultRecorder, fixture: Fixture) {
Expand Down
8 changes: 4 additions & 4 deletions example/src/test/resources/specs/Specs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
[.lead]
Extension for https://github.com/concordion/concordion/[Concordion BDD framework]

include::overview.adoc[]
// include::overview.adoc[]

include::plugin-core.adoc[]

'''

include::plugin-ws.adoc[]
// include::plugin-ws.adoc[]

'''

include::plugin-db.adoc[]
// include::plugin-db.adoc[]

'''

include::plugin-mq.adoc[]
// include::plugin-mq.adoc[]
14 changes: 14 additions & 0 deletions example/src/test/resources/specs/core-example.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,25 @@ include::core-example.adoc[tags=e]
.Before each example
****
[.given]
[e-db-set=ANDROIDS_TABLE]
|===
|===
Split the full name [e-execute=#result = split(#TEXT)]_Jane Smith_
****
.Dummy
====

.Ta
|===
|Header 1

|Column 1, row 1
|===


Result contains first name [e-eq=#result.first]_Jane_
and last name [e-eq=#result.second]_Smith_
====
Expand Down
20 changes: 10 additions & 10 deletions example/src/test/resources/specs/plugin-core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ Core commands enable abstract interactions and verifying capabilities.
- `<<e-example>>`
- `<<handlebars>>`
include::core-equals.adoc[]

include::core-set.adoc[]

include::core-execute.adoc[]

include::core-verify-rows.adoc[]

include::core-run-and-echo.adoc[]
// include::core-equals.adoc[]
//
// include::core-set.adoc[]
//
// include::core-execute.adoc[]
//
// include::core-verify-rows.adoc[]
//
// include::core-run-and-echo.adoc[]

include::core-example.adoc[]

include::core-handlebar.adoc[]
// include::core-handlebar.adoc[]
2 changes: 2 additions & 0 deletions example/src/test/resources/specs/plugin-mq.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ include::../data/mq/msg.json[]
//end::mq-check-custom[]
====

link:MqCheckFailures.adoc[How failures look like?, role=e-run]

=== e-mq-clean [[e-mq-clean]]

Cleans specified queues.
Expand Down

0 comments on commit 308e60b

Please sign in to comment.