agenda: When re-invoking a continuation at the agenda, don't wrap in a catch.

[8sync.git] / tests / test-actors.scm

diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 0a09adb07bc1d00ac8d5b38482da6874f088fd0c..73927cd9764e773327b6ab52f3ac0302e0fb29c0 100644 (file)
--- a/tests/test-actors.scm
+++ b/tests/test-actors.scm
@@ -18,7 +18,7 @@
 
 (define-module (tests test-actors)
   #:use-module (srfi srfi-64)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
   #:use-module (tests utils))
@@ -68,7 +68,7 @@
      (test-equal (getter test-message) (getter reread-message)))
    (list message-id message-to message-from message-action message-body
          message-in-reply-to message-wants-reply
-         (@@ (8sync systems actors) message-replied))))
+         (@@ (8sync actors) message-replied))))
 
 
 ;;; Test reply / autoreply
@@ -79,13 +79,13 @@
 
 (define* (antsy-caller-pester-rep actor message #:key who-to-call)
   (~display "customer> I'm calling customer service about this!\n")
-  (=> (first-reply #:key msg)
+  (msg-receive (first-reply #:key msg)
       (<-wait actor who-to-call 'field-call)
     (if (message-auto-reply? first-reply)
         (~display "customer> Whaaaaat?  I can't believe I got voice mail!\n")
         (begin
           (~format "*customer hears*: ~a\n" msg)
-          (=> (second-reply #:key *auto-reply*)
+          (msg-receive (second-reply #:key *auto-reply*)
               (<-reply-wait actor first-reply
                             #:msg "Yes, it didn't work, I'm VERY ANGRY!")
             (if (message-auto-reply? second-reply)
@@ -97,7 +97,7 @@
 
 (define (rep-field-call actor message)
   (~display "good-rep> Hm, another call from a customer...\n")
-  (=> (reply #:key msg)
+  (msg-receive (reply #:key msg)
       (<-reply-wait
        actor message
        #:msg "Have you tried turning it off and on?")
@@ -120,13 +120,13 @@
                     (list (bootstrap-message hive customer 'pester-rep
                                              #:who-to-call diligent-rep))))
            (displayed-text (get-output-string (%record-out))))
-      (test-equal displayed-text
-        "customer> I'm calling customer service about this!
+      (test-equal "customer> I'm calling customer service about this!
 good-rep> Hm, another call from a customer...
 *customer hears*: Have you tried turning it off and on?
 *rep hears*: Yes, it didn't work, I'm VERY ANGRY!
 good-rep> I'm sorry, that's all I can do for you.
-customer> Well then!  Harumph.\n")))
+customer> Well then!  Harumph.\n"
+        displayed-text)))
   ;; * Playing a tape of a lazy service rep *
   (parameterize ((%record-out (open-output-string)))
     (let* ((result (ez-run-hive
@@ -134,11 +134,10 @@ customer> Well then!  Harumph.\n")))
                     (list (bootstrap-message hive customer 'pester-rep
                                                   #:who-to-call lazy-rep))))
            (displayed-text (get-output-string (%record-out))))
-      (test-equal
-          displayed-text
-          "customer> I'm calling customer service about this!
+      (test-equal "customer> I'm calling customer service about this!
 lazy-rep> I'm not answering that.
-customer> Whaaaaat?  I can't believe I got voice mail!\n"))))
+customer> Whaaaaat?  I can't believe I got voice mail!\n"
+          displayed-text))))
 
 (test-end "test-actors")
 (test-exit)