--- a/tests/automated/base64-tests.el	Thu Jan 14 01:25:16 2010 -0600
+++ b/tests/automated/base64-tests.el	Thu Jan 14 02:18:03 2010 -0600
@@ -52,8 +52,8 @@
       (erase-buffer)
       (insert string)
       (setq length (base64-encode-region (point-min) (point-max) no-line-break))
-      (Assert (eq length (- (point-max) (point-min))))
-      (Assert (equal (buffer-string) string-result))
+      (Assert-eq length (- (point-max) (point-min)))
+      (Assert-equal (buffer-string) string-result)
       ;; partial
       (erase-buffer)
       (insert "random junk........\0\0';'eqwrkw[erpqf")
@@ -62,8 +62,8 @@
 	(setq p2 (point-marker))
 	(insert "...more random junk.q,f3/.qrm314.r,m2typ' 2436T@W$^@$#^T@")
 	(setq length (base64-encode-region p1 p2 no-line-break))
-	(Assert (eq length (- p2 p1)))
-	(Assert (equal (buffer-substring p1 p2) string-result))))
+	(Assert-eq length (- p2 p1))
+	(Assert-equal (buffer-substring p1 p2) string-result)))
     string-result))
 
 (defun bt-base64-decode-string (string)
@@ -75,12 +75,12 @@
       (insert string)
       (setq length (base64-decode-region (point-min) (point-max)))
       (cond (string-result
-	     (Assert (eq length (- (point-max) (point-min))))
-	     (Assert (equal (buffer-string) string-result)))
+	     (Assert-eq length (- (point-max) (point-min)))
+	     (Assert-equal (buffer-string) string-result))
 	    (t
 	     (Assert (null length))
 	     ;; The buffer should not have been modified.
-	     (Assert (equal (buffer-string) string))))
+	     (Assert-equal (buffer-string) string)))
       ;; partial
       (erase-buffer)
       (insert "random junk........\0\0';'eqwrkw[erpqf")
@@ -90,12 +90,12 @@
 	(insert "...more random junk.q,f3/.qrm314.\0\0r,m2typ' 2436T@W$^@$#T@")
 	(setq length (base64-decode-region p1 p2))
 	(cond (string-result
-	       (Assert (eq length (- p2 p1)))
-	       (Assert (equal (buffer-substring p1 p2) string-result)))
+	       (Assert-eq length (- p2 p1))
+	       (Assert-equal (buffer-substring p1 p2) string-result))
 	      (t
 	       (Assert (null length))
 	       ;; The buffer should not have been modified.
-	       (Assert (equal (buffer-substring p1 p2) string))))))
+	       (Assert-equal (buffer-substring p1 p2) string)))))
     string-result))
 
 (defun bt-remove-newlines (str)
@@ -126,9 +126,9 @@
 ;;-----------------------------------------------------
 
 (loop for (raw encoded) in bt-test-strings do
-  (Assert (equal (bt-base64-encode-string raw) encoded))
+  (Assert-equal (bt-base64-encode-string raw) encoded)
   ;; test the NO-LINE-BREAK flag
-  (Assert (equal (bt-base64-encode-string raw t) (bt-remove-newlines encoded))))
+  (Assert-equal (bt-base64-encode-string raw t) (bt-remove-newlines encoded)))
 
 ;; When Mule is around, Lisp programmers should make sure that the
 ;; buffer contains only characters whose `char-int' is in the [0, 256)
@@ -150,8 +150,8 @@
 ;;-----------------------------------------------------
 
 (loop for (raw encoded) in bt-test-strings do
-  (Assert (equal (bt-base64-decode-string encoded) raw))
-  (Assert (equal (bt-base64-decode-string (bt-remove-newlines encoded)) raw)))
+  (Assert-equal (bt-base64-decode-string encoded) raw)
+  (Assert-equal (bt-base64-decode-string (bt-remove-newlines encoded)) raw))
 
 ;; Test errors
 (dolist (str `("foo" "AAC" "foo\0bar" "====" "Zm=9v" ,bt-allchars))
@@ -182,7 +182,7 @@
       ;; Whitespace at the beginning, end, and middle.
       (let ((mangled (concat bt-nonbase64-chars left bt-nonbase64-chars right
 			     bt-nonbase64-chars)))
-	(Assert (equal (bt-base64-decode-string mangled) raw)))
+	(Assert-equal (bt-base64-decode-string mangled) raw))
 
       ;; Whitespace between every char.
       (let ((mangled (concat bt-nonbase64-chars
@@ -191,7 +191,7 @@
 			     (mapconcat #'char-to-string encoded
 					(apply #'string bt-nonbase64-chars))
 			     bt-nonbase64-chars)))
-	(Assert (equal (bt-base64-decode-string mangled) raw))))))
+	(Assert-equal (bt-base64-decode-string mangled) raw)))))
 
 ;;-----------------------------------------------------
 ;; Mixed...
@@ -205,22 +205,22 @@
 ;; practically all aspects of the encoding and decoding process.
 
 (loop for (raw ignored) in bt-test-strings do
-  (Assert (equal (bt-base64-decode-string
+  (Assert-equal (bt-base64-decode-string
 		  (bt-base64-encode-string raw))
-		 raw))
-  (Assert (equal (bt-base64-decode-string
+		 raw)
+  (Assert-equal (bt-base64-decode-string
 		  (bt-base64-decode-string
 		   (bt-base64-encode-string
 		    (bt-base64-encode-string raw))))
-		 raw))
-  (Assert (equal (bt-base64-decode-string
+		 raw)
+  (Assert-equal (bt-base64-decode-string
 		  (bt-base64-decode-string
 		   (bt-base64-decode-string
 		    (bt-base64-encode-string
 		     (bt-base64-encode-string
 		      (bt-base64-encode-string raw))))))
-		 raw))
-  (Assert (equal (bt-base64-decode-string
+		 raw)
+  (Assert-equal (bt-base64-decode-string
 		  (bt-base64-decode-string
 		   (bt-base64-decode-string
 		    (bt-base64-decode-string
@@ -228,8 +228,8 @@
 		      (bt-base64-encode-string
 		       (bt-base64-encode-string
 			(bt-base64-encode-string raw))))))))
-		 raw))
-  (Assert (equal (bt-base64-decode-string
+		 raw)
+  (Assert-equal (bt-base64-decode-string
 		  (bt-base64-decode-string
 		   (bt-base64-decode-string
 		    (bt-base64-decode-string
@@ -239,4 +239,4 @@
 			(bt-base64-encode-string
 			 (bt-base64-encode-string
 			  (bt-base64-encode-string raw))))))))))
-		 raw)))
+		 raw))