From 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Fri, 28 Nov 2014 10:21:52 -0800
Subject: [PATCH] Correct the tests for the generic function lambda lists.

The check for invalid gf lambda lists happens during macroexpansion,
so update the tests to catch this during macroexpansion.

This fixes three of the issues in ticket:95.
---
 tests/pcl/defgeneric.lisp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/pcl/defgeneric.lisp b/tests/pcl/defgeneric.lisp
index 05f01c7f0..2cf9e070e 100644
--- a/tests/pcl/defgeneric.lisp
+++ b/tests/pcl/defgeneric.lisp
@@ -32,13 +32,12 @@
 
 (in-package "PCL-TESTS")
 
+;; These errors are signaled during macroexpansion of the defgeneric
+;; form so catch the errors during macroexpansion.
 (defmacro define-gf-lambda-list-test (name lambda-list)
-  `(deftest ,name
-       (multiple-value-bind (r c)
-	   (ignore-errors
-	     (defgeneric g ,lambda-list))
-	 (values (null r) (typep c 'error)))
-     t t))
+  `(define-test ,name
+     (assert-error 'program-error
+		   (macroexpand '(defgeneric g ,lambda-list)))))
 
 (define-gf-lambda-list-test defgeneric-lambda-list.0 (a &optional (b 1)))
 (define-gf-lambda-list-test defgeneric-lambda-list.1 (a &key (b 1)))
-- 
GitLab