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 aad93b5a03e23dc9e3ddef7568b0626416042b9f..54d8dbb46631975718d7bc342e3195a164793b27 100644 (file)
--- a/tests/test-actors.scm
+++ b/tests/test-actors.scm
@@ -80,13 +80,13 @@
 (define* (antsy-caller-pester-rep actor message #:key who-to-call)
   (~display "customer> I'm calling customer service about this!\n")
   (msg-receive (first-reply #:key msg)
-      (<-wait actor who-to-call 'field-call)
+      (<-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)
           (msg-receive (second-reply #:key *auto-reply*)
-              (<-reply-wait actor first-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")
@@ -98,9 +98,7 @@
 (define (rep-field-call actor message)
   (~display "good-rep> Hm, another call from a customer...\n")
   (msg-receive (reply #:key msg)
-      (<-reply-wait
-       actor message
-       #:msg "Have you tried turning it off and on?")
+      (<-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")))
 
@@ -143,9 +141,9 @@ customer> Whaaaaat?  I can't believe I got voice mail!\n"
 ;;; Cleanup tests
 
 (define-simple-actor <cleanly>
-  (*clean-up* test-call-clean-up))
+  (*cleanup* test-call-cleanup))
 
-(define (test-call-clean-up actor message)
+(define (test-call-cleanup actor message)
   (speak "Hey, I'm cleanin' up here!\n"))
 
 (with-fresh-speaker
@@ -155,23 +153,29 @@ customer> Whaaaaat?  I can't believe I got voice mail!\n"
  (test-equal '("Hey, I'm cleanin' up here!\n")
    (get-spoken)))
 
-;; won't work if we turn off #:clean-up though
+;; won't work if we turn off #:cleanup 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")
+   (run-hive hive '() #:cleanup #f))
+ (test-equal '()
    (get-spoken)))
 
-;; The exploder self-destructs, even though run-hive has clean-up
+;; 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))
-             #:clean-up #f))
+             #:cleanup #f))
  (get-spoken))