Unskip a bunch of PaginatorComponent tests that do not touch the data…

…base.

Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php

@@ -25,7 +25,6 @@
 /**
  * PaginatorTestController class
  *
- * @package       Cake.Test.Case.Controller.Component
  */
 class PaginatorTestController extends Controller {
 
@@ -53,7 +52,6 @@ class PaginatorComponentTest extends TestCase {
  */
 	public function setUp() {
 		parent::setUp();
-		$this->markTestIncomplete('Need to revisit once models work again.');
 
 		$this->_ns = Configure::read('App.namespace');
 		Configure::write('App.namespace', 'TestApp');
@@ -83,6 +81,7 @@ public function tearDown() {
  * @return void
  */
 	public function testPaginate() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->request->params['pass'] = array('1');
@@ -179,6 +178,7 @@ public function testPaginate() {
  * @return void
  */
 	public function testPageParamCasting() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$this->Controller->Post->expects($this->at(0))
 			->method('hasMethod')
 			->with('paginate')
@@ -209,6 +209,7 @@ public function testPageParamCasting() {
  * @return void
  */
 	public function testPaginateExtraParams() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
@@ -297,6 +298,7 @@ public function testPaginateExtraParams() {
  * @return void
  */
 	public function testPaginateSpecialType() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->request->params['pass'][] = '1';
@@ -326,6 +328,7 @@ public function testPaginateSpecialType() {
  * @return void
  */
 	public function testDefaultPaginateParams() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->modelClass = 'PaginatorControllerPost';
 		$Controller->request->query = [];
@@ -345,6 +348,7 @@ public function testDefaultPaginateParams() {
  * @return void
  */
 	public function testPaginateOrderModelDefault() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->params['url'] = array();
@@ -389,6 +393,7 @@ public function testPaginateOrderModelDefault() {
  * @return void
  */
 	public function testPaginateOrderVirtualField() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->request->query = [];
@@ -416,6 +421,7 @@ public function testPaginateOrderVirtualField() {
  * @return void
  */
 	public function testPaginateOrderVirtualFieldJoinedModel() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->request->query = [];
@@ -439,6 +445,7 @@ public function testPaginateOrderVirtualFieldJoinedModel() {
  * @expectedException Cake\Error\MissingModelException
  */
 	public function testPaginateMissingModel() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->constructClasses();
 		$Controller->Paginator->paginate('MissingModel');
@@ -622,6 +629,7 @@ public function testValidateSortInvalidDirection() {
  * @return void
  */
 	public function testOutOfRangePageNumberGetsClamped() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->request->query['page'] = 3000;
@@ -634,10 +642,11 @@ public function testOutOfRangePageNumberGetsClamped() {
  * Test that a really REALLY large page number gets clamped to the max page size.
  *
  *
- * @expectedException NotFoundException
+ * @expectedException Cake\Error\NotFoundException
  * @return void
  */
 	public function testOutOfVeryBigPageNumberGetsClamped() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->params['named'] = array(
@@ -651,10 +660,11 @@ public function testOutOfVeryBigPageNumberGetsClamped() {
 /**
  * testOutOfRangePageNumberAndPageCountZero
  *
- * @expectedException NotFoundException
+ * @expectedException Cake\Error\NotFoundException
  * @return void
  */
 	public function testOutOfRangePageNumberAndPageCountZero() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new PaginatorTestController($this->request);
 		$Controller->uses = array('PaginatorControllerPost');
 		$Controller->request->query['page'] = 3000;
@@ -698,7 +708,7 @@ public function testValidateSortWhitelistFailure() {
  * @return void
  */
 	public function testValidateSortWhitelistTrusted() {
-		$model = $this->getMock('Model');
+		$model = $this->getMock('Cake\Model\Model');
 		$model->alias = 'model';
 		$model->expects($this->never())->method('hasField');
 
@@ -740,9 +750,9 @@ public function testValidateSortVirtualField() {
  * @return void
  */
 	public function testValidateSortSharedFields() {
-		$model = $this->getMock('Model');
+		$model = $this->getMock('Cake\Model\Model');
 		$model->alias = 'Parent';
-		$model->Child = $this->getMock('Model');
+		$model->Child = $this->getMock('Cake\Model\Model');
 		$model->Child->alias = 'Child';
 
 		$model->expects($this->never())
@@ -809,7 +819,7 @@ public function testValidateSortNoSort() {
  * @return void
  */
 	public function testValidateSortInvalidAlias() {
-		$model = $this->getMock('Model');
+		$model = $this->getMock('Cake\Model\Model');
 		$model->alias = 'Model';
 		$model->expects($this->any())->method('hasField')->will($this->returnValue(true));
 
@@ -846,6 +856,7 @@ public function testCheckLimit() {
  * @return void
  */
 	public function testPaginateMaxLimit() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 
 		$Controller->uses = array('PaginatorControllerPost', 'ControllerComment');
@@ -884,6 +895,7 @@ public function testPaginateMaxLimit() {
  * @return void
  */
 	public function testPaginateOrderVirtualFieldSharedWithRealField() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorControllerPost', 'PaginatorControllerComment');
 		$Controller->constructClasses();
@@ -928,6 +940,7 @@ public function testPaginateOrderVirtualFieldSharedWithRealField() {
  * @return void
  */
 	public function testPaginateCustomFind() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = ['PaginatorCustomPost'];
 
@@ -969,6 +982,7 @@ public function testPaginateCustomFind() {
  * @return void
  */
 	public function testPaginateCustomFindFieldsArray() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');
 		$Controller->constructClasses();
@@ -1001,6 +1015,7 @@ public function testPaginateCustomFindFieldsArray() {
  * @return void
  */
 	public function testPaginateCustomFindWithCustomFindKey() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');
 		$Controller->constructClasses();
@@ -1034,6 +1049,7 @@ public function testPaginateCustomFindWithCustomFindKey() {
  * @return void
  */
 	public function testPaginateCustomFindGroupBy() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');
 		$Controller->constructClasses();
@@ -1099,6 +1115,7 @@ public function testPaginateCustomFindGroupBy() {
  * @return void
  */
 	public function testPaginateCustomFindCount() {
+		$this->markTestIncomplete('Need to revisit once models work again.');
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');
 		$Controller->constructClasses();
@@ -1140,4 +1157,5 @@ public function testPaginateCustomFindCount() {
 		$this->assertTrue($result['nextPage']);
 		$this->assertFalse($result['prevPage']);
 	}
+
 }