git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for issue #33: excessive usage of numeric charset entities when converting utf8...
[plcapi.git]
/
tests
/
4LocalhostMultiTest.php
diff --git
a/tests/4LocalhostMultiTest.php
b/tests/4LocalhostMultiTest.php
index
5ef6a3c
..
e5d365a
100644
(file)
--- a/
tests/4LocalhostMultiTest.php
+++ b/
tests/4LocalhostMultiTest.php
@@
-7,6
+7,10
@@
include_once __DIR__ . '/parse_args.php';
include_once __DIR__ . '/3LocalhostTest.php';
include_once __DIR__ . '/3LocalhostTest.php';
+/**
+ * Tests which stress http features of the library.
+ * Each of these tests iterates over (almost) all of the 'localhost' tests
+ */
class LocalhostMultiTest extends LocalhostTest
{
/**
class LocalhostMultiTest extends LocalhostTest
{
/**
@@
-15,7
+19,7
@@
class LocalhostMultiTest extends LocalhostTest
*/
function _runtests()
{
*/
function _runtests()
{
- $unsafeMethods = array('testHttps', 'testCatchExceptions', 'testUtf8Method');
+ $unsafeMethods = array('testHttps', 'testCatchExceptions', 'testUtf8Method'
, 'testServerComments', 'testExoticCharsetsRequests', 'testExoticCharsetsRequests2', 'testExoticCharsetsRequests3'
);
foreach(get_class_methods('LocalhostTest') as $method)
{
if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
foreach(get_class_methods('LocalhostTest') as $method)
{
if(strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
@@
-34,7
+38,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('gzdeflate'))
{
{
if(!function_exists('gzdeflate'))
{
- $this->
fail
('Zlib missing: cannot test deflate functionality');
+ $this->
markTestSkipped
('Zlib missing: cannot test deflate functionality');
return;
}
$this->client->accepted_compression = array('deflate');
return;
}
$this->client->accepted_compression = array('deflate');
@@
-46,7
+50,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('gzdeflate'))
{
{
if(!function_exists('gzdeflate'))
{
- $this->
fail
('Zlib missing: cannot test gzip functionality');
+ $this->
markTestSkipped
('Zlib missing: cannot test gzip functionality');
return;
}
$this->client->accepted_compression = array('gzip');
return;
}
$this->client->accepted_compression = array('gzip');
@@
-58,7
+62,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test http 1.1');
+ $this->
markTestSkipped
('CURL missing: cannot test http 1.1');
return;
}
$this->method = 'http11';
return;
}
$this->method = 'http11';
@@
-74,14
+78,14
@@
class LocalhostMultiTest extends LocalhostTest
$this->_runtests();
}
else
$this->_runtests();
}
else
- $this->
fail
('PROXY definition missing: cannot test proxy');
+ $this->
markTestSkipped
('PROXY definition missing: cannot test proxy');
}
function testHttp11()
{
if(!function_exists('curl_init'))
{
}
function testHttp11()
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test http 1.1');
+ $this->
markTestSkipped
('CURL missing: cannot test http 1.1');
return;
}
$this->method = 'http11'; // not an error the double assignment!
return;
}
$this->method = 'http11'; // not an error the double assignment!
@@
-96,7
+100,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test http 1.1');
+ $this->
markTestSkipped
('CURL missing: cannot test http 1.1');
return;
}
$this->method = 'http11'; // not an error the double assignment!
return;
}
$this->method = 'http11'; // not an error the double assignment!
@@
-111,7
+115,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test http 1.1');
+ $this->
markTestSkipped
('CURL missing: cannot test http 1.1');
return;
}
$this->method = 'http11'; // not an error the double assignment!
return;
}
$this->method = 'http11'; // not an error the double assignment!
@@
-126,12
+130,12
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test http 1.1 w. proxy');
+ $this->
markTestSkipped
('CURL missing: cannot test http 1.1 w. proxy');
return;
}
else if ($this->args['PROXYSERVER'] == '')
{
return;
}
else if ($this->args['PROXYSERVER'] == '')
{
- $this->
fail
('PROXY definition missing: cannot test proxy w. http 1.1');
+ $this->
markTestSkipped
('PROXY definition missing: cannot test proxy w. http 1.1');
return;
}
$this->method = 'http11'; // not an error the double assignment!
return;
}
$this->method = 'http11'; // not an error the double assignment!
@@
-147,7
+151,7
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test https functionality');
+ $this->
markTestSkipped
('CURL missing: cannot test https functionality');
return;
}
$this->client->server = $this->args['HTTPSSERVER'];
return;
}
$this->client->server = $this->args['HTTPSSERVER'];
@@
-164,12
+168,12
@@
class LocalhostMultiTest extends LocalhostTest
{
if(!function_exists('curl_init'))
{
{
if(!function_exists('curl_init'))
{
- $this->
fail
('CURL missing: cannot test https functionality');
+ $this->
markTestSkipped
('CURL missing: cannot test https functionality');
return;
}
else if ($this->args['PROXYSERVER'] == '')
{
return;
}
else if ($this->args['PROXYSERVER'] == '')
{
- $this->
fail
('PROXY definition missing: cannot test proxy w. http 1.1');
+ $this->
markTestSkipped
('PROXY definition missing: cannot test proxy w. http 1.1');
return;
}
$this->client->server = $this->args['HTTPSSERVER'];
return;
}
$this->client->server = $this->args['HTTPSSERVER'];