From 720d1f433e0fed0ee48cbebdb8f995e5d5fc7405 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 13 May 2019 20:45:49 +0200
Subject: bug: Replace initial behavior after starting coroutine

This change fixes the bug where suspending immediately after launching
the coroutine, without replacing the current behavior causes a failure
in the BehaviorInterpreter. This is because the initial behavior was not
properly set.
---
 .../main/kotlin/com/atlarge/odcsim/internal/Coroutines.kt |  4 +++-
 .../src/test/kotlin/com/atlarge/odcsim/CoroutinesTest.kt  | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'odcsim-core')

diff --git a/odcsim-core/src/main/kotlin/com/atlarge/odcsim/internal/Coroutines.kt b/odcsim-core/src/main/kotlin/com/atlarge/odcsim/internal/Coroutines.kt
index f9e8de00..82b29715 100644
--- a/odcsim-core/src/main/kotlin/com/atlarge/odcsim/internal/Coroutines.kt
+++ b/odcsim-core/src/main/kotlin/com/atlarge/odcsim/internal/Coroutines.kt
@@ -35,6 +35,7 @@ import com.atlarge.odcsim.Signal
 import com.atlarge.odcsim.coroutines.SuspendingActorContext
 import com.atlarge.odcsim.coroutines.SuspendingBehavior
 import com.atlarge.odcsim.coroutines.suspendWithBehavior
+import com.atlarge.odcsim.empty
 import com.atlarge.odcsim.receiveMessage
 import com.atlarge.odcsim.receiveSignal
 import org.slf4j.Logger
@@ -151,7 +152,8 @@ internal class SuspendingBehaviorImpl<T : Any>(
      */
     internal fun start(): Behavior<T> {
         val behavior = interpreter.behavior as SuspendingBehavior<T>
-        val block: suspend () -> Behavior<T> = { behavior(this) }
+        val block = suspend { behavior(this) }
+        interpreter.become(actorContext, empty())
         block.startCoroutine(SuspendingBehaviorImplContinuation())
         return next
     }
diff --git a/odcsim-core/src/test/kotlin/com/atlarge/odcsim/CoroutinesTest.kt b/odcsim-core/src/test/kotlin/com/atlarge/odcsim/CoroutinesTest.kt
index 98486149..d057024c 100644
--- a/odcsim-core/src/test/kotlin/com/atlarge/odcsim/CoroutinesTest.kt
+++ b/odcsim-core/src/test/kotlin/com/atlarge/odcsim/CoroutinesTest.kt
@@ -32,19 +32,32 @@ import com.nhaarman.mockitokotlin2.mock
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
+import kotlin.coroutines.suspendCoroutine
 
 /**
  * Test suite for [SuspendingBehavior] using Kotlin Coroutines.
  */
 @DisplayName("Coroutines")
 internal class CoroutinesTest {
-    private val ctx = mock<ActorContext<Nothing>>()
 
     @Test
     fun `should immediately return new behavior`() {
+        val ctx = mock<ActorContext<Nothing>>()
         val behavior = suspending<Nothing> { empty() }
         val interpreter = BehaviorInterpreter(behavior)
         interpreter.start(ctx)
         assertTrue(interpreter.behavior as Behavior<*> is EmptyBehavior)
     }
+
+    @Test
+    fun `should be able to invoke regular suspend methods`() {
+        val ctx = mock<ActorContext<Unit>>()
+        val behavior = suspending<Unit> {
+            suspendCoroutine<Unit> { cont -> }
+            stopped()
+        }
+        val interpreter = BehaviorInterpreter(behavior)
+        interpreter.start(ctx)
+        interpreter.interpretMessage(ctx, Unit)
+    }
 }
-- 
cgit v1.2.3