Fix review comments

tillhub · Nov 21, 2024 · fa0102f · fa0102f
1 parent 74e9404
commit fa0102f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 42 deletions.
diff --git a/payment-engine/src/test/java/de/tillhub/paymentengine/ConnectionManagerTest.kt b/payment-engine/src/test/java/de/tillhub/paymentengine/ConnectionManagerTest.kt
@@ -8,6 +8,7 @@ import de.tillhub.paymentengine.data.Terminal
 import de.tillhub.paymentengine.data.TerminalOperationStatus
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
+import io.mockk.Ordering
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
@@ -52,60 +53,71 @@ class ConnectionManagerTest : FunSpec({
     test("startSPOSConnect by default terminal ") {
         target.startSPOSConnect()
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting)
+            connectContract.launch(Terminal.ZVT())
+        }
 
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting) }
-        verify { connectContract.launch(Terminal.ZVT()) }
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
     }
 
     test("startSPOSConnect by config name") {
         val terminal = Terminal.OPI()
         configs["opi"] = terminal
         target.startSPOSConnect("opi")
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting)
+            connectContract.launch(terminal)
+        }
 
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting) }
-        verify { connectContract.launch(terminal) }
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
     }
 
     test("startSPOSConnect by terminal") {
         val terminal = Terminal.SPOS()
         target.startSPOSConnect(terminal)
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting)
+            connectContract.launch(terminal)
+        }
 
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Connecting) }
-        verify { connectContract.launch(terminal) }
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Connecting
     }
 
     test("startSPOSDisconnect by default terminal ") {
         target.startSPOSDisconnect()
 
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting)
+            disconnectContract.launch(Terminal.ZVT())
+        }
         terminalState.value shouldBe TerminalOperationStatus.Pending.Disconnecting
-
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting) }
-        verify { disconnectContract.launch(Terminal.ZVT()) }
     }
 
     test("startSPOSDisconnect by config name") {
         val terminal = Terminal.OPI()
         configs["opi"] = terminal
         target.startSPOSDisconnect("opi")
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Disconnecting
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting)
+            disconnectContract.launch(terminal)
+        }
 
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting) }
-        verify { disconnectContract.launch(terminal) }
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Disconnecting
     }
 
     test("startSPOSDisconnect by terminal") {
         val terminal = Terminal.SPOS()
         target.startSPOSDisconnect(terminal)
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Disconnecting
+        verify(ordering = Ordering.ORDERED) {
+            terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting)
+            disconnectContract.launch(terminal)
+        }
 
-        verify { terminalState.tryEmit(TerminalOperationStatus.Pending.Disconnecting) }
-        verify { disconnectContract.launch(terminal) }
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Disconnecting
     }
 })
