X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tests.scm;h=0c5862431d63072a517fe3b547e4f92870baa6b0;hb=c02ea81e55c9ce946b0d3c132cc7d0a9f2f3e45f;hp=84bf8f35b32e3f1ae0b69e266622e09d1bdad3b4;hpb=b5470d453b613ffd7f639b48af9febcf57a92a70;p=8sync.git

diff --git a/tests.scm b/tests.scm
index 84bf8f3..0c58624 100644
--- a/tests.scm
+++ b/tests.scm
@@ -24,6 +24,22 @@
 (test-assert (not (time-< '(7 . 8) '(7 . 2))))
 (test-assert (not (time-< '(8 . 2) '(7 . 2))))
 
+(let ((tdelta (make-time-delta 8)))
+  (test-assert (time-delta? tdelta))
+  (test-eqv (time-delta-sec tdelta) 8)
+  (test-eqv (time-delta-usec tdelta) 0)
+  (test-equal
+      (time-+ '(2 . 3) tdelta)
+    '(10 . 3)))
+
+(let ((tdelta (make-time-delta 10 1)))
+  (test-assert (time-delta? tdelta))
+  (test-eqv (time-delta-sec tdelta) 10)
+  (test-eqv (time-delta-usec tdelta) 1)
+  (test-equal
+      (time-+ '(2 . 3) tdelta)
+    '(12 . 4)))
+
 
 
 ;;; Schedule tests
@@ -45,7 +61,7 @@
 (test-assert (schedule-empty? sched))
 
 ;; Add a segment at (10 . 0)
-(schedule-add! 10 a-proc sched)
+(schedule-add! sched 10 a-proc)
 (test-assert (not (schedule-empty? sched)))
 (test-equal (length (schedule-segments sched)) 1)
 (test-equal (time-segment-time (car (schedule-segments sched)))
@@ -62,7 +78,7 @@
                        '((10 . 0)))
 
 ;; Add another segment at (10 . 0)
-(schedule-add! '(10 . 0) b-proc sched)
+(schedule-add! sched '(10 . 0) b-proc)
 (test-assert (not (schedule-empty? sched)))
 (test-equal (length (schedule-segments sched)) 1)
 (test-equal (time-segment-time (car (schedule-segments sched)))
@@ -77,9 +93,9 @@
                        '((10 . 0)))
 
 ;; Add a segment to (11 . 0), (8 . 1) and (10 . 10)
-(schedule-add! 11 c-proc sched)
-(schedule-add! '(8 . 1) d-proc sched)
-(schedule-add! '(10 . 10) e-proc sched)
+(schedule-add! sched 11 c-proc)
+(schedule-add! sched '(8 . 1) d-proc)
+(schedule-add! sched '(10 . 10) e-proc)
 (test-assert (not (schedule-empty? sched)))
 (test-equal (length (schedule-segments sched)) 4)
 (assert-times-expected (schedule-segments sched)
@@ -134,7 +150,7 @@
 
 ;; Add one more and test flattening to a queue
 (test-assert (not (schedule-empty? sched)))
-(schedule-add! '(10 . 10) f-proc sched)
+(schedule-add! sched '(10 . 10) f-proc)
 (define remaining-segments
   (schedule-extract-until! sched '(9000 . 1)))
 (test-assert (schedule-empty? sched))
@@ -152,6 +168,78 @@
 
 ;; ... whew!
 
+;; Run/wrap request stuff
+;; ----------------------
+
+(let ((wrapped (wrap (+ 1 2))))
+  (test-assert (procedure? wrapped))
+  (test-equal (wrapped) 3))
+
+(let ((run-two-squared (run (lambda () (* 2 2)))))
+  (test-assert (run-request? run-two-squared))
+  (test-assert (procedure? (run-request-proc run-two-squared)))
+  (test-equal ((run-request-proc run-two-squared)) 4)
+  (test-eq (run-request-when run-two-squared) #f))
+
+(let ((run-two-squared (run (lambda () (* 2 2)) '(88 . 0))))
+  (test-assert (run-request? run-two-squared))
+  (test-assert (procedure? (run-request-proc run-two-squared)))
+  (test-equal ((run-request-proc run-two-squared)) 4)
+  (test-equal (run-request-when run-two-squared) '(88 . 0)))
+
+(let ((run-two-squared (run-wrap (* 2 2))))
+  (test-assert (run-request? run-two-squared))
+  (test-assert (procedure? (run-request-proc run-two-squared)))
+  (test-equal ((run-request-proc run-two-squared)) 4)
+  (test-eq (run-request-when run-two-squared) #f))
+
+(let ((run-two-squared (run-wrap-at (* 2 2) '(88 . 0))))
+  (test-assert (run-request? run-two-squared))
+  (test-assert (procedure? (run-request-proc run-two-squared)))
+  (test-equal ((run-request-proc run-two-squared)) 4)
+  (test-equal (run-request-when run-two-squared) '(88 . 0)))
+
+
+;;; Agenda tests
+;;; ------------
+
+;; helpers
+
+(define (speak-it)
+  (let ((messages '()))
+    (lambda* (#:optional message)
+      (if message (set! messages (append messages (list message))))
+      messages)))
+
+;; the dummy test
+
+(define speaker (speak-it))
+
+(define (dummy-func)
+  (speaker "I'm a dummy\n"))
+
+(define (run-dummy)
+  (speaker "I bet I can make you say you're a dummy!\n")
+  (run dummy-func))
+
+(let ((q (make-q)))
+  (set! speaker (speak-it))  ; reset the speaker
+  (enq! q run-dummy)
+  (start-agenda (make-agenda #:queue q)
+                (true-after-n-times 2))
+  (test-equal (speaker)
+    '("I bet I can make you say you're a dummy!\n"
+      "I'm a dummy\n")))
+
+;; should only do the first one after one round though
+(let ((q (make-q)))
+  (set! speaker (speak-it))  ; reset the speaker
+  (enq! q run-dummy)
+  (start-agenda (make-agenda #:queue q)
+                (true-after-n-times 1))
+  (test-equal (speaker)
+    '("I bet I can make you say you're a dummy!\n")))
+
 ;; End tests
 
 (test-end "tests")