Repositories / ecl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 279dda1)
tests: fix wrong assumption on assert
authorDaniel Kochmański <daniel@turtleware.eu>
Wed, 12 Aug 2015 12:21:54 +0000 (14:21 +0200)
committerDaniel Kochmański <daniel@turtleware.eu>
Wed, 12 Aug 2015 12:21:54 +0000 (14:21 +0200)
Tests using assert assumed it returns (values) — no value, but it
returns nil if assertion is true. Add it to deftests.

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
src/tests/bugs/sf262--declaim-type-foo-setf-foo.lsp patch | blob | blame | history
src/tests/bugs/sf272--style-warning-argument-order.lsp patch | blob | blame | history
src/tests/bugs/sf282--mvb-not-evaled.lsp patch | blob | blame | history
src/tests/bugs/sf286.lsp patch | blob | blame | history

diff --git a/src/tests/bugs/sf262--declaim-type-foo-setf-foo.lsp b/src/tests/bugs/sf262--declaim-type-foo-setf-foo.lsp
index ae64a29..997e74c 100644 (file)
--- a/src/tests/bugs/sf262--declaim-type-foo-setf-foo.lsp
+++ b/src/tests/bugs/sf262--declaim-type-foo-setf-foo.lsp
@@ -17,5 +17,6 @@
 ;; Z is not of type CONS.
 ;;   [Condition of type TYPE-ERROR]
 (deftest sf262--declaim-type-foo-setf-foo.lsp
-         (assert (eq 'z
-                     (setf (foo *c*) 'z))))
+    (assert (eq 'z
+                (setf (foo *c*) 'z)))
+  nil)
diff --git a/src/tests/bugs/sf272--style-warning-argument-order.lsp b/src/tests/bugs/sf272--style-warning-argument-order.lsp
index d449725..ec14cfa 100644 (file)
--- a/src/tests/bugs/sf272--style-warning-argument-order.lsp
+++ b/src/tests/bugs/sf272--style-warning-argument-order.lsp
@@ -4,17 +4,18 @@
          `(lambda (x) (1+ (the (values integer string) (funcall x)))))
 
 (deftest sf272--style-warning-argument-order
-         (let ((warning nil))
-           (assert
-             (eq :ok
-                 (handler-bind
-                   ((style-warning 
-                      (lambda (c) 
-                        (format t "got style-warning: ~s~%" c)
-                        (setf warning c))))
-                   (block nil
-                          (tagbody
-                            (return (multiple-value-bind () (go :fail) :bad))
-                            :fail
-                            (return :ok))))))
-           (assert (not warning))))
+    (let ((warning nil))
+      (assert
+       (eq :ok
+           (handler-bind
+               ((style-warning
+                 (lambda (c)
+                   (format t "got style-warning: ~s~%" c)
+                   (setf warning c))))
+             (block nil
+               (tagbody
+                  (return (multiple-value-bind () (go :fail) :bad))
+                :fail
+                  (return :ok))))))
+      (assert (not warning)))
+  nil)
diff --git a/src/tests/bugs/sf282--mvb-not-evaled.lsp b/src/tests/bugs/sf282--mvb-not-evaled.lsp
index ac69b3e..cd0bc8e 100644 (file)
--- a/src/tests/bugs/sf282--mvb-not-evaled.lsp
+++ b/src/tests/bugs/sf282--mvb-not-evaled.lsp
@@ -2,10 +2,11 @@
 ;; https://sourceforge.net/p/ecls/bugs/282
 
 (deftest sf282--mvb-not-evaled
-         (assert
-           (eq :ok
-               (block nil
-                      (tagbody
-                        (return (multiple-value-bind () (go :fail) :bad))
-                        :fail
-                        (return :ok))))))
+    (assert
+     (eq :ok
+         (block nil
+           (tagbody
+              (return (multiple-value-bind () (go :fail) :bad))
+            :fail
+              (return :ok)))))
+  nil)
diff --git a/src/tests/bugs/sf286.lsp b/src/tests/bugs/sf286.lsp
index 36efece..e5e3c26 100644 (file)
--- a/src/tests/bugs/sf286.lsp
+++ b/src/tests/bugs/sf286.lsp
@@ -1,15 +1,17 @@
 ;; miscompilation - assumed that read-from-string returns a fixnum.
 
 (deftest sf286-a
-         (assert
-           (let ((string ":cl-user"))
-             (find-package 
-               (let ((*package* (find-package :cl)))
-                 (read-from-string string))))))
+    (assert
+     (let ((string ":cl-user"))
+       (find-package
+        (let ((*package* (find-package :cl)))
+          (read-from-string string)))))
+  nil)
 
 (deftest sf286-b
-         (assert
-           (let ((string ":cl-user"))
-             (let ((*package* (find-package :cl)))
-               (find-package 
-                 (read-from-string string))))))
+    (assert
+     (let ((string ":cl-user"))
+       (let ((*package* (find-package :cl)))
+         (find-package
+          (read-from-string string)))))
+  nil)
Embeddable Common Lisp (Official: https://gitlab.com/embeddable-common-lisp/ecl)