- fix previous commit and adjust tests

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

diff --git a/tests/HttpRequestPool_001.phpt b/tests/HttpRequestPool_001.phpt
index b3a035b8389d794857e64e8c5c968ad45b95553a..9f20fe4ee849fa631f391205f7f1effc7133cc3c 100644 (file)
--- a/tests/HttpRequestPool_001.phpt
+++ b/tests/HttpRequestPool_001.phpt
@@ -3,41 +3,53 @@ HttpRequestPool
 --SKIPIF--
 <?php
 include 'skip.inc';
-(5 > (int) PHP_VERSION) and die('skip PHP5 is required for Http classes');
+checkver(5);
+checkcls('HttpRequestPool');
+checkurl('www.php.net');
+checkurl('de.php.net');
+checkurl('ch.php.net');
+checkurl('at.php.net');
+checkurl('dev.iworks.at');
 ?>
 --FILE--
 <?php
-$urls = array(
-    'http://www.php.net',
-    'http://pear.php.net',
-    'http://pecl.php.net'
+echo "-TEST\n";
+$pool = new HttpRequestPool(
+    new HttpRequest('http://www.php.net/', HTTP_METH_HEAD),
+    new HttpRequest('http://at.php.net/', HTTP_METH_HEAD),
+    new HttpRequest('http://de.php.net/', HTTP_METH_HEAD),
+    new HttpRequest('http://ch.php.net/', HTTP_METH_HEAD),
+    $post = new HttpRequest('http://dev.iworks.at/.print_request.php', HTTP_METH_POST)
 );
-$pool = new HttpRequestPool;
-foreach ($urls as $url) {
-    $pool->attach($reqs[] = new HttpRequest($url, HTTP_HEAD));
-}
+$post->addPostFields(array('a'=>1,'b'=>2)) ;
 $pool->send();
-foreach ($reqs as $req) {
-    echo $req->getResponseInfo('effective_url'), '=',
+foreach ($pool as $req) {
+    echo $req->getUrl(), '=',
         $req->getResponseCode(), ':',
         $req->getResponseMessage()->getResponseCode(), "\n";
-    $pool->detach($req);
-    $pool->attach($req);
 }
-try {
-       $pool->send();
-} catch (HttpException $ex) {
-       echo "Catched\n";
+foreach ($pool as $req) {
+       try {
+               $pool->attach(new HttpRequest('http://foo.bar'));
+       } catch (HttpRequestPoolException $x) {
+               echo ".\n";
+       }
+}
+foreach ($pool as $req) {
+       $pool->detach($req);
 }
-$pool->reset();
 echo "Done\n";
 ?>
 --EXPECTF--
-Content-type: text/html
-X-Powered-By: PHP/%s
-
+%sTEST
 http://www.php.net/=200:200
-http://pear.php.net/=200:200
-http://pecl.php.net/=200:200
-Catched
+http://at.php.net/=200:200
+http://de.php.net/=200:200
+http://ch.php.net/=200:200
+http://dev.iworks.at/.print_request.php=200:200
+.
+.
+.
+.
+.
 Done