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/query_builder/escape_test.php b/tests/codeigniter/database/query_builder/escape_test.php
index 27e678f..de6cd0a 100644
--- a/tests/codeigniter/database/query_builder/escape_test.php
+++ b/tests/codeigniter/database/query_builder/escape_test.php
@@ -37,7 +37,7 @@
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(1, count($res));
+		$this->assertCount(1, $res);
 	}
 
 	// ------------------------------------------------------------------------
@@ -62,7 +62,7 @@
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(2, count($res));
+		$this->assertCount(2, $res);
 	}
 
-}
\ No newline at end of file
+}