From bbe2116d8548f6f0f0619ab7753727476a48a208 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 5 Jul 2024 20:44:17 +0200
Subject: [PATCH] web/server: move 'demo' handler to test package; core: add
 tests for util string functions

---
 test/etc/config-web.lisp |  2 +-
 test/test-core.lisp      |  6 ++++++
 test/test-web.lisp       | 10 ++++++++++
 web/server.lisp          |  8 +-------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/etc/config-web.lisp b/test/etc/config-web.lisp
index 20faccc..d0f780c 100644
--- a/test/etc/config-web.lisp
+++ b/test/etc/config-web.lisp
@@ -15,7 +15,7 @@
               `((("api") server:message-handler)
                 (() server:fileserver 
                     :doc-root ,(t:test-path "" "docs"))))
-(config:add-action '(:test :data) #'server:demo)
+(config:add-action '(:test :data) #'demo)
 ;(config:add-action '(:test :data) #'(lambda (ctx msg)))
 
 (config:add :client :class 'client:config
diff --git a/test/test-core.lisp b/test/test-core.lisp
index fa4c88f..1d77804 100644
--- a/test/test-core.lisp
+++ b/test/test-core.lisp
@@ -52,6 +52,7 @@
     (load (t:test-path "config-core" "etc"))
     (unwind-protect
       (progn
+        (test-util)
         (core:setup-services)
         (setf (receiver t:*test-suite*) (core:find-service :test-receiver))
         (test-send))
@@ -59,6 +60,11 @@
       (check-expected)
       (t:show-result))))
 
+(deftest test-util ()
+  (== (util:trunc "hello world" 5) "hello...")
+  (== (util:trunc "hello world" 11) "hello world")
+  (== (util:to-keyword "hello-kitty") :hello-kitty))
+
 (deftest test-send ()
   (let ((rcvr (receiver t:*test-suite*))
         (msg (message:make-message '(:test :dummy) :data "dummy payload"))
diff --git a/test/test-web.lisp b/test/test-web.lisp
index be266e3..8a7e2ec 100644
--- a/test/test-web.lisp
+++ b/test/test-web.lisp
@@ -14,6 +14,16 @@
 
 (in-package :scopes/test-web)
 
+;;;; dummy / test / demo action handlers
+
+(defun demo (ctx msg)
+  (let ((resp (message:sender msg)))
+    (if (null resp)
+      (log:warn "sender missing: ~s" msg)
+      (setf (server:content resp) "Hello Demo-World!"))))
+
+;;;; test runner
+
 (defun run ()
   (let ((t:*test-suite* (t:test-suite "web")))
     (load (t:test-path "config-web" "etc"))
diff --git a/web/server.lisp b/web/server.lisp
index 7749fae..7ee5ccb 100644
--- a/web/server.lisp
+++ b/web/server.lisp
@@ -9,7 +9,7 @@
                     (:alx :alexandria))
   (:export #:config #:address #:port #:routes
            #:*listener* #:setup #:start #:stop
-           #:demo
+           #:content
            #:fileserver #:message-handler))
 
 (in-package :scopes/web/server)
@@ -106,12 +106,6 @@
   (let ((ctx (make-instance 'context :config cfg :name (config:name cfg))))
     (start ctx)))
 
-(defun demo (ctx msg)
-  (let ((resp (message:sender msg)))
-    (if (null resp)
-      (log:warn "sender missing: ~s" msg)
-      (setf (content resp) "Hello Demo-World!"))))
-
 ;;;; helper functions
 
 (defun head (env)