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

diff --git a/base64-tests.lisp b/base64-tests.lisp
index c9bcb6f..7158bb2 100644
--- a/base64-tests.lisp
+++ b/base64-tests.lisp
@@ -7,13 +7,13 @@
 ;;;; 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.9 2003/04/15 16:15:21 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package :cl-user)
 
 (defpackage #:base64-test
-  (:use #:cl #:kmrcl #:base64 #:util.test))
+    (:use #:cl #:kmrcl #:base64 #:util.test))
 
 (in-package #:base64-test)
 
@@ -35,7 +35,8 @@
 	   ((> columns length))
       ;; Test against cl-base64 routines
 	(test integer (base64-string-to-integer
-				 (integer-to-base64-string integer :columns columns)))
+				 (integer-to-base64-string integer :columns columns))
+	      :test #'eql)
 	(test string (base64-string-to-string
 				(string-to-base64-string string :columns columns))
 		      :test #'string=)
@@ -43,23 +44,23 @@
       ;; 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=)))))
+	(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=)))))
   t)
 
 
@@ -69,8 +70,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)