lisp-unit confused about local function

[jimka2001]

When I define a test as shown here, I get an error when running the tests that the local function is undefined.

(define-test test123
  (flet ((equal-n (&rest args)
           (and (cdr args)
                (forall a args
                  (equal a (car args))))))
    (assert-true (equal-n 3 3 3 3 3 3 3 ))))

The function LISP-TYPES-TEST::EQUAL-N is undefined.
   [Condition of type UNDEFINED-FUNCTION]

Restarts:
 0: [CONTINUE] Retry using EQUAL-N.
 1: [USE-VALUE] Use specified function.
 2: [RETRY] Retry SLIME REPL evaluation request.
 3: [*ABORT] Return to SLIME's top level.
 4: [ABORT] abort thread (#<THREAD "repl-thread" RUNNING {105CC40003}>)

Backtrace:
  0: ((LAMBDA ()))
  1: (LISP-UNIT::INTERNAL-ASSERT :RESULT (EQUAL-N 3 3 3 3 3 ...) #<CLOSURE (LAMBDA NIL) {131DCBC54B}> #<FUNCTION (LAMBDA NIL) {131D5B9ECB}> #<CLOSURE (LAMBDA NIL) {131DCBC56B}> #<FUNCTION EQL>)
  2: ((LAMBDA ()))
  3: (LISP-UNIT::RUN-CODE ((FLET (#) (ASSERT-TRUE #))))
  4: (LISP-UNIT::RUN-TEST-THUNK TEST123 ((FLET (#) (ASSERT-TRUE #))))
  5: (LISP-UNIT::RECORD-RESULT TEST123 ((FLET (#) (ASSERT-TRUE #))) #<TEST-RESULTS-DB Total(0) Passed(0) Failed(0) Errors(0)> ..)

[jimka2001]

In my opinion the macro expand-t-or-f is wrong.
It makes a funcall of the compare function, rather than just evaluating the form.
Here is my suggested fix.

(defmacro expand-t-or-f (t-or-f form extras)
  "Expand the true/false assertions to report the arguments."
  (let ((fname (gensym))
        (args (gensym)))
    `(let ((,fname ',(car form))
           (,args (list ,@(cdr form))))
       (if (macro-function ,fname)
           ;; Do not report macro arguments
           (internal-assert
            :result ',form
            (lambda () ,form)
            (lambda () ,t-or-f)
            ;; Concatenate the args with the extras
            ;; FIXME: Need to test whether the args are expanded at
            ;;        the right time
            (lambda ()
              (nconc
               (mapcan #'list ',(cdr form) ,args)
               (funcall (expand-extras ,extras))))
            #'eql)
           ;; Report function arguments
           (internal-assert
            :result ',form
            (lambda () ,form) ; Evaluate the form ; JN just insert ,form rather than (funcall ,fname ...).  Because, we are not sure that fname is funcallable
            (lambda () ,t-or-f)
            ;; Concatenate the args with the extras
            (lambda ()
              (nconc
               (mapcan #'list ',(cdr form) ,args)
               (funcall (expand-extras ,extras))))
            #'eql)))))

[jimka2001]

There is a proposed fix in 7b8c38d

[jimka2001]

I've fixed this branch because the arguments of the testing predicate were getting evaluated twice,
which is bad in case of side effects.
see commit a99954f