From 05747fa5ccdd876541eb4ebf146e5d214d743fd6 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sun, 23 Jun 2024 16:11:22 +0200 Subject: [PATCH] remove ugly t: from deftest declarations --- test/test-config.lisp | 4 ++-- test/test-core.lisp | 2 +- test/test-storage.lisp | 4 ++-- test/test-web.lisp | 6 +++--- web/server.lisp | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/test-config.lisp b/test/test-config.lisp index e514fa1..a0e207d 100644 --- a/test/test-config.lisp +++ b/test/test-config.lisp @@ -32,12 +32,12 @@ (test-env-override) (t:show-result))) -(t:deftest test-make-path () +(deftest test-make-path () ;(format t "~&runtime-path (.env): ~s" (util:runtime-path ".env" "app")) ;(format t "~&home-path: ~s" (util:home-path ".env.txt" "lisp" "cl-scopes")) (== (pathname-name (util:home-path ".env.txt" "lisp" "cl-scopes")) ".env")) -(t:deftest test-env-override () +(deftest test-env-override () (let ((data (config:env-data *config*)) (child (car (config:children *config*)))) (== (gethash :user data) "user-from-env-file") diff --git a/test/test-core.lisp b/test/test-core.lisp index d0551da..5ac53b0 100644 --- a/test/test-core.lisp +++ b/test/test-core.lisp @@ -59,7 +59,7 @@ (check-expected) (t:show-result))) -(t:deftest test-send () +(deftest test-send () (let ((rcvr (receiver t:*test-suite*)) (msg (message:simple-message '(:test :dummy) "dummy payload")) (msg-exp (message:simple-message '(:test :dummy) "dummy payload"))) diff --git a/test/test-storage.lisp b/test/test-storage.lisp index 2aad7fa..62048d7 100644 --- a/test/test-storage.lisp +++ b/test/test-storage.lisp @@ -9,7 +9,7 @@ (:t :scopes/testing)) (:export #:*db-config-test* #:run #:run-all #:run-postgres #:run-sqlite) - (:import-from :scopes/testing #:==)) + (:import-from :scopes/testing #:deftest #:==)) (in-package :scopes/test-storage) @@ -38,7 +38,7 @@ (test-track st) (t:show-result))) -(t:deftest test-track (st) +(deftest test-track (st) (let (cont tr tr2 (data (make-hash-table))) (setf cont (make-instance 'tracking:container :storage st)) (defparameter cl-user::*cont cont) diff --git a/test/test-web.lisp b/test/test-web.lisp index a32025a..8a3fba7 100644 --- a/test/test-web.lisp +++ b/test/test-web.lisp @@ -30,14 +30,14 @@ (server:stop (core:find-service :server)) (t:show-result)))) -(t:deftest test-server-config (server) +(deftest test-server-config (server) (== (parse-integer (server:port (core:config server))) 8899)) -(t:deftest test-fileserver (client) +(deftest test-fileserver (client) (let ((msg (message:simple-message '(:test :get-page) '(:path "demo.html")))) (== (client:base-url (core:config client)) "http://localhost:8899") (has-prefix (client:get-page client msg) "Hello Fileserver!"))) -(t:deftest test-message (client) +(deftest test-message (client) (let ((msg (message:simple-message '(:test :data)))) (== (client:send-message client msg) "Hello World!"))) diff --git a/web/server.lisp b/web/server.lisp index e524da6..1962a4c 100644 --- a/web/server.lisp +++ b/web/server.lisp @@ -50,14 +50,13 @@ (dolist (r (routes (core:config ctx))) (when (match (car r) path) (setf (getf env :message-head) (nthcdr (length (car r)) path)) - ;(format t "~&route: ~s~%" r) (return-from select-app #'(lambda () (apply (cadr r) ctx env (cddr r))))))) #'(lambda () (message-handler ctx env))) (defun match (pattern path) - ;(format t "~&match: pattern ~s, p ~s" pattern p) + ;(format t "~&match: pattern ~s, path ~s" pattern path) (dolist (e pattern) (unless (string= e (pop path)) (return-from match nil)))