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

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/codeigniter/helpers/array_helper_test.php b/tests/codeigniter/helpers/array_helper_test.php
index 5a9958971..b2409c330 100644
--- a/tests/codeigniter/helpers/array_helper_test.php
+++ b/tests/codeigniter/helpers/array_helper_test.php
@@ -31,15 +31,15 @@ class Array_helper_test extends CI_TestCase {
 		$this->assertEquals('my string', random_element('my string'));
 
 		// Test sending an array
-		$this->assertEquals(TRUE, in_array(random_element($this->my_array), $this->my_array));
+		$this->assertContains(random_element($this->my_array), $this->my_array);
 	}
 
 	// ------------------------------------------------------------------------
 
 	public function test_elements()
 	{
-		$this->assertEquals(TRUE, is_array(elements('test', $this->my_array)));
-		$this->assertEquals(TRUE, is_array(elements('foo', $this->my_array)));
+		$this->assertInternalType('array', elements('test', $this->my_array));
+		$this->assertInternalType('array', elements('foo', $this->my_array));
 	}
 
-}
\ No newline at end of file
+}