fix tests

diff --git a/tests/HttpMessage_003.phpt b/tests/HttpMessage_003.phpt
index f0afbb97851bc60a986900147bf20ac870a2ef1a..831b4da888d809f06cc8a63631d6e6107ec464e7 100644 (file)
--- a/tests/HttpMessage_003.phpt
+++ b/tests/HttpMessage_003.phpt
@@ -44,26 +44,26 @@ Content-Length: 1
 X
 "
 object(HttpMessage)#%d (%d) {
-  ["type%sprotected%s]=>
+  ["type%s]=>
   int(2)
-  ["body%sprotected%s]=>
+  ["body%s]=>
   string(0) ""
-  ["requestMethod%sprotected%s]=>
+  ["requestMethod%s]=>
   string(0) ""
-  ["requestUrl%sprotected%s]=>
+  ["requestUrl%s]=>
   string(0) ""
-  ["responseStatus%sprotected%s]=>
+  ["responseStatus%s]=>
   string(2) "Ok"
-  ["responseCode%sprotected%s]=>
+  ["responseCode%s]=>
   int(200)
-  ["httpVersion%sprotected%s]=>
+  ["httpVersion%s]=>
   float(1.1)
-  ["headers%sprotected%s]=>
+  ["headers%s]=>
   array(1) {
     ["Server"]=>
     string(9) "Funky/1.0"
   }
-  ["parentMessage%sprotected%s]=>
+  ["parentMessage%s]=>
   NULL
 }
 int(1)

diff --git a/tests/HttpQueryString_001.phpt b/tests/HttpQueryString_001.phpt
index 9958e1af05d06e27eec18e2f8ff521474d139337..b32942939e426b4324f672172beb042e82166da3 100644 (file)
--- a/tests/HttpQueryString_001.phpt
+++ b/tests/HttpQueryString_001.phpt
@@ -72,7 +72,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray%sprivate%s]=>
+  ["queryArray%s]=>
   &array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -91,7 +91,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString%sprivate%s]=>
+  ["queryString%s]=>
   &string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_002.phpt b/tests/HttpQueryString_002.phpt
index 3eba39b08711f1544d0f83f10bc6104420306852..f70cbac4aa0b6123a3a72d5b2fe234d73b30336e 100644 (file)
--- a/tests/HttpQueryString_002.phpt
+++ b/tests/HttpQueryString_002.phpt
@@ -68,7 +68,7 @@ object(stdClass)#%d (%d) {
   int(3)
 }
 object(HttpQueryString)#1 (2) {
-  ["queryArray%sprivate%s]=>
+  ["queryArray%s]=>
   array(3) {
     ["c"]=>
     string(3) "3.4"
@@ -87,7 +87,7 @@ object(HttpQueryString)#1 (2) {
       string(1) "2"
     }
   }
-  ["queryString%sprivate%s]=>
+  ["queryString%s]=>
   string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2"
 }
 array(3) {

diff --git a/tests/HttpQueryString_004.phpt b/tests/HttpQueryString_004.phpt
index c7db402493e1440119dc0b945d4707197f1d39a2..66d7ec5fbb6918feb4ed3b1ca46294ea357056ba 100644 (file)
--- a/tests/HttpQueryString_004.phpt
+++ b/tests/HttpQueryString_004.phpt
@@ -28,7 +28,7 @@ echo "Done\n";
 --EXPECTF--
 %aTEST
 object(HttpQueryString)#3 (2) {
-  ["queryArray%sprivate%s]=>
+  ["queryArray%s]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -36,11 +36,11 @@ object(HttpQueryString)#3 (2) {
       int(1)
     }
   }
-  ["queryString%sprivate%s]=>
+  ["queryString%s]=>
   string(14) "bar%5Bbaz%5D=1"
 }
 object(HttpQueryString)#4 (2) {
-  ["queryArray%sprivate%s]=>
+  ["queryArray%s]=>
   array(1) {
     ["bar"]=>
     array(1) {
@@ -48,7 +48,7 @@ object(HttpQueryString)#4 (2) {
       int(0)
     }
   }
-  ["queryString%sprivate%s]=>
+  ["queryString%s]=>
   string(14) "bar%5Bbaz%5D=0"
 }
 Done

diff --git a/tests/HttpRequestPool_007.phpt b/tests/HttpRequestPool_007.phpt
index 29a2505d2c33fc08040ff6d00bae91c58447798d..b1acafc1d5e488f11571fc5684c7b4393185eff0 100644 (file)
--- a/tests/HttpRequestPool_007.phpt
+++ b/tests/HttpRequestPool_007.phpt
@@ -28,7 +28,7 @@ class Request extends HttpRequest
                $c = $this->getResponseCode();
                $b = $this->getResponseBody();
                
-               printf("%d %a %d\n", $c, $u, strlen($b));
+               printf("%d %s %d\n", $c, $u, strlen($b));
                
                if ($c == 200 && $this->pool->dir) {
                        file_put_contents($this->pool->all[$u], $b);
@@ -113,54 +113,54 @@ echo "Done\n";
 ?>
 --EXPECTF--
 %aTEST
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
-%d %a %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
+%d %s %d
 Elapsed: %fs
 Done

diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt
index b00c649e9f59863a122937ed8a17eb9fd8b81c92..736df23903c2680f5eb9c55f7286fd3c31f9fb38 100644 (file)
--- a/tests/HttpRequest_002.phpt
+++ b/tests/HttpRequest_002.phpt
@@ -48,7 +48,7 @@ Array
     [content_length_download] => %d
     [content_length_upload] => %d
     [starttransfer_time] => %f
-    [content_type] => text/html
+    [content_type] => %s
     [redirect_time] => %d
     [redirect_count] => %d
     [connect_code] => %d
@@ -56,10 +56,10 @@ Array
     [proxyauth_avail] => %d
     [os_errno] => %d
     [num_connects] => %d
-    [ssl_engines] => Array%a
-
-    [cookies] => Array%a
-
+    [ssl_engines] => Array
+    %a
+    [cookies] => Array
+    %a
     [error] => 
 )
 Array