Merge upstream

1 files changed, 67 insertions, 86 deletions

diff --git a/tests/codeigniter/libraries/Table_test.php b/tests/codeigniter/libraries/Table_test.php
index f5133de1e..edfc83dd0 100644
--- a/tests/codeigniter/libraries/Table_test.php
+++ b/tests/codeigniter/libraries/Table_test.php
@@ -4,43 +4,39 @@ class Table_test extends CI_TestCase {
 
 	public function set_up()
 	{
-		$obj = new StdClass;
+		$obj = new stdClass;
 		$obj->table = new Mock_Libraries_Table();
-		
+
 		$this->ci_instance($obj);
-		
+
 		$this->table = $obj->table;
 	}
 
-	
 	// Setter Methods
 	// --------------------------------------------------------------------
-	
+
 	public function test_set_template()
 	{
 		$this->assertFalse($this->table->set_template('not an array'));
-		
-		$template = array(
-			'a' => 'b'
-		);
-		
+
+		$template = array('a' => 'b');
+
 		$this->table->set_template($template);
 		$this->assertEquals($template, $this->table->template);
 	}
-	
+
 	public function test_set_empty()
 	{
 		$this->table->set_empty('nada');
 		$this->assertEquals('nada', $this->table->empty_cells);
 	}
-	
+
 	public function test_set_caption()
 	{
 		$this->table->set_caption('awesome cap');
 		$this->assertEquals('awesome cap', $this->table->caption);
 	}
-	
-	
+
 	/*
 	 * @depends testPrepArgs
 	 */
@@ -49,9 +45,9 @@ class Table_test extends CI_TestCase {
 		// uses _prep_args internally, so we'll just do a quick
 		// check to verify that func_get_args and prep_args are
 		// being called.
-		
+
 		$this->table->set_heading('name', 'color', 'size');
-		
+
 		$this->assertEquals(
 			array(
 				array('data' => 'name'),
@@ -61,8 +57,7 @@ class Table_test extends CI_TestCase {
 			$this->table->heading
 		);
 	}
-	
-	
+
 	/*
 	 * @depends testPrepArgs
 	 */
@@ -71,13 +66,13 @@ class Table_test extends CI_TestCase {
 		// uses _prep_args internally, so we'll just do a quick
 		// check to verify that func_get_args and prep_args are
 		// being called.
-		
+
 		$this->table->add_row('my', 'pony', 'sings');
 		$this->table->add_row('your', 'pony', 'stinks');
 		$this->table->add_row('my pony', '>', 'your pony');
-		
+
 		$this->assertEquals(count($this->table->rows), 3);
-		
+
 		$this->assertEquals(
 			array(
 				array('data' => 'your'),
@@ -87,11 +82,10 @@ class Table_test extends CI_TestCase {
 			$this->table->rows[1]
 		);
 	}
-	
-	
+
 	// Uility Methods
 	// --------------------------------------------------------------------
-	
+
 	public function test_prep_args()
 	{
 		$expected = array(
@@ -99,7 +93,7 @@ class Table_test extends CI_TestCase {
 			array('data' => 'color'),
 			array('data' => 'size')
 		);
-		
+
 		$this->assertEquals(
 			$expected,
 			$this->table->prep_args(array('name', 'color', 'size'))
@@ -114,7 +108,7 @@ class Table_test extends CI_TestCase {
 			$this->table->prep_args(array('name', 'color', 'size', array('data' => 'weight', 'class' => 'awesome')))
 		);
 	}
-	
+
 	public function test_default_template_keys()
 	{
 		$keys = array(
@@ -126,132 +120,124 @@ class Table_test extends CI_TestCase {
 			'row_alt_start', 'row_alt_end', 'cell_alt_start', 'cell_alt_end',
 			'table_close'
 		);
-		
+
 		foreach ($keys as $key)
 		{
 			$this->assertArrayHasKey($key, $this->table->default_template());
 		}
 	}
-	
+
 	public function test_compile_template()
 	{
 		$this->assertFalse($this->table->set_template('invalid_junk'));
-		
+
 		// non default key
 		$this->table->set_template(array('nonsense' => 'foo'));
 		$this->table->compile_template();
-		
+
 		$this->assertArrayHasKey('nonsense', $this->table->template);
 		$this->assertEquals('foo', $this->table->template['nonsense']);
-		
+
 		// override default
 		$this->table->set_template(array('table_close' => '</table junk>'));
 		$this->table->compile_template();
-		
+
 		$this->assertArrayHasKey('table_close', $this->table->template);
 		$this->assertEquals('</table junk>', $this->table->template['table_close']);
 	}
-	
+
 	public function test_make_columns()
 	{
 		// Test bogus parameters
 		$this->assertFalse($this->table->make_columns('invalid_junk'));
 		$this->assertFalse($this->table->make_columns(array()));
 		$this->assertFalse($this->table->make_columns(array('one', 'two'), '2.5'));
-		
-		
+
 		// Now on to the actual column creation
-		
+
 		$five_values = array(
 			'Laura', 'Red', '15',
 			'Katie', 'Blue'
 		);
-		
+
 		// No column count - no changes to the array
 		$this->assertEquals(
 			$five_values,
 			$this->table->make_columns($five_values)
 		);
-		
+
 		// Column count of 3 leaves us with one &nbsp;
 		$this->assertEquals(
 			array(
 				array('Laura', 'Red', '15'),
-				array('Katie', 'Blue', '&nbsp;')				
+				array('Katie', 'Blue', '&nbsp;')
 			),
 			$this->table->make_columns($five_values, 3)
 		);
 	}
-	
+
 	public function test_clear()
 	{
 		$this->table->set_heading('Name', 'Color', 'Size');
-		
+
 		// Make columns changes auto_heading
 		$rows = $this->table->make_columns(array(
 			'Laura', 'Red', '15',
 			'Katie', 'Blue'
 		), 3);
-		
+
 		foreach ($rows as $row)
 		{
 			$this->table->add_row($row);
 		}
-		
+
 		$this->assertFalse($this->table->auto_heading);
 		$this->assertEquals(count($this->table->heading), 3);
 		$this->assertEquals(count($this->table->rows), 2);
-		
+
 		$this->table->clear();
-		
+
 		$this->assertTrue($this->table->auto_heading);
 		$this->assertEmpty($this->table->heading);
 		$this->assertEmpty($this->table->rows);
 	}
-	
-	
+
 	public function test_set_from_array()
 	{
 		$this->assertFalse($this->table->set_from_array('bogus'));
 		$this->assertFalse($this->table->set_from_array(NULL));
-		
+
 		$data = array(
 			array('name', 'color', 'number'),
 			array('Laura', 'Red', '22'),
-			array('Katie', 'Blue')				
+			array('Katie', 'Blue')
 		);
-		
+
 		$this->table->set_from_array($data, FALSE);
 		$this->assertEmpty($this->table->heading);
-		
+
 		$this->table->clear();
-		
-		$expected_heading = array(
+
+		$this->table->set_from_array($data);
+		$this->assertEquals(count($this->table->rows), 2);
+
+		$expected = array(
 			array('data' => 'name'),
 			array('data' => 'color'),
 			array('data' => 'number')
 		);
-		
-		$expected_second = array(
+
+		$this->assertEquals($expected, $this->table->heading);
+
+		$expected = array(
 			array('data' => 'Katie'),
 			array('data' => 'Blue'),
 		);
-		
-		$this->table->set_from_array($data);
-		$this->assertEquals(count($this->table->rows), 2);
-		
-		$this->assertEquals(
-			$expected_heading,
-			$this->table->heading
-		);
-		
-		$this->assertEquals(
-			$expected_second,
-			$this->table->rows[1]
-		);
+
+		$this->assertEquals($expected, $this->table->rows[1]);
 	}
-	
-	function test_set_from_object()
+
+	public function test_set_from_object()
 	{
 		// Make a stub of query instance
 		$query = new CI_TestCase();
@@ -268,37 +254,31 @@ class Table_test extends CI_TestCase {
 			return 2;
 		};
 
-		$expected_heading = array(
+		$this->table->set_from_object($query);
+
+		$expected = array(
 			array('data' => 'name'),
 			array('data' => 'email')
 		);
 
-		$expected_second = array(
+		$this->assertEquals($expected, $this->table->heading);
+
+		$expected = array(
 			'name' => array('data' => 'Foo Bar'),
 			'email' => array('data' => 'foo@bar.com'),
 		);
 
-		$this->table->set_from_object($query);
-
-		$this->assertEquals(
-			$expected_heading,
-			$this->table->heading
-		);
-		
-		$this->assertEquals(
-			$expected_second,
-			$this->table->rows[1]
-		);
+		$this->assertEquals($expected, $this->table->rows[1]);
 	}
-	
-	function test_generate()
+
+	public function test_generate()
 	{
 		// Prepare the data
 		$data = array(
 			array('Name', 'Color', 'Size'),
 			array('Fred', 'Blue', 'Small'),
 			array('Mary', 'Red', 'Large'),
-			array('John', 'Green', 'Medium')	
+			array('John', 'Green', 'Medium')
 		);
 
 		$table = $this->table->generate($data);
@@ -313,4 +293,5 @@ class Table_test extends CI_TestCase {
 		$this->assertTrue(strpos($table, '<td>Blue</td>') !== FALSE);
 		$this->assertTrue(strpos($table, '<td>Small</td>') !== FALSE);
 	}
+
 }
\ No newline at end of file