actors: Implicit from-actor argument <-foo methods, and add rest of <-foo*.

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

diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 0a09adb07bc1d00ac8d5b38482da6874f088fd0c..54d8dbb46631975718d7bc342e3195a164793b27 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,14 +79,14 @@
 
 (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)
-      (<-wait actor who-to-call 'field-call)
+  (msg-receive (first-reply #:key msg)
+      (<-wait 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*)
-              (<-reply-wait actor first-reply
+          (msg-receive (second-reply #:key *auto-reply*)
+              (<-reply-wait first-reply
                             #:msg "Yes, it didn't work, I'm VERY ANGRY!")
             (if (message-auto-reply? second-reply)
                 (~display "customer> Well then!  Harumph.\n")
@@ -97,10 +97,8 @@
 
 (define (rep-field-call actor message)
   (~display "good-rep> Hm, another call from a customer...\n")
-  (=> (reply #:key msg)
-      (<-reply-wait
-       actor message
-       #:msg "Have you tried turning it off and on?")
+  (msg-receive (reply #:key msg)
+      (<-reply-wait message #:msg "Have you tried turning it off and on?")
     (~format "*rep hears*: ~a\n" msg)
     (~display "good-rep> I'm sorry, that's all I can do for you.\n")))
 
@@ -115,30 +113,71 @@
        (lazy-rep (hive-create-actor* hive <lazy-rep> "lazy-rep")))
   ;; * Playing a tape of a diligent service rep *
   (parameterize ((%record-out (open-output-string)))
-    (let* ((result (ez-run-hive
+    (let* ((result (run-hive
                     hive
                     (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
+    (let* ((result (run-hive
                     hive
                     (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))))
+
+\f
+;;; Cleanup tests
+
+(define-simple-actor <cleanly>
+  (*cleanup* test-call-cleanup))
+
+(define (test-call-cleanup actor message)
+  (speak "Hey, I'm cleanin' up here!\n"))
+
+(with-fresh-speaker
+ (let ((hive (make-hive)))
+   (hive-create-actor hive <cleanly>)
+   (run-hive hive '()))
+ (test-equal '("Hey, I'm cleanin' up here!\n")
+   (get-spoken)))
+
+;; won't work if we turn off #:cleanup though
+
+(with-fresh-speaker
+ (let ((hive (make-hive)))
+   (hive-create-actor hive <cleanly>)
+   (run-hive hive '() #:cleanup #f))
+ (test-equal '()
+   (get-spoken)))
+
+;; The exploder self-destructs, even though run-hive has cleanup
+;; disabled, because it cleans up on self-destruct.
+
+(define-simple-actor <exploder>
+  (explode (lambda (exploder message)
+             (speak "POOF\n")
+             (self-destruct exploder)))
+  (*cleanup* (lambda _ (speak "Cleaning up post-explosion\n"))))
+
+(with-fresh-speaker
+ (let ((hive (make-hive)))
+   (define exploder (hive-create-actor hive <exploder>))
+   (run-hive hive (list (bootstrap-message hive exploder 'explode))
+             #:cleanup #f))
+ (get-spoken))
+
 
 (test-end "test-actors")
 (test-exit)