X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-md5%2Fmd5-tests.lisp;h=c0f8da146e66d96332643a3d227d3d75f6897590;hb=95a014cffbb243fdc59adbdd6ab7f6dbb0058ca4;hp=a14a8c57510043087ce018c25737ac4bd8df024d;hpb=4f4a1695fa74e2becf1fb87110132ad4943fac61;p=sbcl.git

diff --git a/contrib/sb-md5/md5-tests.lisp b/contrib/sb-md5/md5-tests.lisp
index a14a8c5..c0f8da1 100644
--- a/contrib/sb-md5/md5-tests.lisp
+++ b/contrib/sb-md5/md5-tests.lisp
@@ -4,16 +4,16 @@
 
 (macrolet
     ((define-rfc1321-tests (test-list)
-	 `(progn
-	   ,@(loop for i upfrom 0
-		   for (string . expected-result) in test-list
-		   collect
-		   `(deftest ,(intern (format nil "SB-MD5.RFC1321.~A" i))
-		     (string= (format nil
-			       "~(~{~2,'0X~}~)"
-			       (coerce (md5sum-sequence ,string) 'list))
-		      ,expected-result)
-		     t)))))
+         `(progn
+           ,@(loop for i upfrom 0
+                   for (string . expected-result) in test-list
+                   collect
+                   `(deftest ,(intern (format nil "SB-MD5.RFC1321.~A" i))
+                     (string= (format nil
+                               "~(~{~2,'0X~}~)"
+                               (coerce (md5sum-string ,string :external-format :ascii) 'list))
+                      ,expected-result)
+                     t)))))
   (define-rfc1321-tests
       (("" . "d41d8cd98f00b204e9800998ecf8427e")
        ("a" ."0cc175b9c0f1b6a831c399e269772661")
@@ -25,15 +25,16 @@
 
 (macrolet
     ((define-other-tests (test-list)
-	 `(progn
-	   ,@(loop for i upfrom 0
-		   for (string . expected-result) in test-list
-		   collect
-		   `(deftest ,(intern (format nil "SB-MD5.OTHER.~A" i))
-		     (string=
-		      (format nil "~(~{~2,'0X~}~)" (coerce (md5sum-sequence ,string) 'list))
-		      ,expected-result)
-		     t)))))
+         `(progn
+           ,@(loop for i upfrom 0
+                   for (string . expected-result) in test-list
+                   collect
+                   `(deftest ,(intern (format nil "SB-MD5.OTHER.~A" i))
+                     (string=
+                      (format nil "~(~{~2,'0X~}~)"
+                       (coerce (md5sum-string ,string :external-format :ascii) 'list))
+                      ,expected-result)
+                     t)))))
   (define-other-tests
       (;; From padding bug report by Edi Weitz
        ("1631901HERR BUCHHEISTERCITROEN NORD1043360796beckenbauer" . "d734945e5930bb28859ccd13c830358b")
@@ -111,5 +112,10 @@
 
 (deftest sb-md5.md5sum-file.0
     (string= (format nil "~(~{~2,'0X~}~)" (coerce (md5sum-file "/dev/null") 'list))
-	     "d41d8cd98f00b204e9800998ecf8427e")
-  t)
\ No newline at end of file
+             "d41d8cd98f00b204e9800998ecf8427e")
+  t)
+
+(deftest sb-md5.md5sum-sequence.error.0
+    (handler-case (md5sum-sequence "foo")
+      (type-error () :good))
+  :good)