X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=tests%2Ftest-actors.scm;h=aad93b5a03e23dc9e3ddef7568b0626416042b9f;hp=3fc69c45c9eea8da5692fae14b304058e912d743;hb=17830fd9912894b6a30a5c4a4a83722a74c01ccd;hpb=fa0943293ac36efeb2d718f856bd7445c5667ff2

diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 3fc69c4..aad93b5 100644
--- 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")
-  (msg-recieve (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)
-          (msg-recieve (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")
-  (msg-recieve (reply #:key msg)
+  (msg-receive (reply #:key msg)
       (<-reply-wait
        actor message
        #:msg "Have you tried turning it off and on?")
@@ -115,30 +115,65 @@
        (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))))
+
+
+;;; Cleanup tests
+
+(define-simple-actor <cleanly>
+  (*clean-up* test-call-clean-up))
+
+(define (test-call-clean-up 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 #:clean-up though
+
+(with-fresh-speaker
+ (let ((hive (make-hive)))
+   (hive-create-actor hive <cleanly>)
+   (run-hive hive '() #:clean-up #f))
+ (test-equal '("Hey, I'm cleanin' up here!\n")
+   (get-spoken)))
+
+;; The exploder self-destructs, even though run-hive has clean-up
+;; disabled, because it cleans up on self-destruct.
+
+(with-fresh-speaker
+ (let ((hive (make-hive)))
+   (define exploder (hive-create-actor hive <exploder>))
+   (run-hive hive (list (bootstrap-message hive exploder 'explode))
+             #:clean-up #f))
+ (get-spoken))
+
 
 (test-end "test-actors")
 (test-exit)