diff options
Diffstat (limited to 'tests/codeigniter')
| -rw-r--r-- | tests/codeigniter/libraries/Encryption_test.php | 11 | ||||
| -rw-r--r-- | tests/codeigniter/libraries/Table_test.php | 4 |
2 files changed, 10 insertions, 5 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; } diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php index 4bfbdd623..8e7452474 100644 --- a/tests/codeigniter/libraries/Table_test.php +++ b/tests/codeigniter/libraries/Table_test.php @@ -34,7 +34,7 @@ class Table_test extends CI_TestCase { } /* - * @depends testPrepArgs + * @depends test_prep_args */ public function test_set_heading() { @@ -55,7 +55,7 @@ class Table_test extends CI_TestCase { } /* - * @depends testPrepArgs + * @depends test_prep_args */ public function test_add_row() { |