1 files changed, 41 insertions, 19 deletions
diff --git a/tests/vcomponent-formats-common-types.scm b/tests/test/vcomponent-formats-common-types.scm
index d9c80ff9..c8bfd323 100644
--- a/tests/vcomponent-formats-common-types.scm
+++ b/tests/test/vcomponent-formats-common-types.scm
@@ -1,6 +1,9 @@
-(((vcomponent formats common types)
-  get-parser)
- ((datetime) date time datetime))
+(define-module (test vcomponent-formats-common-types)
+  :use-module (srfi srfi-64)
+  :use-module (srfi srfi-88)
+  :use-module ((vcomponent formats common types)
+               :select (get-parser))
+  :use-module ((datetime) :select (date time datetime)))
 
 
 
@@ -18,23 +21,28 @@
 
 
 
-(define parse-cal-address (get-parser 'CAL-ADDRESS))
+(define parse-cal-address
+  (get-parser 'CAL-ADDRESS))
 
-(test-equal "Test uri is passthrough" 74 (parse-cal-address #f 74))
+(test-equal "Test uri is passthrough"
+  74 (parse-cal-address #f 74))
 
 
 
 (define parse-date (get-parser 'DATE))
 
-(test-equal #2021-12-02 (parse-date #f "20211202"))
+(test-equal
+  #2021-12-02
+  (parse-date #f "20211202"))
 ;; TODO negative test here
 
-
-
 (define parse-datetime (get-parser 'DATE-TIME))
 
-(test-equal #2021-12-02T10:20:30
-  (parse-datetime (make-hash-table) "20211202T102030"))
+(test-equal
+    #2021-12-02T10:20:30
+  (parse-datetime
+    (make-hash-table)
+    "20211202T102030"))
 
 ;; TODO tests with timezones here
 ;; TODO test -X-HNH-ORIGINAL here
@@ -63,19 +71,30 @@
 
 (define parse-integer (get-parser 'INTEGER))
 
-(test-equal "parse integer" 123456 (parse-integer #f "123456"))
-(test-equal "parse bigint" 123451234512345123456666123456
-            (parse-integer #f "123451234512345123456666123456"))
+(test-equal
+  "parse integer"
+  123456
+  (parse-integer #f "123456"))
+
+(test-equal
+  "parse bigint"
+  123451234512345123456666123456
+  (parse-integer
+    #f
+    "123451234512345123456666123456"))
 
 ;; TODO is this expected behaivour?
 (test-error 'warning (parse-integer #f "failure"))
 
 (test-error
- "Non-integers aren't integers"
- 'warning (parse-integer #f "1.1"))
+  "Non-integers aren't integers"
+  'warning
+  (parse-integer #f "1.1"))
 
-(test-equal "But exact floats are"
-  1.0 (parse-integer #f "1.0"))
+(test-equal
+  "But exact floats are"
+  1.0
+  (parse-integer #f "1.0"))
 
 
 
@@ -99,7 +118,9 @@
 
 (define parse-time (get-parser 'TIME))
 
-(test-equal #10:20:30 (parse-time #f "102030"))
+(test-equal
+  #10:20:30
+  (parse-time #f "102030"))
 ;; TODO negative test here
 
 
@@ -110,6 +131,7 @@
 
 
 
-(define parse-utc-offset (get-parser 'UTC-OFFSET))
+(define parse-utc-offset
+  (get-parser 'UTC-OFFSET))
 
 ;; TODO