- remove http_compress() and http_uncompress() (deflate/inflate ambiguity)

[m6w6/ext-http] / tests / encodings.phpt

diff --git a/tests/encodings.phpt b/tests/encodings.phpt
index e66eabd8f9298752414a3a34e5caaafd80c92605..1b44ce5f7ffdc6848c30f1178520d0e70982dc88 100644 (file)
--- a/tests/encodings.phpt
+++ b/tests/encodings.phpt
@@ -9,6 +9,7 @@ skipif(!function_exists('http_gzencode'), 'need zlib');
 <?php
 echo "-TEST\n";
 
+set_time_limit(0);
 error_reporting(E_ALL);
 
 $s = '';
@@ -18,29 +19,20 @@ for ($i = 0; $i < 1000000; $i++) {
        $s .= chr(rand(0,255));
 }
 
-/* cannot test ext/zlib against this generated data, 
-   because it will fail with such widely differing binary data */
-
 var_dump($s == http_gzdecode(http_gzencode($s)));
 var_dump($s == http_inflate(http_deflate($s)));
-var_dump($s == http_uncompress(http_compress($s)));
-
-
-$s = "A simple test string, which won't blow up ext/zlib.\n";
-
-var_dump($s == http_gzdecode(gzencode($s)));
-var_dump($s == http_inflate(gzdeflate($s)));
-var_dump($s == http_uncompress(gzcompress($s)));
-
-/* no gzdecode in ext/zlib
-var_dump($s == gzdecode(http_gzencode($s))); */
-var_dump($s == gzinflate(http_deflate($s)));
-var_dump($s == gzuncompress(http_compress($s)));
+var_dump($s == http_inflate(http_deflate($s, -1, true)));
 
 if (extension_loaded('zlib')) {
-       (gzencode($s) == http_gzencode($s)) or print "GZIP Failed\n";
-       (gzdeflate($s) == http_deflate($s)) or print "DEFLATE Failed\n";
-       (gzcompress($s) == http_compress($s)) or print "COMPRESS Failed\n";
+       
+       $s = "A simple test string, which won't blow up ext/zlib.\n";
+       
+       ($s == http_gzdecode(gzencode($s))) or print "GZIP Failed\n";
+       ($s == http_inflate(gzdeflate($s))) or print "DEFLATE Failed\n";
+       ($s == http_inflate(gzcompress($s))) or print "COMPRESS Failed\n";
+       
+       ($s == gzinflate(http_deflate($s))) or print "INFLATE Failed\n";
+       ($s == gzuncompress(http_deflate($s, -1, true))) or print "UNCOMPRESS Failed\n";
 }
 
 echo "Done\n";
@@ -50,9 +42,4 @@ echo "Done\n";
 bool(true)
 bool(true)
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
 Done