Added is-equal test

diff --git a/src/check.lisp b/src/check.lisp
index e91b46d..8d5f99f 100644 (file)
--- a/src/check.lisp
+++ b/src/check.lisp
@@ -165,6 +165,25 @@ Wrapping the TEST form in a NOT simply preducse a negated reason string."
      (format *test-dribble* "s")
      (add-result 'test-skipped :reason (format nil ,@reason))))
 
+(defmacro is-equal (&rest args)
+  "Generates (is (equal (multiple-value-list ,expr) (multiple-value-list ,value))) for each pair of elements.
+If the value is a (values a b * d *) form then the elements at * are not compared."
+  (with-unique-names (expr-result)
+    `(progn
+      ,@(loop for (expr value) on args by #'cddr
+              do (assert (and expr value))
+              if (and (consp value)
+                      (eq (car value) 'values))
+              collect `(let ((,expr-result (multiple-value-list ,expr)))
+                        ,@(loop for cell = (rest (copy-list value)) then (cdr cell)
+                                for i from 0
+                                while cell
+                                when (eq (car cell) '*)
+                                collect `(setf (elt ,expr-result ,i) nil)
+                                and do (setf (car cell) nil))
+                        (is (equal ,expr-result (multiple-value-list ,value))))
+              else collect `(is (equal ,expr ,value))))))
+
 (defmacro is-true (condition &rest reason-args)
   "Like IS this check generates a pass if CONDITION returns true
   and a failure if CONDITION returns false. Unlike IS this check

diff --git a/src/packages.lisp b/src/packages.lisp
index cf5aa26..a041cfa 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -38,6 +38,7 @@
           #:rem-fixture
           ;; running checks
            #:is
+           #:is-equal
            #:is-true
            #:is-false
            #:signals