r4499: Auto commit for Debian build

[cl-base64.git] / base64-tests.lisp

diff --git a/base64-tests.lisp b/base64-tests.lisp
index 3b7ec4a22e1b090e1a58977b638c7bd170a46265..e48a3474524827bde2a0b4a7aa9e605fb3732113 100644 (file)
--- a/base64-tests.lisp
+++ b/base64-tests.lisp
@@ -7,58 +7,58 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jan 2003
 ;;;;
-;;;; $Id: base64-tests.lisp,v 1.1 2003/04/15 15:34:43 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 ()
-  (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)
 
 
 (defun time-routines ()
@@ -67,9 +67,11 @@
         (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))))
 
-      
-;;#+run-test (test-base64)
+(export 'test-base64)      
+;;(test-base64)