Client manifest: use GOOPS

1 files changed, 16 insertions, 12 deletions

diff --git a/tests/client-manifest-fraudulent.scm b/tests/client-manifest-fraudulent.scm
index 548f6c1..b1803f4 100644
--- a/tests/client-manifest-fraudulent.scm
+++ b/tests/client-manifest-fraudulent.scm
@@ -14,16 +14,20 @@
 ;; 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 client-manifest)
-             (webid-oidc cache)
-             (webid-oidc testing)
-             ((webid-oidc parameters) #:prefix p:)
-             (webid-oidc errors)
-             (web uri)
-             (srfi srfi-19)
-             (web response)
-             (ice-9 optargs)
-             (ice-9 receive))
+(define-module (tests client-manifest-fraudulent)
+  #:use-module (webid-oidc client-manifest)
+  #:use-module (webid-oidc cache)
+  #:use-module (webid-oidc testing)
+  #:use-module ((webid-oidc parameters) #:prefix p:)
+  #:use-module (webid-oidc errors)
+  #:use-module (web uri)
+  #:use-module (srfi srfi-19)
+  #:use-module (web response)
+  #:use-module (ice-9 optargs)
+  #:use-module (ice-9 receive)
+  #:use-module (oop goops)
+  #:declarative? #t
+  #:duplicates (merge-generics))
 
 ;; In this example, the client_id of the oidcRegistration does not
 ;; match the base URI.
@@ -68,8 +72,8 @@
                 (exit 3)))
           (lambda ()
             (parameterize ((p:current-date 0))
-              (get-client-manifest
-               (string->uri "https://fraudulent-app.example.com/id#app")))
+              (make <client-manifest>
+                #:client-id "https://fraudulent-app.example.com/id#app"))
             (exit 4))
           #:unwind? #t
           #:unwind-for-type &inconsistent-client-manifest))))))