Merge pull request #5354 from carusogabriel/refactoring-tests
Refactoring tests
Conflicts resolved:
tests/codeigniter/core/Utf8_test.php
tests/codeigniter/database/query_builder/group_test.php
tests/codeigniter/libraries/Form_validation_test.php
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index dc4fae9..9d53fd6 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -36,8 +36,8 @@
$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER), TRUE);
- $this->assertTrue($db instanceof CI_DB);
- $this->assertTrue($db instanceof CI_DB_Driver);
+ $this->assertInstanceOf('CI_DB', $db);
+ $this->assertInstanceOf('CI_DB_Driver', $db);
}
// ------------------------------------------------------------------------
@@ -53,9 +53,9 @@
$connection = new Mock_Database_DB($config);
$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER.'_failover'), TRUE);
- $this->assertTrue($db instanceof CI_DB);
- $this->assertTrue($db instanceof CI_DB_Driver);
+ $this->assertInstanceOf('CI_DB', $db);
+ $this->assertInstanceOf('CI_DB_Driver', $db);
}
*/
-}
\ No newline at end of file
+}