2024.0.8

toronik · Aug 9, 2024 · dbd4596 · dbd4596
1 parent 236ff31
commit dbd4596
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/...e/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/ExamCommand.kt b/...e/src/main/java/io/github/adven27/concordion/extensions/exam/core/commands/ExamCommand.kt
@@ -53,9 +53,7 @@ abstract class ExamCommand<M, R>(
             }
             listener.executeCompleted(ExecuteEvent(commandCall.element))
         }.onFailure {
-            if (inBeforeExample(commandCall)) {
-                throw FailFastException("Failed before example", it)
-            } else throw it
+            if (inBeforeExample(commandCall)) throw FailFastException("Failed before example", it) else throw it
         }
     }
 

diff --git a/exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/DbPlugin.kt b/exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/DbPlugin.kt
@@ -6,10 +6,10 @@ import io.github.adven27.concordion.extensions.exam.core.ExamPlugin
 import io.github.adven27.concordion.extensions.exam.core.html.pre
 import io.github.adven27.concordion.extensions.exam.core.html.span
 import io.github.adven27.concordion.extensions.exam.db.commands.DbCleanCommand
-import io.github.adven27.concordion.extensions.exam.db.commands.set.DbSetCommand
 import io.github.adven27.concordion.extensions.exam.db.commands.DbShowCommand
 import io.github.adven27.concordion.extensions.exam.db.commands.ExamMatchersAwareValueComparer
 import io.github.adven27.concordion.extensions.exam.db.commands.check.DbCheckCommand
+import io.github.adven27.concordion.extensions.exam.db.commands.set.DbSetCommand
 import mu.KLogging
 import org.concordion.api.Command
 import org.concordion.api.Element

diff --git a/exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/DbTester.kt b/exam-db/src/main/java/io/github/adven27/concordion/extensions/exam/db/DbTester.kt
@@ -224,7 +224,11 @@ open class DbTester @JvmOverloads constructor(
                     sortedTable(actual.getTable(table), sortCols, dbUnitConfig.overrideRowSortingComparer),
                     columns(expectedTable, sortCols).toTypedArray()
                 )
-                expectedTable = sortedTable(CompositeTable(actualTable.tableMetaData, expectedTable), sortCols, dbUnitConfig.overrideRowSortingComparer)
+                expectedTable = sortedTable(
+                    table = CompositeTable(actualTable.tableMetaData, expectedTable),
+                    columns = sortCols,
+                    rowComparator = dbUnitConfig.overrideRowSortingComparer
+                )
                 if (compareOperation == CompareOperation.CONTAINS) {
                     actualTable = ContainsFilterTable(actualTable, expectedTable, excludeCols.toList())
                 }

diff --git a/...main/java/io/github/adven27/concordion/extensions/exam/db/commands/check/DbCheckParser.kt b/...main/java/io/github/adven27/concordion/extensions/exam/db/commands/check/DbCheckParser.kt
@@ -21,15 +21,15 @@ class DbCheckParser(val dbTester: DbTester) : DbCheckCommand.Parser, BaseParser(
                 ds = context[DS],
                 await = context.awaitConfig,
                 compareOperation = compareStrategy(context),
-                orderBy = orderBy(context),
+                orderBy = orderBy(context)
             )
 
             isBlock(context) -> DataSetExpectation(
                 buildDataSetFromBlock(dbTester, context.el, context.eval),
                 ds = context[DS],
                 await = context.awaitConfig,
                 compareOperation = compareStrategy(context),
-                orderBy = orderBy(context),
+                orderBy = orderBy(context)
             )
 
             isTable(context) -> TableExpectation(