Fixing Tag/Paginator tests

Author: phalcon

php-tests/tests/Phalcon/Tag/UnitTest.php

@@ -2909,7 +2909,7 @@ public function testCheckFieldDisplayTo()
         Tg::displayTo('some_field_name', 'some_default_value');
         $expected = '<input type="checkbox" class="some_class" size="10" '
                   . 'name="some_field_name" id="some_field_name" '
-                  . 'value="some_default_value">';
+                  . 'value="some_default_value" checked="checked">';
         $actual   = Tg::checkField($options);
         Tg::displayTo('some_field_name', '');
 
@@ -3094,7 +3094,7 @@ public function testCheckFieldSetDefaultXHTML()
         Tg::setDefault('some_field_name', 'some_default_value');
         $expected = '<input type="checkbox" class="some_class" size="10" '
                   . 'name="some_field_name" id="some_field_name" '
-                  . 'value="some_default_value" />';
+                  . 'value="some_default_value" checked="checked" />';
         $actual   = Tg::checkField($options);
         Tg::setDefault('some_field_name', '');
         Tg::setDoctype('');
@@ -3123,7 +3123,7 @@ public function testCheckFieldDisplayToXHTML()
         Tg::displayTo('some_field_name', 'some_default_value');
         $expected = '<input type="checkbox" class="some_class" size="10" '
                   . 'name="some_field_name" id="some_field_name" '
-                  . 'value="some_default_value" />';
+                  . 'value="some_default_value" checked="checked" />';
         $actual   = Tg::checkField($options);
         Tg::displayTo('some_field_name', '');
         Tg::setDoctype('');

unit-tests/PaginatorTest.php

@@ -284,65 +284,21 @@ public function testModelPaginator123()
 
  	}
 
+ 	protected function _getArrayRandomData($number)
+ 	{
+ 		$data = array();
+ 		for ($i = 0; $i < $number; $i++){
+ 			$data[] = array(
+				'name' => 'PETER'
+			);
+ 		}
+ 		return $data;
+ 	}
+
 	public function testArrayPaginator()
 	{
 
-		$personas = array(
-			0 => array(
-				'name' => 'PETER'
-			),
-			1 => array(
-				'name' => 'PETER'
-			),
-			2 => array(
-				'name' => 'PETER'
-			),
-			3 => array(
-				'name' => 'PETER'
-			),
-			4 => array(
-				'name' => 'PETER'
-			),
-			5 => array(
-				'name' => 'PETER'
-			),
-			6 => array(
-				'name' => 'PETER'
-			),
-			7 => array(
-				'name' => 'PETER'
-			),
-			8 => array(
-				'name' => 'PETER'
-			),
-			9 => array(
-				'name' => 'PETER'
-			),
-			10 => array(
-				'name' => 'PETER'
-			),
-			11 => array(
-				'name' => 'PETER'
-			),
-			12 => array(
-				'name' => 'PETER'
-			),
-			13 => array(
-				'name' => 'PETER'
-			),
-			14 => array(
-				'name' => 'PETER'
-			),
-			15 => array(
-				'name' => 'PETER'
-			),
-			16 => array(
-				'name' => 'PETER'
-			),
-			17 => array(
-				'name' => 'PETER'
-			)
-		);
+		$personas = $this->_getArrayRandomData(18);
 
 		$paginator = new Phalcon\Paginator\Adapter\NativeArray(array(
  			'data' => $personas,
@@ -378,6 +334,21 @@ public function testArrayPaginator()
  		$this->assertEquals($page->current, 4);
  		$this->assertEquals($page->total_pages, 6);
 
+ 		//Penultimate page
+ 		$paginator->setCurrentPage(5);
+
+ 		$page = $paginator->getPaginate();
+ 		$this->assertEquals(get_class($page), 'stdClass');
+
+ 		$this->assertEquals(count($page->items), 3);
+
+ 		$this->assertEquals($page->before, 4);
+ 		$this->assertEquals($page->next, 6);
+ 		$this->assertEquals($page->last, 6);
+
+ 		$this->assertEquals($page->current, 5);
+ 		$this->assertEquals($page->total_pages, 6);
+
  	}
 
 }