diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
commit | b30a7c0d53c5dae5dab2311f777d67f639a5cee4 (patch) | |
tree | d518bc938a5d8458a55277d9adaa7d8fdcc9f1d3 /tests/codeigniter/database/query_builder/from_test.php | |
parent | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (diff) | |
parent | 4e9538fe19b09c0dc588542cfb7f793348b83bf7 (diff) |
Merge upstream
Diffstat (limited to 'tests/codeigniter/database/query_builder/from_test.php')
-rw-r--r-- | tests/codeigniter/database/query_builder/from_test.php | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/codeigniter/database/query_builder/from_test.php b/tests/codeigniter/database/query_builder/from_test.php index 95ae4dfdb..7aaae348d 100644 --- a/tests/codeigniter/database/query_builder/from_test.php +++ b/tests/codeigniter/database/query_builder/from_test.php @@ -23,10 +23,9 @@ class From_test extends CI_TestCase { public function test_from_simple() { $jobs = $this->db->from('job') - ->get() - ->result_array(); - - // Check items + ->get() + ->result_array(); + $this->assertEquals(4, count($jobs)); } @@ -38,14 +37,13 @@ class From_test extends CI_TestCase { public function test_from_with_where() { $job1 = $this->db->from('job') - ->where('id', 1) - ->get() - ->row(); - - // Check the result + ->where('id', 1) + ->get() + ->row(); + $this->assertEquals('1', $job1->id); $this->assertEquals('Developer', $job1->name); $this->assertEquals('Awesome job, but sometimes makes you bored', $job1->description); } - + }
\ No newline at end of file |