thodg/css-lexer

diff --git a/test.lisp b/test.lisp
index 8dd06a2..436e772 100644
--- a/test.lisp
+++ b/test.lisp
@@ -15,30 +15,72 @@
 
 (in-package :css-lexer/test)
 
-(defun simple-test ()
-  (with-stream (css (css-lexer
-                     (string-input-stream
-                      "body { color: #f00; }")))
-    (loop
-       (multiple-value-bind (token state) (stream-read css)
-         (ecase state
-           ((nil) (print token))
-           ((:eof) (return))
-           ((:non-blocking) (sleep 0.01)))))))
-
-(defun test-file (path)
+(defgeneric test (x))
+
+(defmethod test ((s string))
+  (with-stream (css (css-lexer (string-input-stream s)))
+    (let ((result))
+      (loop
+         (multiple-value-bind (token state) (stream-read css)
+           (ecase state
+             ((nil) (push token result))
+             ((:eof) (return))
+             ((:non-blocking) (sleep 0.01)))))
+      (nreverse result))))
+
+(defmethod test ((path pathname))
   (with-stream (css (css-lexer
                      (babel-input-stream
                       (unistd-stream-open path :read t))))
-    (loop
-       (multiple-value-bind (token state) (stream-read css)
-         (ecase state
-           ((nil) (print token))
-           ((:eof) (return))
-           ((:non-blocking) (sleep 0.01)))))))
+    (let ((result))
+      (loop
+         (multiple-value-bind (token state) (stream-read css)
+           (ecase state
+             ((nil) (push token result))
+             ((:eof) (return))
+             ((:non-blocking) (sleep 0.01)))))
+      (nreverse result))))
+
+(defparameter *tests*
+  '((""
+     eof-token)
+    ("body { color: #f00; }"
+     ident-token whitespace-token {-token whitespace-token
+     ident-token colon-token whitespace-token hash-token semicolon-token
+     whitespace-token }-token eof-token)))
+
+(defvar *success*)
+
+(defun compare-result (result expected)
+  (loop
+     (when (endp result)
+       (cond ((endp expected)
+              (format t ";  OK~%")
+              (incf *success*))
+             (t
+              (format t ";  FAIL not matched: ~S~%" expected)))
+       (return (endp expected)))
+     (when (endp expected)
+       (format t ";  FAIL unexpected: ~S~%" result)
+       (return nil))
+     (let ((r (first result))
+           (e (first expected)))
+       (unless (eq (class-name (class-of r)) e)
+         (format t ";  FAIL expected ~S got ~S~%" e r)
+         (return)))
+     (pop result)
+     (pop expected)))
 
 (defun run ()
-  (simple-test))
+  (let ((count (length *tests*))
+        (i 0)
+        (*success* 0))
+    (dolist (test *tests*)
+      (destructuring-bind (arg &rest expected) test
+        (format t "~&; ~A/~A ~S~%" (incf i) count arg)
+        (let ((result (test arg)))
+          (compare-result result expected))))
+    (format t "; Passed tests ~A/~A total~%" *success* count)))
 
 (untrace token-stream::subseq*
          token-stream:make-token)