From 8dbeadbf29ec7c19ef8c51a0d54a6fafe50bba7f Mon Sep 17 00:00:00 2001 From: pfdietz <pfdietz@localhost> Date: Sun, 24 Apr 2005 02:00:11 +0000 Subject: [PATCH] More test ordering fixes --- ansi-tests/ansi-aux.lsp | 5 --- ansi-tests/find-symbol.lsp | 2 +- ansi-tests/make-package.lsp | 2 +- ansi-tests/package-name.lsp | 18 ++++++++--- ansi-tests/package-nicknames.lsp | 46 +++++++++++++++++----------- ansi-tests/with-package-iterator.lsp | 26 +++++++++++----- 6 files changed, 62 insertions(+), 37 deletions(-) diff --git a/ansi-tests/ansi-aux.lsp b/ansi-tests/ansi-aux.lsp index 549cd6b4..3ca2ca84 100644 --- a/ansi-tests/ansi-aux.lsp +++ b/ansi-tests/ansi-aux.lsp @@ -1066,8 +1066,3 @@ the condition to go uncaught if it cannot be classified." (let ((eps 1.0d-4)) (<= (abs (- x y)) (* eps (max (abs x) (abs y)))))) - - - - - \ No newline at end of file diff --git a/ansi-tests/find-symbol.lsp b/ansi-tests/find-symbol.lsp index 99f5a44e..3d7eb08c 100644 --- a/ansi-tests/find-symbol.lsp +++ b/ansi-tests/find-symbol.lsp @@ -5,7 +5,7 @@ (in-package :cl-test) -(compile-and-load "packages-00.lsp") +(load "packages-00.lsp") ;;(declaim (optimize (safety 3))) diff --git a/ansi-tests/make-package.lsp b/ansi-tests/make-package.lsp index 86238030..51f8a3c0 100644 --- a/ansi-tests/make-package.lsp +++ b/ansi-tests/make-package.lsp @@ -467,7 +467,7 @@ (deftest make-package.error.4 (handle-non-abort-restart (safely-delete-package "TEST1") - (safely-delete-package "Q") + (set-up-packages) (make-package "TEST1" :nicknames '("Q"))) success) diff --git a/ansi-tests/package-name.lsp b/ansi-tests/package-name.lsp index 7fdffe07..5115a1f1 100644 --- a/ansi-tests/package-name.lsp +++ b/ansi-tests/package-name.lsp @@ -10,19 +10,27 @@ ;;; package-name (deftest package-name.1 - (let () (ignore-errors (package-name "A"))) + (progn + (set-up-packages) + (package-name "A")) "A") (deftest package-name.2 - (let () (ignore-errors (package-name #\A))) + (progn + (set-up-packages) + (package-name #\A)) "A") (deftest package-name.3 - (let () (ignore-errors (package-name "Q"))) + (progn + (set-up-packages) + (package-name "Q")) "A") (deftest package-name.4 - (let () (ignore-errors (package-name #\Q))) + (progn + (set-up-packages) + (package-name #\Q)) "A") (deftest package-name.5 @@ -101,7 +109,7 @@ (loop for p in (list-all-packages) count (not (equal (package-name p) - (ignore-errors (package-name (package-name p)))))) + (package-name (package-name p))))) 0) ;;; Specialized sequence tests diff --git a/ansi-tests/package-nicknames.lsp b/ansi-tests/package-nicknames.lsp index c5e0395f..872b182c 100644 --- a/ansi-tests/package-nicknames.lsp +++ b/ansi-tests/package-nicknames.lsp @@ -10,44 +10,52 @@ ;;; package-nicknames (deftest package-nicknames.1 - (let () (ignore-errors (package-nicknames "A"))) + (progn + (set-up-packages) + (package-nicknames "A")) ("Q")) (deftest package-nicknames.2 - (let () (ignore-errors (package-nicknames #\A))) + (progn + (set-up-packages) + (package-nicknames #\A)) ("Q")) (deftest package-nicknames.3 - (let () (ignore-errors (package-nicknames ':|A|))) + (progn + (set-up-packages) + (package-nicknames ':|A|)) ("Q")) (deftest package-nicknames.4 - (let () (ignore-errors (package-nicknames "B"))) + (progn + (set-up-packages) + (package-nicknames "B")) nil) (deftest package-nicknames.5 - (let () (ignore-errors (package-nicknames #\B))) + (progn + (set-up-packages) + (package-nicknames #\B)) nil) (deftest package-nicknames.6 - (let () (ignore-errors (package-nicknames '#:|B|))) + (progn + (set-up-packages) + (package-nicknames '#:|B|)) nil) (deftest package-nicknames.7 - (let () - (ignore-errors - (subsetp '(#.(string '#:cl)) - (package-nicknames "COMMON-LISP") - :test #'string=))) + (subsetp '(#.(string '#:cl)) + (package-nicknames "COMMON-LISP") + :test #'string=) t) (deftest package-nicknames.8 - (let () - (ignore-errors - (notnot - (subsetp '(#.(string '#:cl-user)) - (package-nicknames "COMMON-LISP-USER") - :test #'string=)))) + (notnot + (subsetp '(#.(string '#:cl-user)) + (package-nicknames "COMMON-LISP-USER") + :test #'string=)) t) (deftest package-nicknames.9 @@ -59,7 +67,9 @@ t) (deftest package-nicknames.10 - (let () (ignore-errors (package-nicknames (find-package "A")))) + (progn + (set-up-packages) + (package-nicknames (find-package "A"))) ("Q")) (deftest package-nicknames.11 diff --git a/ansi-tests/with-package-iterator.lsp b/ansi-tests/with-package-iterator.lsp index b288941e..a0b1b425 100644 --- a/ansi-tests/with-package-iterator.lsp +++ b/ansi-tests/with-package-iterator.lsp @@ -6,7 +6,7 @@ (in-package :cl-test) (declaim (optimize (safety 3))) -(compile-and-load "package-aux.lsp") +(load "package-aux.lsp") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; with-package-iterator @@ -31,27 +31,39 @@ ;;; multiple inheritance (deftest with-package-iterator.5 - (with-package-iterator-all '("A")) + (progn + (set-up-packages) + (with-package-iterator-all '("A"))) t) (deftest with-package-iterator.6 - (with-package-iterator-all '(#:|A|)) + (progn + (set-up-packages) + (with-package-iterator-all '(#:|A|))) t) (deftest with-package-iterator.7 - (with-package-iterator-all '(#\A)) + (progn + (set-up-packages) + (with-package-iterator-all '(#\A))) t) (deftest with-package-iterator.8 - (with-package-iterator-internal (list (find-package "A"))) + (progn + (set-up-packages) + (with-package-iterator-internal (list (find-package "A")))) t) (deftest with-package-iterator.9 - (with-package-iterator-external (list (find-package "A"))) + (progn + (set-up-packages) + (with-package-iterator-external (list (find-package "A")))) t) (deftest with-package-iterator.10 - (with-package-iterator-inherited (list (find-package "A"))) + (progn + (set-up-packages) + (with-package-iterator-inherited (list (find-package "A")))) t) (deftest with-package-iterator.11 -- GitLab