From a6c79e54a87563e4f1289731c2d9899ed72bf83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sun, 26 Apr 2020 01:38:06 +0200
Subject: Tests run again.

---
 tests/entry.scm           |  6 ++----
 tests/recurrence-rule.scm |  4 ++--
 tests/recurring.scm       | 10 ++++------
 tests/rrule-parse.scm     |  4 ++--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/entry.scm b/tests/entry.scm
index dddcb99c..3ee23bd3 100644
--- a/tests/entry.scm
+++ b/tests/entry.scm
@@ -1,7 +1,5 @@
-(((parameters) calendar-files)
- ((vcomponent load) load-calendars)
- )
+(((vcomponent load) load-calendars))
 
-(test-assert (load-calendars calendar-files: (calendar-files)))
+(test-assert (load-calendars ))
 
 
diff --git a/tests/recurrence-rule.scm b/tests/recurrence-rule.scm
index 0edfc0a1..3ef9e1e3 100644
--- a/tests/recurrence-rule.scm
+++ b/tests/recurrence-rule.scm
@@ -4,11 +4,11 @@
 
 
 (test-equal
-    (make-recur-rule (freq 'DAILY) (wkst 'MO) (interval 1))
+    (make-recur-rule freq: 'DAILY wkst: 'MO interval: 1)
   (parse-recurrence-rule "FREQ=DAILY"))
 
 (test-equal
-    (make-recur-rule (freq 'WEEKLY) (wkst 'MO) (interval 1))
+    (make-recur-rule freq: 'WEEKLY wkst: 'MO interval: 1)
   (parse-recurrence-rule "FREQ=WEEKLY"))
 
 ;; TODO more tests
diff --git a/tests/recurring.scm b/tests/recurring.scm
index 0871d38d..024dad55 100644
--- a/tests/recurring.scm
+++ b/tests/recurring.scm
@@ -23,13 +23,11 @@ END:VEVENT"
 
 (test-equal "Generate First"
   (stream->list
-   (stream-take
-    5 (stream-map (extract 'DTSTART)
-                  (generate-recurrence-set ev))))
+   5 (stream-map (extract 'DTSTART)
+                 (generate-recurrence-set ev)))
   (stream->list
-   (stream-take
-    5 (day-stream
-       (attr ev 'DTSTART)))))
+   5 (day-stream
+      (attr ev 'DTSTART))))
 
 ;; We run the exact same thing a secound time, since I had an error with
 ;; that during development.
diff --git a/tests/rrule-parse.scm b/tests/rrule-parse.scm
index d7733310..84e7b6ce 100644
--- a/tests/rrule-parse.scm
+++ b/tests/rrule-parse.scm
@@ -2,10 +2,10 @@
   parse-recurrence-rule)
  ((vcomponent recurrence) make-recur-rule))
 
-(test-equal (make-recur-rule (freq 'HOURLY) (wkst 'MO) (interval 1))
+(test-equal (make-recur-rule freq: 'HOURLY wkst: 'MO interval: 1)
   (parse-recurrence-rule "FREQ=HOURLY"))
 
-(test-equal (make-recur-rule (freq 'HOURLY) (count 3) (interval 1) (wkst 'MO))
+(test-equal (make-recur-rule freq: 'HOURLY count: 3 interval: 1 wkst: 'MO)
     (parse-recurrence-rule "FREQ=HOURLY;COUNT=3"))
 
 ;;; TODO write tests for these cases
-- 
cgit v1.2.3