holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test had no assertions

Browse Source
This commit is contained in:
nathangray 2017-10-17 13:29:17 +02:00
parent 8b1a8d38f5
commit 6fad74c710
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/src/loader/test/SecurityTest.php
View File

@ -164,16 +164,31 @@ class SecurityTest extends TestCase {
* @param boolean $result If we expect the string to fail or not * @param boolean $result If we expect the string to fail or not
* *
* @dataProvider unserializeProvider * @dataProvider unserializeProvider
* @requires PHP < 7
*/ */
public function testUnserialize($str, $result) public function testObjectsCannotBeUnserializedInPhp5($str, $result)
{
$r=@php_safe_unserialize($str);
$this->assertSame($result, $r, 'Save unserialize failed');
}
/**
* Test safe unserialization
*
* @param String $str Serialized string to be checked
* @param boolean $result If we expect the string to fail or not
*
* @dataProvider unserializeProvider
* @requires PHP 7
*/
public function testObjectsCannotBeUnserializedInPhp7($str, $result)
{ {
$r=@php_safe_unserialize($str); $r=@php_safe_unserialize($str);
if((bool)($r) !== $result) if((bool)($r) !== $result)
{ {
if (!$result) if (!$result)
{
if (PHP_VERSION >= 7)
{ {
$matches = null; $matches = null;
if (preg_match_all('/([^ ]+) Object\(/', array2string($r), $matches)) if (preg_match_all('/([^ ]+) Object\(/', array2string($r), $matches))
@ -188,15 +203,13 @@ class SecurityTest extends TestCase {
} }
} }
else else
{
$this->fail($str);
}
}
else
{ {
$this->fail("false positive: $str"); $this->fail("false positive: $str");
} }
} }
// Avoid this test getting reported as no assertions, we do the testing
// in the foreach loop
$this->assertTrue(true);
} }
/** /**