X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fclient021.phpt;h=cad16e0dcb5576709b1983f80efab8878c733eb6;hp=ebb9b0e8003eba5c826625e952de2233fa19a6ae;hb=c2c8bf7edb4119bcf7c837fc24516dc76af661eb;hpb=4dc1747e462dff009e7cf1ef63dfb2279a9e37b5

diff --git a/tests/client021.phpt b/tests/client021.phpt
index ebb9b0e..cad16e0 100644
--- a/tests/client021.phpt
+++ b/tests/client021.phpt
@@ -1,12 +1,12 @@
 --TEST--
 client cookies
 --SKIPIF--
-<?php 
+<?php
 include "skipif.inc";
 skip_client_test();
 ?>
 --FILE--
-<?php 
+<?php
 
 include "helper/server.inc";
 
@@ -17,6 +17,12 @@ function dump($f) {
 	readfile($f);
 }
 
+function cookies($client) {
+	foreach ($client->getResponse()->getCookies() as $cookie) {
+		echo trim($cookie), "\n";
+	}
+}
+
 $tmpfile = tempnam(sys_get_temp_dir(), "cookie.");
 $request = new http\Client\Request("GET", "http://localhost");
 $request->setOptions(array("cookiestore" => $tmpfile));
@@ -24,98 +30,62 @@ $request->setOptions(array("cookiestore" => $tmpfile));
 server("cookie.inc", function($port) use($request, $tmpfile) {
 	$request->setOptions(array("port" => $port));
 	$client = new http\Client;
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
 });
 server("cookie.inc", function($port) use($request, $tmpfile) {
 	$request->setOptions(array("port" => $port));
 	$client = new http\Client;
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 #dump($tmpfile);
 });
-	
+
 server("cookie.inc", function($port) use($request, $tmpfile) {
 	$request->setOptions(array("port" => $port, "cookiesession" => true));
 	$client = new http\Client;
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
 });
-	
+
 server("cookie.inc", function($port) use($request, $tmpfile) {
 	$request->setOptions(array("port" => $port, "cookiesession" => false));
 	$client = new http\Client;
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
-	echo $client->requeue($request)->send()->getResponse();
+	cookies($client->requeue($request)->send());
 dump($tmpfile);
 });
-	
+
 unlink($tmpfile);
 
 ?>
 ===DONE===
 --EXPECT--
 Test
-HTTP/1.1 200 OK
-Set-Cookie: counter=1;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=2;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=3;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=4;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=5;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=6;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=1;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=1;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=1;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=2;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=3;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
-HTTP/1.1 200 OK
-Set-Cookie: counter=4;
-Etag: ""
-X-Original-Transfer-Encoding: chunked
+counter=1;
+counter=2;
+counter=3;
+counter=4;
+counter=5;
+counter=6;
+counter=1;
+counter=1;
+counter=1;
+counter=2;
+counter=3;
+counter=4;
 ===DONE===