diff --git a/test/Adapter/DbTableSelectTest.php b/test/Adapter/DbTableSelectTest.php index ffdd38c..2637e3a 100644 --- a/test/Adapter/DbTableSelectTest.php +++ b/test/Adapter/DbTableSelectTest.php @@ -44,7 +44,7 @@ public function testSelectDoesReturnZendDbTableRowset() $adapter = new Adapter\DbTableSelect($query); $items = $adapter->getItems(0, 10); - $this->assertType('Zend\Db\Table\Rowset', $items); + $this->assertInstanceOf('Zend\\Db\\Table\\Rowset', $items); } public function testToJsonWithRowset() diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php index fc9c547..401e57b 100644 --- a/test/Adapter/IteratorTest.php +++ b/test/Adapter/IteratorTest.php @@ -62,7 +62,7 @@ protected function tearDown () public function testGetsItemsAtOffsetZero() { $actual = $this->_adapter->getItems(0, 10); - $this->assertType('LimitIterator', $actual); + $this->assertInstanceOf('LimitIterator', $actual); $i = 1; foreach ($actual as $item) { @@ -74,7 +74,7 @@ public function testGetsItemsAtOffsetZero() public function testGetsItemsAtOffsetTen() { $actual = $this->_adapter->getItems(10, 10); - $this->assertType('LimitIterator', $actual); + $this->assertInstanceOf('LimitIterator', $actual); $i = 11; foreach ($actual as $item) { diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php index d8e01da..399d9c2 100644 --- a/test/PaginatorTest.php +++ b/test/PaginatorTest.php @@ -147,14 +147,14 @@ protected function _restorePaginatorDefaults() public function testFactoryReturnsArrayAdapter() { $paginator = Paginator\Paginator::factory($this->_testCollection); - $this->assertType('Zend\Paginator\Adapter\ArrayAdapter', $paginator->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $paginator->getAdapter()); } public function testFactoryReturnsDbSelectAdapter() { $paginator = Paginator\Paginator::factory($this->_query); - $this->assertType('Zend\Paginator\Adapter\DbSelect', $paginator->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\DbSelect', $paginator->getAdapter()); } /** @@ -166,30 +166,30 @@ public function testFactoryReturnsDbTableSelectAdapter() $paginator = Paginator\Paginator::factory($table->select()); - $this->assertType('Zend\Paginator\Adapter\DbSelect', $paginator->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\DbSelect', $paginator->getAdapter()); } public function testFactoryReturnsIteratorAdapter() { $paginator = Paginator\Paginator::factory(new \ArrayIterator($this->_testCollection)); - $this->assertType('Zend\Paginator\Adapter\Iterator', $paginator->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\Iterator', $paginator->getAdapter()); } public function testFactoryReturnsNullAdapter() { $paginator = Paginator\Paginator::factory(101); - $this->assertType('Zend\Paginator\Adapter\Null', $paginator->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\Null', $paginator->getAdapter()); } public function testFactoryThrowsInvalidClassExceptionAdapter() { - $this->setExpectedException('Zend\Paginator\Exception\InvalidArgumentException', 'No adapter for type stdClass'); + $this->setExpectedException('Zend\\Paginator\\Exception\\InvalidArgumentException', 'No adapter for type stdClass'); $paginator = Paginator\Paginator::factory(new \stdClass()); } public function testFactoryThrowsInvalidTypeExceptionAdapter() { - $this->setExpectedException('Zend\Paginator\Exception\InvalidArgumentException', 'No adapter for type string'); + $this->setExpectedException('Zend\\Paginator\\Exception\\InvalidArgumentException', 'No adapter for type string'); $paginator = Paginator\Paginator::factory('invalid argument'); } @@ -219,10 +219,10 @@ public function testLoadsFromConfig() $this->assertEquals('Scrolling', Paginator\Paginator::getDefaultScrollingStyle()); $broker = Paginator\Paginator::getScrollingStyleBroker(); - $this->assertType('ZendTest\Paginator\TestAsset\ScrollingStyleBroker', $broker); + $this->assertInstanceOf('ZendTest\\Paginator\\TestAsset\\ScrollingStyleBroker', $broker); $broker = Paginator\Paginator::getAdapterBroker(); - $this->assertType('ZendTest\Paginator\TestAsset\AdapterBroker', $broker); + $this->assertInstanceOf('ZendTest\\Paginator\\TestAsset\\AdapterBroker', $broker); $paginator = Paginator\Paginator::factory(range(1, 101)); $this->assertEquals(3, $paginator->getItemCountPerPage()); @@ -369,7 +369,7 @@ public function testGetsCurrentItemCount() public function testGetsCurrentItems() { $items = $this->_paginator->getCurrentItems(); - $this->assertType('ArrayIterator', $items); + $this->assertInstanceOf('ArrayIterator', $items); $count = 0; @@ -383,7 +383,7 @@ public function testGetsCurrentItems() public function testGetsIterator() { $items = $this->_paginator->getIterator(); - $this->assertType('ArrayIterator', $items); + $this->assertInstanceOf('ArrayIterator', $items); $count = 0; @@ -520,23 +520,23 @@ public function testGetsViewFromViewRenderer() $viewRenderer = $this->broker->load('viewRenderer'); $viewRenderer->setView(new View\PhpRenderer()); - $this->assertType('Zend\View\Renderer', $this->_paginator->getView()); + $this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView()); } public function testGeneratesViewIfNonexistent() { - $this->assertType('Zend\View\Renderer', $this->_paginator->getView()); + $this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView()); } public function testGetsAndSetsView() { $this->_paginator->setView(new View\PhpRenderer()); - $this->assertType('Zend\View\Renderer', $this->_paginator->getView()); + $this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView()); } public function testRenders() { - $this->setExpectedException('Zend\View\Exception', 'view partial'); + $this->setExpectedException('Zend\\View\\Exception', 'view partial'); $this->_paginator->render(new View\PhpRenderer()); } @@ -598,7 +598,7 @@ public function testCastsIntegerValuesToInteger() public function testAcceptsTraversableInstanceFromAdapter() { $paginator = new Paginator\Paginator(new \ZendTest\Paginator\TestAsset\TestAdapter()); - $this->assertType('ArrayObject', $paginator->getCurrentItems()); + $this->assertInstanceOf('ArrayObject', $paginator->getCurrentItems()); } public function testCachedItem() @@ -759,7 +759,7 @@ public function testAcceptAndHandlePaginatorAdapterAggregateDataInFactory() $p = Paginator\Paginator::factory(new TestArrayAggregate()); $this->assertEquals(1, count($p)); - $this->assertType('Zend\Paginator\Adapter\ArrayAdapter', $p->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $p->getAdapter()); $this->assertEquals(4, count($p->getAdapter())); } @@ -771,7 +771,7 @@ public function testAcceptAndHandlePaginatorAdapterAggreageInConstructor() $p = new Paginator\Paginator(new TestArrayAggregate()); $this->assertEquals(1, count($p)); - $this->assertType('Zend\Paginator\Adapter\ArrayAdapter', $p->getAdapter()); + $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $p->getAdapter()); $this->assertEquals(4, count($p->getAdapter())); } diff --git a/test/_files/test.sqlite b/test/_files/test.sqlite index 21c8f8b..c2e91b3 100644 Binary files a/test/_files/test.sqlite and b/test/_files/test.sqlite differ