Content API: use GOOPS for the cache

1 files changed, 26 insertions, 24 deletions

diff --git a/tests/crud.scm b/tests/crud.scm
index fa33138..da3637a 100644
--- a/tests/crud.scm
+++ b/tests/crud.scm
@@ -1,4 +1,4 @@
-;; webid-oidc, implementation of the Solid specification
+;; disfluid, implementation of the Solid specification
 ;; Copyright (C) 2020, 2021  Vivien Kraus
 
 ;; This program is free software: you can redistribute it and/or modify
@@ -14,23 +14,26 @@
 ;; You should have received a copy of the GNU Affero General Public License
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-(use-modules (webid-oidc server create)
-             (webid-oidc server read)
-             (webid-oidc server update)
-             (webid-oidc server delete)
-             (webid-oidc server resource content)
-             (webid-oidc server resource path)
-             (webid-oidc errors)
-             (webid-oidc testing)
-             ((webid-oidc parameters) #:prefix p:)
-             (webid-oidc fetch)
-             (webid-oidc rdf-index)
-             (web http)
-             (web request)
-             (web response)
-             (web uri)
-             (ice-9 receive)
-             (rnrs bytevectors))
+(define-module (tests crud)
+  #:use-module (webid-oidc server create)
+  #:use-module ((webid-oidc server read) #:prefix server:)
+  #:use-module (webid-oidc server update)
+  #:use-module ((webid-oidc server delete) #:prefix server:)
+  #:use-module (webid-oidc server resource content)
+  #:use-module (webid-oidc server resource path)
+  #:use-module (webid-oidc errors)
+  #:use-module (webid-oidc testing)
+  #:use-module ((webid-oidc parameters) #:prefix p:)
+  #:use-module (webid-oidc fetch)
+  #:use-module (webid-oidc rdf-index)
+  #:use-module (web http)
+  #:use-module (web request)
+  #:use-module (web response)
+  #:use-module (web uri)
+  #:use-module (ice-9 receive)
+  #:use-module (rnrs bytevectors)
+  #:duplicates (merge-generics)
+  #:declarative? #t)
 
 (with-test-environment
  "crud"
@@ -115,7 +118,7 @@
           #:unwind-for-type &path-is-auxiliary))
       '(".acl" ".meta"))
      ;; READ
-     (receive (headers-root root) (read server-name owner owner "/")
+     (receive (headers-root root) (server:read server-name owner owner "/")
        ;; For root, we’re looking for the following headers:
        ;; - link: ldp:BasicContainer; rel = "type", </.acl>; rel = "acl", pim:Storage; rel = "type", owner; rel = "solid:owner"
        ;; - allow: GET, HEAD, OPTIONS, PUT, POST, but not DELETE
@@ -170,7 +173,7 @@
                                     "http://www.w3.org/ns/ldp#contains"
                                     "https://example.com/inbox/"))
               (exit 16))))))
-     (receive (headers-/.acl /.acl) (read server-name owner owner "/.acl")
+     (receive (headers-/.acl /.acl) (server:read server-name owner owner "/.acl")
        ;; The ACL has the following headers:
        ;; - allow: GET, HEAD, OPTIONS, PUT, DELETE, but not POST
        ;; - accept-put: 'text/turtle
@@ -255,11 +258,10 @@
 "))
        (update server-name owner owner "/inbox/" #f #f 'text/turtle exact-content)
        (receive (headers content)
-           (read server-name owner owner "/inbox/")
+           (server:read server-name owner owner "/inbox/")
          (when (bytevector? content)
            (set! content (utf8->string content)))
          (when (equal? content exact-content)
            (exit 25))))
-     (delete server-name owner owner "/inbox/test-notifications/welcome" #f #f)
-     (delete server-name owner owner "/inbox/test-notifications" #f #f))))
-            
+     (server:delete server-name owner owner "/inbox/test-notifications/welcome" #f #f)
+     (server:delete server-name owner owner "/inbox/test-notifications" #f #f))))