From b6d12e309b207c25de7873f658aa0f88ea77080c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 30 Dec 2019 02:11:38 +0100 Subject: Reworked tests. --- tests/rrule-parse.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'tests/rrule-parse.scm') diff --git a/tests/rrule-parse.scm b/tests/rrule-parse.scm index 7612afc8..d7733310 100644 --- a/tests/rrule-parse.scm +++ b/tests/rrule-parse.scm @@ -1,16 +1,11 @@ -(use-modules (vcomponent recurrence parse)) +(((vcomponent recurrence parse) + parse-recurrence-rule) + ((vcomponent recurrence) make-recur-rule)) -(define-syntax mkrule - (syntax-rules () - ((_ (key val) ...) - ((record-constructor (@@ (vcomponent recurrence internal) ) - (quote (key ...))) - (quote val) ...)))) - -(test-equal (mkrule (freq HOURLY) (wkst MO) (interval 1)) +(test-equal (make-recur-rule (freq 'HOURLY) (wkst 'MO) (interval 1)) (parse-recurrence-rule "FREQ=HOURLY")) -(test-equal (mkrule (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 @@ -20,7 +15,7 @@ ;; => #< freq: #< freq: #f until: #f count: #f interval: 1 bysecond: #f byminute: #f byhour: #f byday: #f bymonthday: #f byyearday: #f byweekno: #f bymonth: #f bysetpos: #f wkst: MO> until: #f count: 3 interval: 1 bysecond: #f byminute: #f byhour: #f byday: #f bymonthday: #f byyearday: #f byweekno: #f bymonth: #f bysetpos: #f wkst: MO> ;; ERR unfulfilled-constraint [ERR] doesn't fulfill constraint of type [FREQ], ignoring -(parse-recurrence-rule "FREQ=HOURLY;COUNT=err") +(test-error 'wrong-type-argument (parse-recurrence-rule "FREQ=HOURLY;COUNT=err")) ;; => #< freq: HOURLY until: #f count: #f interval: 1 ;; bysecond: #f byminute: #f byhour: #f byday: #f bymonthday: #f ;; byyearday: #f byweekno: #f bymonth: #f bysetpos: #f wkst: MO> -- cgit v1.2.3