Add runDelayingException() helper function

Author: nsk90

kstatemachine/src/main/kotlin/ru/nsk/kstatemachine/InternalState.kt

@@ -37,14 +37,8 @@ internal fun InternalState.isNeighbor(state: IState) = parent?.states?.contains(
 internal fun InternalState.requireParent() = requireNotNull(internalParent) { "$this parent is not set" }
 
 internal fun InternalState.stateNotify(block: IState.Listener.() -> Unit) {
-    listeners.forEach {
-        try {
-            it.block()
-        } catch (e: Exception) {
-            val machine = machine as InternalStateMachine
-            machine.delayListenerException(e)
-        }
-    }
+    val machine = machine as InternalStateMachine
+    listeners.forEach { machine.runDelayingException { it.block() } }
 }
 
 internal fun <E : Event> InternalState.findTransitionsByEvent(event: E): List<InternalTransition<E>> {

kstatemachine/src/main/kotlin/ru/nsk/kstatemachine/InternalTransition.kt

@@ -8,12 +8,7 @@ interface InternalTransition<E : Event> : Transition<E> {
     fun produceTargetStateDirection(policy: TransitionDirectionProducerPolicy<E>): TransitionDirection
 }
 
-internal fun InternalTransition<*>.transitionNotify(block: Transition.Listener.() -> Unit) =
-    listeners.forEach {
-        try {
-            it.block()
-        } catch (e: Exception) {
-            val machine = sourceState.machine as InternalStateMachine
-            machine.delayListenerException(e)
-        }
-    }
+internal fun InternalTransition<*>.transitionNotify(block: Transition.Listener.() -> Unit) {
+    val machine = sourceState.machine as InternalStateMachine
+    listeners.forEach { machine.runDelayingException { it.block() } }
+}

kstatemachine/src/main/kotlin/ru/nsk/kstatemachine/StateMachineImpl.kt

@@ -192,11 +192,12 @@ internal class StateMachineImpl(name: String?, childMode: ChildMode, override va
 }
 
 internal fun InternalStateMachine.machineNotify(block: StateMachine.Listener.() -> Unit) {
-    machineListeners.forEach {
-        try {
-            it.block()
-        } catch (e: Exception) {
-            delayListenerException(e)
-        }
-    }
-}
+    machineListeners.forEach { runDelayingException { it.block() } }
+}
+
+internal fun InternalStateMachine.runDelayingException(block: () -> Unit) =
+    try {
+        block()
+    } catch (e: Exception) {
+        delayListenerException(e)
+    }

kstatemachine/src/test/kotlin/ru/nsk/kstatemachine/ChoiceStateTest.kt

@@ -1,5 +1,6 @@
 package ru.nsk.kstatemachine
 
+import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.StringSpec
 import io.mockk.verifySequence
 
@@ -45,17 +46,17 @@ class ChoiceStateTest : StringSpec({
         verifySequence { callbacks.onEntryState(State2) }
     }
 
-    "initial choice state" {
+    "initial choice state currently not supported" {
         val callbacks = mockkCallbacks()
 
-        createStateMachine {
-            val choice = choiceState("choice") { State2 }
-            setInitialState(choice)
+        shouldThrow<IllegalStateException> {
+            createStateMachine {
+                val choice = choiceState("choice") { State2 }
+                setInitialState(choice)
 
-            addState(State2) { callbacks.listen(this) }
+                addState(State2) { callbacks.listen(this) }
+            }
         }
-
-        verifySequence { callbacks.onEntryState(State2) }
     }
 }) {
     private object State1 : DefaultState()