Updated tests

phalcon · Feb 2, 2014 · b092106 · b092106
1 parent 8aa0f8b
commit b092106
Show file tree

Hide file tree

Showing 5 changed files with 526 additions and 526 deletions.
diff --git a/php-tests/tests/Phalcon/Crypt/UnitTest.php b/php-tests/tests/Phalcon/Crypt/UnitTest.php
@@ -23,14 +23,11 @@
 
 namespace Phalcon\Test\Crypt;
 
+/**
+ * @requires extension mcrypt
+ */
 class UnitTest extends \Phalcon\Test\UnitTestCase
 {
-	protected function setUp()
-	{
-		$this->checkExtension('mcrypt');
-		parent::setUp();
-	}
-
 	public function testEncryption()
 	{
 		$tests = array(

diff --git a/php-tests/tests/Phalcon/Security/UnitTest.php b/php-tests/tests/Phalcon/Security/UnitTest.php
@@ -22,27 +22,18 @@
 
 namespace Phalcon\Test\Security;
 
-use \Phalcon\Test\UnitTestCase as PhTestUnitTestCase;
-
-use \Phalcon\Security as PhSecurity;
-
-class UnitTest extends PhTestUnitTestCase
+class UnitTest extends \Phalcon\Test\UnitTestCase
 {
 	/**
 	 * Tests the hash for the security component
 	 *
 	 * @author Nikos Dimopoulos <nikos@phalconphp.com>
 	 * @since  2013-03-02
+	 * @requires extension openssl
 	 */
 	public function testHash()
 	{
-
-		if (!extension_loaded('openssl')) {
-			$this->markTestSkipped('Warning: openssl extension is not loaded');
-			return;
-		}
-
-		$security = new PhSecurity();
+		$security = new \Phalcon\Security();
 
 		for ($i = 8; $i < 12; $i++) {
 			$hash = $security->hash('a', $i);
@@ -60,14 +51,11 @@ public function testHash()
 	 *
 	 * @author Vladimir Kolesnikov <vladimir@extrememember.com>
 	 * @since 2013-10-08
+	 * @requires function hash_hmac
 	 */
 	public function testComputeHMAC()
 	{
-		if (!function_exists('hash_hmac')) {
-			$this->markTestSkipped('hash extension is required');
-		}
-
-		$s = new \Phalcon\Security;
+		$s = new \Phalcon\Security();
 		$k = md5('test', true);
 		$keys = array(
 			substr($k, 0, strlen($k)/2),