X-Git-Url: http://git.kpe.io/?p=cl-base64.git;a=blobdiff_plain;f=base64-tests.lisp;h=e48a3474524827bde2a0b4a7aa9e605fb3732113;hp=c9bcb6fe0015892c191d0acc36ea35299f8b6775;hb=748abc42f3b57c8ba74437121d22f7418b8b7a13;hpb=3771e78939bb92664c2e3064256eb9dd1650be3b

diff --git a/base64-tests.lisp b/base64-tests.lisp
index c9bcb6f..e48a347 100644
--- a/base64-tests.lisp
+++ b/base64-tests.lisp
@@ -7,59 +7,57 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jan 2003
 ;;;;
-;;;; $Id: base64-tests.lisp,v 1.5 2003/04/15 15:55:52 kevin Exp $
+;;;; $Id: base64-tests.lisp,v 1.12 2003/04/15 16:24:37 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package :cl-user)
 
 (defpackage #:base64-test
-  (:use #:cl #:kmrcl #:base64 #:util.test))
+    (:use #:cl #:kmrcl #:base64))
 
 (in-package #:base64-test)
 
 (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 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= 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)
 
 
@@ -69,8 +67,10 @@
 	 (int 12345678901234567890)
 	 (n 50000))
     (time-iterations n (integer-to-base64-string int))
+    #+allegro
     (time-iterations n (excl:integer-to-base64-string int))
     (time-iterations n (string-to-base64-string str))
+    #+allegro
     (time-iterations n (excl:usb8-array-to-base64-string usb8))))
 
 (export 'test-base64)