1 files changed, 18 insertions, 15 deletions
diff --git a/tests/test/param.scm b/tests/test/param.scm
index 34f7b826..431a8f46 100644
--- a/tests/test/param.scm
+++ b/tests/test/param.scm
@@ -8,10 +8,10 @@
   :use-module (srfi srfi-64 test-error)
   :use-module (srfi srfi-88)
   :use-module ((vcomponent base)
-               :select (param prop* parameters prop))
+               :select (param prop* parameters prop vline?))
   :use-module ((vcomponent formats ical parse)
                :select (parse-calendar))
-  :use-module ((vcomponent) :select (make-vcomponent))
+  :use-module ((vcomponent) :select (vcomponent properties set-properties))
   :use-module ((hnh util) :select (sort* set!))
   :use-module ((ice-9 ports) :select (call-with-input-string))
   :use-module ((vcomponent formats xcal output)
@@ -23,11 +23,12 @@
 ;; TODO possibly change parsing
 
 (define v
-  (call-with-input-string
-    "BEGIN:DUMMY
+  (car
+   (call-with-input-string
+       "BEGIN:DUMMY
 X-KEY;A=1;B=2:Some text
 END:DUMMY"
-    parse-calendar))
+     parse-calendar)))
 
 (test-equal '("1") (param (prop* v 'X-KEY) 'A))
 
@@ -35,17 +36,20 @@ END:DUMMY"
 
 (test-equal #f (param (prop* v 'X-KEY) 'C))
 
-(test-equal
-  '(A B)
-  (sort* (map car (parameters (prop* v 'X-KEY)))
-         string<?
-         symbol->string))
+
+(test-group "Properties"
+ (let ((p (properties v)))
+   (test-assert (list? p))
+   (test-eqv 1 (length p))
+   (test-eq 'X-KEY (caar p))
+   (test-assert (vline? (cadar p)))))
+
 
 
 ;; TODO possibly move this.
 ;; Checks that a warning is properly raised for
 ;; unkonwn keys (without an X-prefix)
-(test-error
+(test-error "Ensure parse-calendar warns on unknown keys"
   'warning
   (call-with-input-string
     "BEGIN:DUMMY
@@ -54,10 +58,9 @@ END:DUMMY"
     parse-calendar))
 
 ;; Similar thing happens for sxcal, but during serialization instead
-(let ((component (make-vcomponent 'DUMMY)))
-  (set! (prop component 'KEY) "Anything")
+(let ((component (set-properties (vcomponent type: 'DUMMY)
+                                 (cons 'KEY "Anything"))))
+
   (test-error
     'warning
     (vcomponent->sxcal component)))
-
-