X-Git-Url: http://git.kpe.io/?p=cl-base64.git;a=blobdiff_plain;f=base64-tests.lisp;fp=base64-tests.lisp;h=0e5fb1e0504b71bd876d321f09c8fa09a8dcbf9a;hp=7158bb245af72c4722a164c382e5bcaddc7eb0ee;hb=e0713e35f91fd123fda58c7187d934d25e1590d1;hpb=268e079709d5a246c01a8a556b571eeb2efb9d8e

diff --git a/base64-tests.lisp b/base64-tests.lisp
index 7158bb2..0e5fb1e 100644
--- a/base64-tests.lisp
+++ b/base64-tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jan 2003
 ;;;;
-;;;; $Id: base64-tests.lisp,v 1.9 2003/04/15 16:15:21 kevin Exp $
+;;;; $Id: base64-tests.lisp,v 1.10 2003/04/15 16:21:43 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package :cl-user)
@@ -19,48 +19,44 @@
 
 (defun test-base64 ()
   (setq *break-on-test-failures* t) 
-  (with-tests (:name "cl-base64 tests")
-    (do* ((length 0 (+ 3 length))
-	  (string (make-string length) (make-string length))
-	  (usb8 (make-usb8-array length) (make-usb8-array length))
-	  (integer (random (expt 10 length)) (random (expt 10 length))))
-	 ((>= length 300))
+  (do* ((length 0 (+ 3 length))
+	(string (make-string length) (make-string length))
+	(usb8 (make-usb8-array length) (make-usb8-array length))
+	(integer (random (expt 10 length)) (random (expt 10 length))))
+       ((>= length 300))
     (dotimes (i length)
       (declare (fixnum i))
       (let ((code (random 256)))
 	(setf (schar string i) (code-char code))
 	(setf (aref usb8 i) code)))
-
-      (do* ((columns 0 (+ columns 4)))
-	   ((> columns length))
+    
+    (do* ((columns 0 (+ columns 4)))
+	 ((> columns length))
       ;; Test against cl-base64 routines
-	(test integer (base64-string-to-integer
-				 (integer-to-base64-string integer :columns columns))
-	      :test #'eql)
-	(test string (base64-string-to-string
-				(string-to-base64-string string :columns columns))
-		      :test #'string=)
+      (assert (= integer (base64-string-to-integer
+			  (integer-to-base64-string integer :columns columns))))
+      (assert (string= (base64-string-to-string
+			(string-to-base64-string string :columns columns))))
       
       ;; Test against AllegroCL built-in routines
       #+allegro
       (progn
-	(test integer (excl:base64-string-to-integer
-		       (integer-to-base64-string integer :columns columns)))
-	(test integer (base64-string-to-integer
-		       (excl:integer-to-base64-string integer)))
-	(test (string-to-base64-string string :columns columns)
-	      (excl:usb8-array-to-base64-string usb8
-						(if (zerop columns)
-						    nil
-						    columns))
-	      :test #'string=)
-	(test string (base64-string-to-string
-		      (excl:usb8-array-to-base64-string
-		       usb8
-		       (if (zerop columns)
-			   nil
-			   columns)))
-	      :test #'string=)))))
+	(assert (= integer (excl:base64-string-to-integer
+			    (integer-to-base64-string integer :columns columns))))
+	(assert (= integer (base64-string-to-integer
+			    (excl:integer-to-base64-string integer))))
+	(assert (string= (string-to-base64-string string :columns columns)
+			 (excl:usb8-array-to-base64-string usb8
+							   (if (zerop columns)
+							       nil
+							       columns))))
+	(assert (string= string (base64-string-to-string
+				 (excl:usb8-array-to-base64-string
+				  usb8
+				  (if (zerop columns)
+				      nil
+				      columns))))))))
+  (format t "~&All tests passed~%")
   t)