From b9695ad23caa3e404d140eaa117abcd17a40b079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Wed, 13 Sep 2023 01:34:44 +0200
Subject: test fixes.

---
 tests/test/recurrence-simple.scm  | 70 ++++++++++++++++++++++-----------------
 tests/test/vcomponent-control.scm |  2 +-
 2 files changed, 41 insertions(+), 31 deletions(-)

(limited to 'tests/test')

diff --git a/tests/test/recurrence-simple.scm b/tests/test/recurrence-simple.scm
index 33900ceb..b0c3bdea 100644
--- a/tests/test/recurrence-simple.scm
+++ b/tests/test/recurrence-simple.scm
@@ -54,12 +54,13 @@
 ;;; also see the neighbour test file recurrence.scm for more tests.
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;VALUE=DATE:20190302
 RRULE:FREQ=DAILY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "Generate at all"
   (stream-car (generate-recurrence-set ev)))
@@ -90,113 +91,122 @@ END:VEVENT"
     (stream-take 5 (day-stream (prop ev 'DTSTART)))))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART:20190302T100000
 RRULE:FREQ=DAILY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "daily 10:00"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART:20190302T100000
 DTEND:20190302T120000
 RRULE:FREQ=DAILY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "daily 10-12"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART:20190302T100000
 DTEND:20190302T120000
 RRULE:FREQ=WEEKLY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "weekly 10-12"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;TZID=Europe/Stockholm:20190302T100000
 DTEND;TZID=Europe/Stockholm:20190302T120000
 RRULE:FREQ=WEEKLY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "weekly TZ 10-12"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;TZID=Europe/Stockholm:20190302T100000
 DTEND;TZID=Europe/Stockholm:20190302T120000
 RRULE:FREQ=WEEKLY
 SEQUENCE:1
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "weekly TZ SEQUENCE 10-12"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;TZID=Europe/Stockholm:20190302T100000
 RRULE:FREQ=WEEKLY
 DTEND;TZID=Europe/Stockholm:20190302T120000
 SEQUENCE:1
 LOCATION:Here
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "weekly TZ SEQUENCE LOCATION 10-12"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART:20180117T170000
 RRULE:FREQ=WEEKLY
 LOCATION:~
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "Just location"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;TZID=Europe/Stockholm:20180117T170000
 DTEND;TZID=Europe/Stockholm:20180117T200000
 RRULE:FREQ=WEEKLY
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 (test-assert "Same times"
   (stream-car (generate-recurrence-set ev)))
 
 (define ev
-  (call-with-input-string
-    "BEGIN:VEVENT
+  (car
+   (call-with-input-string
+       "BEGIN:VEVENT
 DTSTART;TZID=Europe/Stockholm:20180117T170000
 RRULE:FREQ=WEEKLY
 DTEND;TZID=Europe/Stockholm:20180117T200000
 SEQUENCE:1
 LOCATION:~
 END:VEVENT"
-    parse-calendar))
+     parse-calendar)))
 
 ;; errer in dtend ?
 
diff --git a/tests/test/vcomponent-control.scm b/tests/test/vcomponent-control.scm
index 6ab38996..cf6995bf 100644
--- a/tests/test/vcomponent-control.scm
+++ b/tests/test/vcomponent-control.scm
@@ -5,7 +5,7 @@
 (define-module (test vcomponent-control)
   :use-module (srfi srfi-64)
   :use-module (srfi srfi-88)
-  :use-module ((vcomponent create))
+  :use-module (vcomponent create)
   :use-module ((vcomponent util control)
                :select (with-replaced-properties))
   :use-module ((vcomponent formats ical parse)
-- 
cgit v1.2.3