From 53a61b660b2e2cc309f681697fef8ceb9f92a725 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 20 May 2024 17:24:24 +0200 Subject: [PATCH] testing: provide deftest macro, show suite and test names --- test/test-storage.lisp | 6 +++--- testing.lisp | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/test/test-storage.lisp b/test/test-storage.lisp index f621674..5d8f875 100644 --- a/test/test-storage.lisp +++ b/test/test-storage.lisp @@ -22,13 +22,13 @@ (defun run-sqlite () (load "test/config-sqlite") (let ((storage:*db-config* *db-config-test*) - (t:*test-suite* (t:test-suite "test-sqlite"))) + (t:*test-suite* (t:test-suite "sqlite"))) (run))) (defun run-postgres () (load "test/config-postgres") (let ((storage:*db-config* *db-config-test*) - (t:*test-suite* (t:test-suite))) + (t:*test-suite* (t:test-suite "postgres"))) (run))) (defun run () @@ -38,7 +38,7 @@ (test-track st) (t:show-result))) -(defun test-track (st) +(t: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/testing.lisp b/testing.lisp index 7499098..d489a1e 100644 --- a/testing.lisp +++ b/testing.lisp @@ -5,8 +5,8 @@ (defpackage :scopes/testing (:use :common-lisp) (:export #:*test-suite* - #:test-suite #:show-result - #:==)) + #:test-suite #:deftest #:show-result + #:test #:==)) (in-package :scopes/testing) @@ -20,7 +20,15 @@ (make-instance 'test-suite :name name)) (defun show-result () - (format t "~a, result: ~a~%" (name *test-suite*) (result *test-suite*))) + (format t "~a~%" (name *test-suite*) ) + (dolist (res (result *test-suite*)) + (let ((tst (reverse res))) + (format t "~a: ~a~%" (string-downcase (car tst)) (cdr tst))))) (defun == (have wanted) - (push (equalp have wanted) (result *test-suite*))) + (push (equalp have wanted) (car (result *test-suite*)))) + +(defmacro deftest (name args &body body) + `(defun ,name ,args + (push '(,name) (result *test-suite*)) + ,@body))