Refactoring tests

tests/codeigniter/core/Benchmark_test.php

@@ -15,7 +15,7 @@ public function test_mark()
 
 		$this->benchmark->mark('code_start');
 
-		$this->assertEquals(1, count($this->benchmark->marker));
+		$this->assertCount(1, $this->benchmark->marker);
 		$this->assertArrayHasKey('code_start', $this->benchmark->marker);
 	}
 
@@ -64,4 +64,4 @@ public function test_memory_usage()
 		$this->assertEquals('{memory_usage}', $this->benchmark->memory_usage());
 	}
 
-}
+}

tests/codeigniter/core/Common_test.php

@@ -4,8 +4,8 @@ class Common_test extends CI_TestCase {
 
 	public function test_is_php()
 	{
-		$this->assertEquals(TRUE, is_php('1.2.0'));
-		$this->assertEquals(FALSE, is_php('9999.9.9'));
+		$this->assertTrue(is_php('1.2.0'));
+		$this->assertFalse(is_php('9999.9.9'));
 	}
 
 	// ------------------------------------------------------------------------
@@ -66,4 +66,4 @@ public function test_remove_invisible_characters()
 		$removed_string = 'Here is a string containing url_encoded invisible text.';
 		$this->assertEquals($removed_string, remove_invisible_characters($raw_string));
 	}
-}
+}

tests/codeigniter/core/Input_test.php

@@ -20,8 +20,8 @@ public function set_up()
 
 	public function test_get_not_exists()
 	{
-		$this->assertTrue($this->input->get() === array());
-		$this->assertTrue($this->input->get('foo') === NULL);
+		$this->assertSame(array(), $this->input->get());
+		$this->assertNull($this->input->get('foo'));
 	}
 
 	// --------------------------------------------------------------------
@@ -51,8 +51,8 @@ public function test_get_exist_with_xss_clean()
 
 	public function test_post_not_exists()
 	{
-		$this->assertTrue($this->input->post() === array());
-		$this->assertTrue($this->input->post('foo') === NULL);
+		$this->assertSame(array(), $this->input->post());
+		$this->assertNull($this->input->post('foo'));
 	}
 
 	// --------------------------------------------------------------------

tests/codeigniter/core/Log_test.php

@@ -28,7 +28,7 @@ public function test_configuration()
 		$this->assertEquals($date_fmt->getValue($instance), 'd.m.Y');
 		$this->assertEquals($file_ext->getValue($instance), 'php');
 		$this->assertEquals($file_perms->getValue($instance), 0644);
-		$this->assertEquals($enabled->getValue($instance), FALSE);
+		$this->assertFalse($enabled->getValue($instance));
 
 		$this->ci_set_config('log_path', '');
 		$this->ci_set_config('log_threshold', '0');
@@ -60,4 +60,4 @@ public function test_format_line()
 			"LEVEL - Timestamp --> Message\n"
 		);
 	}
-}
+}

tests/codeigniter/core/Security_test.php

@@ -253,7 +253,7 @@ public function test_xss_hash()
 		// Perform hash
 		$this->security->xss_hash();
 
-		$this->assertTrue(preg_match('#^[0-9a-f]{32}$#iS', $this->security->xss_hash) === 1);
+		$this->assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
 	}
 
 	// --------------------------------------------------------------------

tests/codeigniter/core/Utf8_test.php

@@ -59,7 +59,7 @@ public function test_clean_string()
 		elseif (ICONV_ENABLED)
 		{
 			// This is a known issue, iconv doesn't always work with //IGNORE
-			$this->assertTrue(in_array($utf8->clean_string($illegal_utf8), array('тест', ''), TRUE));
+			$this->assertContains($utf8->clean_string($illegal_utf8), array('тест', ''));
 		}
 		else
 		{

tests/codeigniter/core/compat/password_test.php

@@ -156,4 +156,4 @@ public function test_password_verify()
 		$this->assertTrue(password_verify('rasmuslerdorf', '$2a$07$usesomesillystringfore2uDLvp1Ii2e./U9C8sBjqp8I90dH6hi'));
 	}
 
-}
+}

tests/codeigniter/database/DB_test.php

@@ -36,8 +36,8 @@ public function test_db_valid()
 
 		$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 @@ public function test_db_failover()
 		$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);
 	}
 */
 
-}
+}

tests/codeigniter/database/query_builder/distinct_test.php

@@ -27,7 +27,7 @@ public function test_distinct()
 					->get('user')
 					->result_array();
 
-		$this->assertEquals(3, count($users));
+		$this->assertCount(3, $users);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/empty_test.php

@@ -25,7 +25,7 @@ public function test_empty_table()
 		// Check initial record
 		$jobs = $this->db->get('job')->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 
 		// Do the empty
 		$this->db->empty_table('job');
@@ -36,4 +36,4 @@ public function test_empty_table()
 		$this->assertEmpty($jobs->result_array());
 	}
 
