r11022: revert incorrect stuff from clisp testing

[uffi.git] / tests / compress.lisp

diff --git a/tests/compress.lisp b/tests/compress.lisp
index 173d3e8f076316aef9b309278632d620e964e24a..9e73326f469636cc9356bff26d1efe00a79e8583 100644 (file)
--- a/tests/compress.lisp
+++ b/tests/compress.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -36,10 +36,8 @@
            (newdestlen (uffi:deref-pointer destlen :long)))
        (unwind-protect
            (if (zerop result)
-               (values (uffi:convert-from-foreign-string 
-                        dest
-                        :length newdestlen
-                        :null-terminated-p nil)
+               (values (uffi:convert-from-foreign-usb8 
+                        dest newdestlen)
                        newdestlen)
              (error "zlib error, code ~D" result))
          (progn
@@ -74,12 +72,12 @@
            (uffi:free-foreign-object destlen)
            (uffi:free-foreign-object dest)))))))
 
-(deftest compress.1 (map 'list #'char-code (compress ""))
-  (120 156 3 0 0 0 0 1))
-(deftest compress.2 (map 'list #'char-code  (compress "test"))
-  (120 156 43 73 45 46 1 0 4 93 1 193))
-(deftest compress.3 (map 'list #'char-code (compress "test2"))
-  (120 156 43 73 45 46 49 2 0 6 80 1 243))
+(deftest :compress.1 (compress "")
+  #(120 156 3 0 0 0 0 1) 8)
+(deftest :compress.2  (compress "test")
+  #(120 156 43 73 45 46 1 0 4 93 1 193) 12)
+(deftest :compress.3 (compress "test2")
+  #(120 156 43 73 45 46 49 2 0 6 80 1 243) 13)
 
 (defun compress-uncompress (str)
   (multiple-value-bind (compressed len) (compress str)
@@ -89,6 +87,6 @@
       uncompressed)))
 
 
-(deftest uncompress.1 "" "")
-(deftest uncompress.2 "test" "test")
-(deftest uncompress.3 "test2" "test2")
+(deftest :uncompress.1 "" "")
+(deftest :uncompress.2 "test" "test")
+(deftest :uncompress.3 "test2" "test2")