summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter/libraries/Encryption_test.php
diff options
context:
space:
mode:
authorAndrew <browner12@gmail.com>2014-02-17 19:24:00 +0100
committerAndrew <browner12@gmail.com>2014-02-17 19:24:00 +0100
commit63cb46b94c4dda33e036643fbca3d94e0ba079f0 (patch)
treea8bc36fa23e3a7de491223c896d9aadaf4e8c408 /tests/codeigniter/libraries/Encryption_test.php
parentb6d8b962e44202a74c9b9321a4a53f61a753fccf (diff)
parentffe8aded4d2210759fce3427ed04893e6c655006 (diff)
Merge branch 'develop' into patch-1
Diffstat (limited to 'tests/codeigniter/libraries/Encryption_test.php')
-rw-r--r--tests/codeigniter/libraries/Encryption_test.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/codeigniter/libraries/Encryption_test.php b/tests/codeigniter/libraries/Encryption_test.php
index 54db2b42d..a8b5bc81e 100644
--- a/tests/codeigniter/libraries/Encryption_test.php
+++ b/tests/codeigniter/libraries/Encryption_test.php
@@ -179,6 +179,9 @@ class Encryption_test extends CI_TestCase {
* Testing the three methods separately is not realistic as they are
* designed to work together. A more thorough test for initialize()
* though is the OpenSSL/MCrypt compatibility test.
+ *
+ * @depends test_hkdf
+ * @depends test__get_params
*/
public function test_initialize_encrypt_decrypt()
{
@@ -202,6 +205,8 @@ class Encryption_test extends CI_TestCase {
/**
* encrypt(), decrypt test with custom parameters
+ *
+ * @depends test___get_params
*/
public function test_encrypt_decrypt_custom()
{
@@ -239,7 +244,7 @@ class Encryption_test extends CI_TestCase {
{
if ($this->encryption->drivers['mcrypt'] === FALSE)
{
- return $this->markTestAsSkipped('Cannot test MCrypt because it is not available.');
+ return $this->markTestSkipped('Cannot test MCrypt because it is not available.');
}
$this->assertTrue(is_resource($this->encryption->__driver_get_handle('mcrypt', 'rijndael-128', 'cbc')));
@@ -254,7 +259,7 @@ class Encryption_test extends CI_TestCase {
{
if ($this->encryption->drivers['openssl'] === FALSE)
{
- return $this->markTestAsSkipped('Cannot test OpenSSL because it is not available.');
+ return $this->markTestSkipped('Cannot test OpenSSL because it is not available.');
}
$this->assertEquals('aes-128-cbc', $this->encryption->__driver_get_handle('openssl', 'aes-128', 'cbc'));
@@ -272,7 +277,7 @@ class Encryption_test extends CI_TestCase {
{
if ( ! $this->encryption->drivers['mcrypt'] OR ! $this->encryption->drivers['openssl'])
{
- $this->markTestAsSkipped('Both MCrypt and OpenSSL support are required for portability tests.');
+ $this->markTestSkipped('Both MCrypt and OpenSSL support are required for portability tests.');
return;
}