X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests%2Ftest-agenda.scm;h=ef2c74f13abe7a6c20392f445fd78b6e97efe9a0;hb=5be4a76b4a1d667128042e5db7cd4621cb139340;hp=8975b3e3f1e28631088ef593da9d5445dc2539cb;hpb=a5e5d1a47b64ed41f98725b4592d7517d8db565d;p=8sync.git

diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm
index 8975b3e..ef2c74f 100644
--- a/tests/test-agenda.scm
+++ b/tests/test-agenda.scm
@@ -40,8 +40,25 @@
       messages)))
 
 
-;; Timer tests
-;; ===========
+;;; queue helpers
+;;; =============
+
+(define test-q (list->q '(1 2 3)))
+(test-equal (deq! test-q) 1)
+(test-equal (deq! test-q) 2)
+(test-equal (deq! test-q) 3)
+(test-assert (q-empty? test-q))
+
+(define test-q (make-q* 'apple 'banana 'carrot))
+(test-equal (deq! test-q) 'apple)
+(test-equal (deq! test-q) 'banana)
+(test-equal (deq! test-q) 'carrot)
+(test-assert (q-empty? test-q))
+
+
+
+;;; Timer tests
+;;; ===========
 
 (test-assert (time= '(1 . 1) '(1 . 1)))
 (test-assert (not (time= '(1 . 1) '(1 . 0))))
@@ -342,21 +359,34 @@
   (+ 1 2 (/ 1 0))
   (speaker "SHOULD NOT HAPPEN\n"))
 
-(define (local-func-gets-break)
+(define (indirection-remote-func-breaks)
+  (speaker "bebop\n")
+  (%8sync (%run (remote-func-breaks)))
+  (speaker "bidop\n"))
+
+(define* (local-func-gets-break #:key with-indirection)
   (speaker "Time for exception fun!\n")
   (let ((caught-exception #f))
-    (catch '%8sync-caught-error
-      (lambda ()
-        (%8sync (%run (remote-func-breaks))))
-      (lambda (_ orig-key orig-args orig-stack)
-        (set! caught-exception #t)
-        (speaker "in here now!\n")
-        (test-equal orig-key 'numerical-overflow)
-        (test-equal orig-args '("/" "Numerical overflow" #f #f))
-        (test-assert (stack? orig-stack)))))
-  (test-assert caught-exception)
+    (catch-8sync
+     (%8sync (%run (if with-indirection
+                       (indirection-remote-func-breaks)
+                       (remote-func-breaks))))
+      ('numerical-overflow
+       (lambda (orig-stacks . orig-args)
+         (set! caught-exception #t)
+         (speaker "in here now!\n")
+         (test-equal orig-args '("/" "Numerical overflow" #f #f))
+         (test-assert (list? orig-stacks))
+         (test-equal (length orig-stacks)
+                     (if with-indirection 2 1))
+         (for-each
+          (lambda (x)
+            (test-assert (stack? x)))
+          orig-stacks))))
+    (test-assert caught-exception))
   (speaker "Well that was fun :)\n"))
 
+
 (let ((q (make-q)))
   (set! speaker (speak-it))
   (enq! q local-func-gets-break)
@@ -368,9 +398,46 @@
                  "in here now!\n"
                  "Well that was fun :)\n")))
 
+(let ((q (make-q)))
+  (set! speaker (speak-it))
+  (enq! q (wrap (local-func-gets-break #:with-indirection #t)))
+  (start-agenda (make-agenda #:queue q)
+                #:stop-condition (true-after-n-times 10))
+  (test-assert (speaker)
+               '("Time for exception fun!\n"
+                 "bebop\n"
+                 "Here we go...\n"
+                 "in here now!\n"
+                 "Well that was fun :)\n")))
+
+;; Make sure catching tools work
+
+(let ((speaker (speak-it))
+      (catch-result #f))
+  (catch-8sync
+   (begin
+     (speaker "hello")
+     (throw '8sync-caught-error
+            'my-orig-key '(apple orange banana) '(*fake-stack* *fake-stack* *fake-stack*))
+     (speaker "no goodbyes"))
+   ('some-key
+    (lambda (stacks . rest)
+      (speaker "should not happen")))
+   ('my-orig-key
+    (lambda (stacks fruit1 fruit2 fruit3)
+      (set! catch-result
+            `((fruit1 ,fruit1)
+              (fruit2 ,fruit2)
+              (fruit3 ,fruit3))))))
+  (test-equal (speaker) '("hello"))
+  (test-equal catch-result '((fruit1 apple)
+                             (fruit2 orange)
+                             (fruit3 banana))))
+
 ;; End tests
 
 (test-end "test-agenda")
 
+;; @@: A better way to handle this at the repl?
 (test-exit)