Better structuring between webdav modules.

2 files changed, 46 insertions, 25 deletions

diff --git a/tests/unit/webdav/webdav-resource.scm b/tests/unit/webdav/webdav-resource.scm
new file mode 100644
index 00000000..73a434be
--- /dev/null
+++ b/tests/unit/webdav/webdav-resource.scm
@@ -0,0 +1,31 @@
+(define-module (test webdav-resource)
+  :use-module (srfi srfi-64)
+  :use-module (srfi srfi-64 test-error)
+  :use-module (srfi srfi-71)
+  :use-module (srfi srfi-88)
+  :use-module (calp webdav resource base))
+
+(test-group "string->href"
+  (test-equal "Root path becomes null"
+    '() (string->href "/"))
+  (test-equal "Trailing slashes are ignored"
+    '("a" "b") (string->href "/a/b/")))
+
+(test-group "href->string"
+  (test-equal "Null case becomes root path"
+    "/" (href->string '()))
+  (test-equal "Trailing slashes are not added"
+    "/a/b" (href->string '("a" "b"))))
+
+(test-group "href-relative"
+  (test-equal '("a" "b") (href-relative '() '("a" "b")))
+  (test-equal '("b") (href-relative '("a") '("a" "b")))
+  (test-equal '() (href-relative '("a" "b") '("a" "b")))
+
+  (test-error 'misc-error
+    (href-relative '("c") '("a" "b")))
+
+  (test-error 'misc-error
+    (href-relative '("c") '())))
+
+'((calp webdav resource base))
diff --git a/tests/unit/webdav/webdav-util.scm b/tests/unit/webdav/webdav-util.scm
index c4e16536..64c916ec 100644
--- a/tests/unit/webdav/webdav-util.scm
+++ b/tests/unit/webdav/webdav-util.scm
@@ -1,31 +1,21 @@
-(define-module (test webdav-util)
+(define-module (test webdav-test)
   :use-module (srfi srfi-64)
-  :use-module (srfi srfi-64 test-error)
   :use-module (srfi srfi-71)
   :use-module (srfi srfi-88)
-  :use-module (calp webdav resource base))
+  :use-module (web uri)
+  :use-module (calp webdav util)
+   )
 
-(test-group "string->href"
-  (test-equal "Root path becomes null"
-    '() (string->href "/"))
-  (test-equal "Trailing slashes are ignored"
-    '("a" "b") (string->href "/a/b/")))
+(test-equal "Parse-dav-line"
+  `(1 2 access-control ,(string->uri "http://example.com/uri"))
+  (parse-dav-line "1, 2, access-control, <http://example.com/uri>"))
 
-(test-group "href->string"
-  (test-equal "Null case becomes root path"
-    "/" (href->string '()))
-  (test-equal "Trailing slashes are not added"
-    "/a/b" (href->string '("a" "b"))))
+(test-equal "write-dav-line"
+  "1, 2, access-control, <http://example.com/uri>"
+  (call-with-output-string
+    (lambda (port)
+      (write-dav-line
+       `(1 2 access-control ,(string->uri "http://example.com/uri"))
+       port))))
 
-(test-group "href-relative"
-  (test-equal '("a" "b") (href-relative '() '("a" "b")))
-  (test-equal '("b") (href-relative '("a") '("a" "b")))
-  (test-equal '() (href-relative '("a" "b") '("a" "b")))
-
-  (test-error 'misc-error
-    (href-relative '("c") '("a" "b")))
-
-  (test-error 'misc-error
-    (href-relative '("c") '())))
-
-'((calp webdav resource base))
+'((calp webdav util))