X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-actors.scm;h=ea0324cd0bed6206be783a4e8755857c16b843b9;hb=1c7504b3ea4ead41410c660702eccf70b6556363;hp=6e59198cea7c51889dc6b79064be7157642f25f3;hpb=1b2a167532eb917c5a6384fd0029aa4365ba0d48;p=8sync.git

diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 6e59198..ea0324c 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
@@ -115,7 +115,7 @@
        (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))))
@@ -129,7 +129,7 @@ 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))))
@@ -139,5 +139,47 @@ lazy-rep> I'm not answering that.
 customer> Whaaaaat?  I can't believe I got voice mail!\n"
           displayed-text))))
 
+
+;;; 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)