-}
+}

tests/codeigniter/database/query_builder/escape_test.php

@@ -37,7 +37,7 @@ public function test_escape_like_percent_sign()
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(1, count($res));
+		$this->assertCount(1, $res);
 	}
 
 	// ------------------------------------------------------------------------
@@ -62,7 +62,7 @@ public function test_escape_like_backslash_sign()
 		$res = $this->db->query($sql)->result_array();
 
 		// Check the result
-		$this->assertEquals(2, count($res));
+		$this->assertCount(2, $res);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/from_test.php

@@ -26,7 +26,7 @@ public function test_from_simple()
 					->get()
 					->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -46,4 +46,4 @@ public function test_from_with_where()
 		$this->assertEquals('Awesome job, but sometimes makes you bored', $job1->description);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/group_test.php

@@ -28,7 +28,7 @@ public function test_group_by()
 			->get()
 			->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -45,7 +45,7 @@ public function test_having_by()
 			->get()
 			->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -62,7 +62,7 @@ public function test_having_in()
 			->get()
 			->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -80,7 +80,7 @@ public function test_or_having_in()
 			->get()
 			->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -97,7 +97,7 @@ public function test_having_not_in()
 			->get()
 			->result_array();
 
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -115,6 +115,6 @@ public function test_or_having_not_in()
 			->get()
 			->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 }

tests/codeigniter/database/query_builder/like_test.php

@@ -44,7 +44,7 @@ public function test_or_like()
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Developer', $jobs[0]['name']);
 		$this->assertEquals('Politician', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -62,7 +62,7 @@ public function test_not_like()
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Accountant', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -81,7 +81,7 @@ public function test_or_not_like()
 							->result_array();
 
 		// Check the result
-		$this->assertEquals(3, count($jobs));
+		$this->assertCount(3, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Accountant', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -99,8 +99,8 @@ public function test_like_spaces_and_tabs()
 		$spaces = $this->db->like('value', '   ')->get('misc')->result_array();
 		$tabs = $this->db->like('value', "\t")->get('misc')->result_array();
 
-		$this->assertEquals(1, count($spaces));
-		$this->assertEquals(1, count($tabs));
+		$this->assertCount(1, $spaces);
+		$this->assertCount(1, $tabs);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/limit_test.php

@@ -26,7 +26,7 @@ public function test_limit()
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 	}
 
 	// ------------------------------------------------------------------------
@@ -40,9 +40,9 @@ public function test_limit_and_offset()
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(2, count($jobs));
+		$this->assertCount(2, $jobs);
 		$this->assertEquals('Accountant', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/order_test.php

@@ -27,7 +27,7 @@ public function test_order_ascending()
 		                      ->result_array();
 
 		// Check the result
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 		$this->assertEquals('Accountant', $jobs[0]['name']);
 		$this->assertEquals('Developer', $jobs[1]['name']);
 		$this->assertEquals('Musician', $jobs[2]['name']);
@@ -45,11 +45,11 @@ public function test_order_descending()
 		                      ->get('job')
 		                      ->result_array();
 
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 		$this->assertEquals('Politician', $jobs[0]['name']);
 		$this->assertEquals('Musician', $jobs[1]['name']);
 		$this->assertEquals('Developer', $jobs[2]['name']);
 		$this->assertEquals('Accountant', $jobs[3]['name']);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/select_test.php

@@ -28,8 +28,8 @@ public function test_select_only_one_collumn()
 
 		// Check rows item
 		$this->assertArrayHasKey('name',$jobs_name[0]);
-		$this->assertFalse(array_key_exists('id', $jobs_name[0]));
-		$this->assertFalse(array_key_exists('description', $jobs_name[0]));
+		$this->assertArrayNotHasKey('id', $jobs_name[0]);
+		$this->assertArrayNotHasKey('description', $jobs_name[0]);
 	}
 
 	// ------------------------------------------------------------------------
@@ -92,4 +92,4 @@ public function test_select_sum()
 		$this->assertEquals('10', $job_sum->id);
 	}
 
-}
+}

tests/codeigniter/database/query_builder/truncate_test.php

@@ -24,7 +24,7 @@ public function test_truncate()
 	{
 		// Check initial record
 		$jobs = $this->db->get('job')->result_array();
-		$this->assertEquals(4, count($jobs));
+		$this->assertCount(4, $jobs);
 
 		// Do the empty
 		$this->db->truncate('job');
@@ -43,7 +43,7 @@ public function test_truncate_with_from()
 	{
 		// Check initial record
 		$users = $this->db->get('user')->result_array();
-		$this->assertEquals(4, count($users));
+		$this->assertCount(4, $users);
 
 		// Do the empty
 		$this->db->from('user')->truncate();
@@ -53,4 +53,4 @@ public function test_truncate_with_from()
 		$this->assertEmpty($users->result_array());
 	}
 
-}
+}