X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fmain.lisp;h=9db1bc74d7c5ee3441785c8ccddac5e66b5fcdf9;hb=35b42c73638093521b3b08c8ea31e6d8ca71146e;hp=a73dd7bac468278c8ede478c842736f19bdc24a6;hpb=e9d1b7da236295700286b7564960d84f9c5f0dbe;p=sheep

diff --git a/src/test/main.lisp b/src/test/main.lisp
index a73dd7b..9db1bc7 100644
--- a/src/test/main.lisp
+++ b/src/test/main.lisp
@@ -1,4 +1,5 @@
-(in-package #:docgen-test)
+; Copyright 2022 Frank Duncan (frank@consxy.com) under AGPL3.  See distributed LICENSE.txt.
+(in-package #:sheep-test)
 
 (defvar *tests* nil)
 
@@ -33,10 +34,10 @@
     (handler-case
      (progn
       (load ,source)
-      (string= (slurp-file ,target) (docgen:export-package ,pkg)))
-     (docgen:validation-failure (vf)
+      (string= (slurp-file ,target) (sheep:export-package ,pkg)))
+     (sheep:validation-failure (vf)
       (format t "Validation failure gotten: ~A~%"
-       (funcall (symbol-function (find-symbol "VALIDATION-FAILURE-MSG" :docgen)) vf)))))))
+       (funcall (symbol-function (find-symbol "VALIDATION-FAILURE-MSG" :sheep)) vf)))))))
 
 (defmacro deffailuretest (pkg source expected)
  `(deftest
@@ -45,31 +46,49 @@
     (progn
      (load ,source)
      (let
-      ((result (docgen:validate-package ,pkg)))
+      ((result (sheep:validate-package ,pkg)))
       (or
        (equal ,expected result)
        (format t "  Got error:~%~S~%  but expected~%~S~%" result ,expected)))))))
 
 (defmacro deffailure-func-test (name doc expected)
  `(deftest
-   ,name
+   ,(format nil "Func - ~A" name)
    (lambda ()
     (handler-case
      (progn
       (funcall
-       (symbol-function (find-symbol "INTERNAL-DOC->AST" :docgen-func))
+       (symbol-function (find-symbol "INTERNAL-DOC->AST" :sheep-func))
        'unused
        ,doc)
       nil)
-     (docgen:validation-failure (vf)
+     (sheep:validation-failure (vf)
       (let
-       ((result (funcall (symbol-function (find-symbol "VALIDATION-FAILURE-MSG" :docgen)) vf)))
+       ((result (funcall (symbol-function (find-symbol "VALIDATION-FAILURE-MSG" :sheep)) vf)))
+       (or
+        (string= ,expected result)
+        (format t "  Got error:~%~S~%  but expected~%~S~%" result ,expected))))))))
+
+(defmacro deffailure-var-test (name doc expected)
+ `(deftest
+   ,(format nil "Var - ~A" name)
+   (lambda ()
+    (handler-case
+     (progn
+      (funcall
+       (symbol-function (find-symbol "INTERNAL-DOC->AST" :sheep-var))
+       '*unused*
+       ,doc)
+      nil)
+     (sheep:validation-failure (vf)
+      (let
+       ((result (funcall (symbol-function (find-symbol "VALIDATION-FAILURE-MSG" :sheep)) vf)))
        (or
         (string= ,expected result)
         (format t "  Got error:~%~S~%  but expected~%~S~%" result ,expected))))))))
 
 (defsuccesstest :success1 "resources/success1.lisp" "resources/success1.md")
 (deffailuretest :emptydocs "resources/emptydocs.lisp"
- '((:failure "Package EMPTYDOCS has no documentation")
-   (:failure "Symbol NO-DOC-CONDITION has no documentation")
-   (:failure "Symbol NO-DOC-FUNC has no documentation")))
+ `((:failure :emptydocs "Package EMPTYDOCS has no documentation")
+   (:failure ,(intern "NO-DOC-CONDITION" :emptydocs) "Symbol NO-DOC-CONDITION has no documentation")
+   (:failure ,(intern "NO-DOC-FUNC" :emptydocs) "Symbol NO-DOC-FUNC has no documentation")))