diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed tests when OpenSsl is not enabled in PHP, renamed a missnamed test, added missing license doc blocks

Browse Source
This commit is contained in:
Fabien Potencier 2012-10-28 07:37:44 +01:00
parent ca567b5109
commit aecc9b12a3
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Security/Tests/Core/Util/ClassUtilsTest.php
View File

@ -1,5 +1,14 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Security\Tests\Core\Util
{
use Symfony\Component\Security\Core\Util\ClassUtils;

31
src/Symfony/Component/Security/Tests/Core/Util/SecureRandomTest.php
View File

@ -1,5 +1,14 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Security\Tests\Core\Util;
use Symfony\Component\Security\Core\Util\NullSeedProvider;
@ -145,9 +154,14 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
{
$secureRandoms = array();
// openssl with fallback
// openssl
$secureRandom = new SecureRandom();
$secureRandoms[] = array($secureRandom);
// only add if openssl is indeed present
if ($this->hasOpenSsl($secureRandom)) {
$secureRandoms[] = array($secureRandom);
} else {
$this->markTestSkipped('OpenSSL is not available');
}
// no-openssl with custom seed provider
$secureRandom = new SecureRandom(sys_get_temp_dir().'/_sf2.seed');
@ -162,6 +176,19 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase
$ref = new \ReflectionProperty($secureRandom, 'useOpenSsl');
$ref->setAccessible(true);
$ref->setValue($secureRandom, false);
$ref->setAccessible(false);
}
protected function hasOpenSsl($secureRandom)
{
$ref = new \ReflectionProperty($secureRandom, 'useOpenSsl');
$ref->setAccessible(true);
$ret = $ref->getValue($secureRandom);
$ref->setAccessible(false);
return $ret;
}
private function getBitSequence($secureRandom, $length)

11
src/Symfony/Component/Security/Tests/Core/Util/StringTest.php → src/Symfony/Component/Security/Tests/Core/Util/StringUtilsTest.php
View File

@ -1,10 +1,19 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Security\Tests\Core\Util;
use Symfony\Component\Security\Core\Util\StringUtils;
class StringTest extends \PHPUnit_Framework_TestCase
class StringUtilsTest extends \PHPUnit_Framework_TestCase
{
public function testEquals()
{