diff --git a/payment-engine/src/test/java/de/tillhub/paymentengine/PaymentManagerTest.kt b/payment-engine/src/test/java/de/tillhub/paymentengine/PaymentManagerTest.kt
@@ -53,8 +53,6 @@ class PaymentManagerTest : FunSpec({
 
         target.startPaymentTransaction(transactionId, amount, tip, currency)
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
-
         verify {
             paymentResultContract.launch(
                 match {
@@ -66,6 +64,8 @@ class PaymentManagerTest : FunSpec({
                 }
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
     }
 
     test("startPaymentTransaction with configName should launch payment result contract") {
@@ -78,8 +78,6 @@ class PaymentManagerTest : FunSpec({
 
         target.startPaymentTransaction(transactionId, amount, tip, currency, "opi")
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
-
         verify {
             paymentResultContract.launch(
                 match {
@@ -91,6 +89,8 @@ class PaymentManagerTest : FunSpec({
                 }
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
     }
 
     test("startPaymentTransaction with Terminal should launch payment result contract") {
@@ -102,8 +102,6 @@ class PaymentManagerTest : FunSpec({
 
         target.startPaymentTransaction(transactionId, amount, tip, currency, terminal)
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
-
         verify {
             paymentResultContract.launch(
                 match {
@@ -115,5 +113,7 @@ class PaymentManagerTest : FunSpec({
                 }
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Payment(amount, currency)
     }
 })
diff --git a/payment-engine/src/test/java/de/tillhub/paymentengine/ReconciliationManagerTest.kt b/payment-engine/src/test/java/de/tillhub/paymentengine/ReconciliationManagerTest.kt
@@ -40,9 +40,9 @@ class ReconciliationManagerTest : FunSpec({
     test("startReconciliation should use default config when no configName provided") {
         target.startReconciliation()
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
-
         verify { reconciliationContract.launch(Terminal.ZVT()) }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
     }
 
     test("startReconciliation with configName should and launch reconciliation contract") {
@@ -51,18 +51,18 @@ class ReconciliationManagerTest : FunSpec({
 
         target.startReconciliation(configName = "opi")
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
-
         verify { reconciliationContract.launch(terminal) }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
     }
 
     test("startReconciliation with custom Terminal should and launch reconciliation contract") {
         val customTerminal = Terminal.SPOS()
 
         target.startReconciliation(customTerminal)
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
-
         verify { reconciliationContract.launch(customTerminal) }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Reconciliation
     }
 })
diff --git a/payment-engine/src/test/java/de/tillhub/paymentengine/RefundManagerTest.kt b/payment-engine/src/test/java/de/tillhub/paymentengine/RefundManagerTest.kt
@@ -52,8 +52,6 @@ class RefundManagerTest : FunSpec({
             currency = currency
         )
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
-
         verify {
             refundContract.launch(
                 RefundRequest(
@@ -64,6 +62,8 @@ class RefundManagerTest : FunSpec({
                 )
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
     }
 
     test("startRefundTransaction with configName should launch refund contract") {
@@ -80,8 +80,6 @@ class RefundManagerTest : FunSpec({
             configName = "opi"
         )
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
-
         verify {
             refundContract.launch(
                 RefundRequest(
@@ -92,6 +90,8 @@ class RefundManagerTest : FunSpec({
                 )
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
     }
 
     test("startRefundTransaction with custom Terminal should launch refund contract") {
@@ -107,8 +107,6 @@ class RefundManagerTest : FunSpec({
             config = customTerminal
         )
 
-        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
-
         verify {
             refundContract.launch(
                 RefundRequest(
@@ -119,5 +117,7 @@ class RefundManagerTest : FunSpec({
                 )
             )
         }
+
+        terminalState.value shouldBe TerminalOperationStatus.Pending.Refund(amount, currency)
     }
 })
diff --git a/payment-engine/src/test/java/de/tillhub/paymentengine/ReversalManagerTest.kt b/payment-engine/src/test/java/de/tillhub/paymentengine/ReversalManagerTest.kt
@@ -55,8 +55,6 @@ class ReversalManagerTest : FunSpec({
             receiptNo = receiptNo
         )
 
-        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
-
         verify {
             reversalContract.launch(
                 ReversalRequest(
@@ -69,6 +67,8 @@ class ReversalManagerTest : FunSpec({
                 )
             )
         }
+
+        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
     }
 
     test("startReversalTransaction with configName should launch reversal contract") {
@@ -89,8 +89,6 @@ class ReversalManagerTest : FunSpec({
             receiptNo = receiptNo
         )
 
-        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
-
         verify {
             reversalContract.launch(
                 ReversalRequest(
@@ -103,6 +101,8 @@ class ReversalManagerTest : FunSpec({
                 )
             )
         }
+
+        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
     }
 
     test("startReversalTransaction custom Terminal should launch reversal contract") {
@@ -121,8 +121,6 @@ class ReversalManagerTest : FunSpec({
             receiptNo = receiptNo
         )
 
-        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
-
         verify {
             reversalContract.launch(
                 ReversalRequest(
@@ -135,5 +133,7 @@ class ReversalManagerTest : FunSpec({
                 )
             )
         }
+
+        transactionState.value shouldBe TerminalOperationStatus.Pending.Reversal(receiptNo)
     }
 })