From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 25 Aug 2003 16:27:23 +0000 (+0000)
Subject: r5554: *** empty log message ***
X-Git-Tag: v3.3.2~16
X-Git-Url: http://git.kpe.io/?p=cl-base64.git;a=commitdiff_plain;h=e506298926d36af5ba424f3b06e81180151c04e8

r5554: *** empty log message ***
---

diff --git a/base64.asd b/base64.asd
index 146e512..8e04e81 100644
--- a/base64.asd
+++ b/base64.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base64.asd,v 1.22 2003/08/24 20:38:08 kevin Exp $
+;;;; $Id: base64.asd,v 1.23 2003/08/25 16:27:23 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:cl-user)
@@ -37,12 +37,12 @@
   (operate 'test-op 'base64-tests :force t))
 
 (defsystem base64-tests
-    :depends-on (base64)
+    :depends-on (base64 ptester)
     :components
     ((:file "tests")))
 
 (defmethod perform ((o test-op) (c (eql (find-system 'base64-tests))))
   (operate 'load-op 'base64-tests)
-  (or (funcall (intern (symbol-name '#:test-base64)
+  (or (funcall (intern (symbol-name '#:do-tests)
 		       (find-package 'base64-test)))
       (error "test-op failed")))
diff --git a/test.lisp b/test.lisp
deleted file mode 100644
index 1518f35..0000000
--- a/test.lisp
+++ /dev/null
@@ -1,75 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          test.lisp
-;;;; Purpose:       Regression tests for cl-base64
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Jan 2003
-;;;;
-;;;; $Id: test.lisp,v 1.3 2003/06/12 14:05:11 kevin Exp $
-;;;; *************************************************************************
-
-(in-package #:cl-user)
-
-(defpackage #:base64-test
-  (:use #:cl #:kmrcl #:base64 #:util.test))
-
-(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))
-    (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))
-      ;; 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=)
-      
-      ;; 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=))))))
-
-
-(defun time-routines ()
-  (let* ((str "abcdefghijklmnopqwertyu1234589jhwf2ff")
-	 (usb8 (string-to-usb8-array str))
-	 (int 12345678901234567890)
-	 (n 50000))
-    (time-iterations n (integer-to-base64-string int))
-    (time-iterations n (excl:integer-to-base64-string int))
-    (time-iterations n (string-to-base64-string str))
-    (time-iterations n (excl:usb8-array-to-base64-string usb8))))
-
-      
-;;#+run-test (test-base64)
diff --git a/tests.lisp b/tests.lisp
index dbe0741..a6f5b65 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,56 +7,59 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jan 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.1 2003/08/24 20:38:08 kevin Exp $
+;;;; $Id: tests.lisp,v 1.2 2003/08/25 16:27:23 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:cl-user)
+
 (defpackage #:base64-test
-  (:use #:cl #:kmrcl #:base64)
-  (:export #:test-base64))
+  (:use #:cl #:kmrcl #:base64 #:ptester))
+
 (in-package #:base64-test)
 
-(defun test-base64 ()
-  (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))
+(defun do-tests ()
+  (with-tests (:name "cl-base64 tests")
+    (let ((*break-on-test-failures* t))
+      (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))
-      ;; Test against cl-base64 routines
-      (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
-	(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~%")
+	
+	(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=)
+	  
+	  ;; 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=))))))
   t)
 
 
@@ -66,10 +69,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))))
+    #+allego
+    (progn
+      (time-iterations n (excl:integer-to-base64-string int))
+      (time-iterations n (excl:usb8-array-to-base64-string usb8)))))
 
-;;(test-base64)
+      
+;;#+run-test (test-base64)