From 817a1c8422c95c09fd00742ba0192d80f581b1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Wed, 29 Mar 2023 19:15:24 +0200 Subject: [PATCH] Fix member-record tests. --- member-fees.scm | 5 +++-- member-record.scm | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/member-fees.scm b/member-fees.scm index 0333d81..8f74eb4 100644 --- a/member-fees.scm +++ b/member-fees.scm @@ -59,8 +59,9 @@ (define (member-calendar mr . args) (let ((last-month (if (null? args) (*current-month*) - (car args)))) - (let loop ((cm (period-since (member-record-info mr 'member))) + (car args))) + (first-month (period-since (car (member-record-info mr 'member))))) + (let loop ((cm first-month) (cal '())) (if (month>? cm last-month) (reverse cal) diff --git a/member-record.scm b/member-record.scm index f824e15..604228e 100644 --- a/member-record.scm +++ b/member-record.scm @@ -346,26 +346,28 @@ '((highlights . ((123 "Interesting..." 0 info))))) (test-true member-destroyed? (parameterize ((*current-month* (list 2023 2))) - (member-destroyed? '((info . ((destroyed . "2010-05"))))))) + (member-destroyed? '((info . ((member . (((2010 1) (2010 5)))))))))) (test-false member-destroyed? (parameterize ((*current-month* (list 2009 2))) - (member-destroyed? '((info . ((destroyed . "2010-05"))))))) - (test-false member-destroyed? - (member-destroyed? '((info . ())))) + (member-destroyed? '((info . ((member . (((2001 1) (2010 5)))))))))) (test-false member-suspended? - (member-suspended? '((info . ())))) + (member-suspended? '((info . ((member . (((2015 1) #f)))))))) (test-true member-suspended? (parameterize ((*current-month* (list 2015 2))) - (member-suspended? '((info . ((suspend ((2010 1) (2022 4) #f #f)))))))) + (member-suspended? '((info . ((member . (((2015 1) #f))) + (suspend ((2010 1) (2022 4) #f #f)))))))) (test-true member-suspended? (parameterize ((*current-month* (list 2015 2))) - (member-suspended? '((info . ((suspend ((2010 1) #f #f #f)))))))) + (member-suspended? '((info . ((member . (((2015 1) #f))) + (suspend ((2010 1) #f #f #f)))))))) (test-false member-suspended? (parameterize ((*current-month* (list 2023 2))) - (member-suspended? '((info . ((suspend ((2010 1) (2022 4) #f #f)))))))) + (member-suspended? '((info . ((member . (((2015 1) #f))) + (suspend ((2010 1) (2022 4) #f #f)))))))) (test-true member-active? (parameterize ((*current-month* (list 2023 2))) - (member-active? '((info . ((suspend ((2010 1) (2022 4) #f #f)))))))) + (member-active? '((info . ((member . (((2015 1) #f))) + (suspend ((2010 1) (2022 4) #f #f)))))))) )) )