Updates unit tests

Signed-off-by: Frank Brückner <dev@froschdesignstudio.de>
laminas · Jul 10, 2020 · 7ccc389 · 7ccc389
1 parent 82995d6
commit 7ccc389
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 42 deletions.
diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
@@ -25,15 +25,15 @@ class ArrayTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->adapter = new Adapter\ArrayAdapter(range(1, 101));
     }
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->adapter = null;
         parent::tearDown();

diff --git a/test/Adapter/CallbackTest.php b/test/Adapter/CallbackTest.php
@@ -26,8 +26,8 @@ public function testMustDefineTwoCallbacksOnConstructor()
         };
         $adapter = new Callback($itemsCallback, $countCallback);
 
-        $this->assertAttributeSame($itemsCallback, 'itemsCallback', $adapter);
-        $this->assertAttributeSame($countCallback, 'countCallback', $adapter);
+        $this->assertSame([], $adapter->getItems(1, 1));
+        $this->assertSame(0, $adapter->count());
     }
 
     public function testShouldAcceptAnyCallableOnConstructor()
@@ -38,8 +38,8 @@ public function testShouldAcceptAnyCallableOnConstructor()
         $countCallback = 'rand';
         $adapter = new Callback($itemsCallback, $countCallback);
 
-        $this->assertAttributeInternalType('callable', 'itemsCallback', $adapter);
-        $this->assertAttributeInternalType('callable', 'countCallback', $adapter);
+        $this->assertSame(range(1, 10), $adapter->getItems(1, 1));
+        $this->assertIsInt($adapter->count());
     }
 
     public function testMustRunItemCallbackToGetItems()

diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
@@ -35,7 +35,7 @@ class DbSelectTest extends TestCase
     /** @var DbSelect */
     protected $dbSelect;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->mockResult    = $this->createMock('Laminas\Db\Adapter\Driver\ResultInterface');
         $this->mockStatement = $this->createMock('Laminas\Db\Adapter\Driver\StatementInterface');
@@ -106,7 +106,7 @@ public function testCustomCount()
      */
     public function testReturnValueIsArray()
     {
-        $this->assertInternalType('array', $this->dbSelect->getItems(0, 10));
+        $this->assertIsArray($this->dbSelect->getItems(0, 10));
     }
 
     public function testGetArrayCopyShouldContainSelectItems()

diff --git a/test/Adapter/DbTableGatewayTest.php b/test/Adapter/DbTableGatewayTest.php
@@ -28,7 +28,7 @@ class DbTableGatewayTest extends TestCase
     /** @var \Laminas\Db\TableGateway\TableGateway */
     protected $mockTableGateway;
 
-    public function setup()
+    public function setup(): void
     {
         $mockStatement = $this->createMock('Laminas\Db\Adapter\Driver\StatementInterface');
         $mockDriver = $this->createMock('Laminas\Db\Adapter\Driver\DriverInterface');

diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php
@@ -26,7 +26,7 @@ class IteratorTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $iterator = new \ArrayIterator(range(1, 101));
@@ -35,7 +35,7 @@ protected function setUp()
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->adapter = null;
         parent::tearDown();

diff --git a/test/Adapter/NullFillTest.php b/test/Adapter/NullFillTest.php
@@ -26,15 +26,15 @@ class NullFillTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->adapter = new Adapter\NullFill(101);
     }
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->adapter = null;
         parent::tearDown();

diff --git a/test/AdapterPluginManagerFactoryTest.php b/test/AdapterPluginManagerFactoryTest.php
@@ -24,14 +24,6 @@ public function testFactoryReturnsPluginManager()
 
         $adapters = $factory($container, AdapterPluginManager::class);
         $this->assertInstanceOf(AdapterPluginManager::class, $adapters);
-
-        if (method_exists($adapters, 'configure')) {
-            // laminas-servicemanager v3
-            $this->assertAttributeSame($container, 'creationContext', $adapters);
-        } else {
-            // laminas-servicemanager v2
-            $this->assertSame($container, $adapters->getServiceLocator());
-        }
     }
 
     /**

diff --git a/test/AdapterPluginManagerTest.php b/test/AdapterPluginManagerTest.php
@@ -38,7 +38,7 @@ class AdapterPluginManagerTest extends TestCase
 
     protected $mockAdapter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->adapterPluginManager = new AdapterPluginManager(
             $this->getMockBuilder(ContainerInterface::class)->getMock()

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -26,7 +26,7 @@ class FactoryTest extends TestCase
 
     protected $mockAdapter;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->mockSelect = $this->createMock('Laminas\Db\Sql\Select');
 

diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
@@ -58,7 +58,7 @@ class PaginatorTest extends TestCase
      */
     protected $adapter = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->select = new Sql\Select;
         $this->select->from('test');
@@ -74,7 +74,7 @@ protected function setUp()
         $this->_restorePaginatorDefaults();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->testCollection = null;
         $this->paginator = null;
@@ -696,7 +696,7 @@ public function testToJson()
 
         $expected = '"0":1,"1":2,"2":3,"3":4,"4":5,"5":6,"6":7,"7":8,"8":9,"9":10';
 
-        $this->assertContains($expected, $json);
+        $this->assertStringContainsString($expected, $json);
     }
 
     // Laminas-5519

diff --git a/test/ScrollingStyle/AllTest.php b/test/ScrollingStyle/AllTest.php
@@ -31,7 +31,7 @@ class AllTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->scrollingStyle = new \Laminas\Paginator\ScrollingStyle\All();
@@ -41,7 +41,7 @@ protected function setUp()
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->scrollingStyle = null;
         $this->paginator = null;

diff --git a/test/ScrollingStyle/ElasticTest.php b/test/ScrollingStyle/ElasticTest.php
@@ -30,7 +30,7 @@ class ElasticTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->scrollingStyle = new \Laminas\Paginator\ScrollingStyle\Elastic();
@@ -41,7 +41,7 @@ protected function setUp()
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->scrollingStyle = null;
         $this->paginator = null;

diff --git a/test/ScrollingStyle/JumpingTest.php b/test/ScrollingStyle/JumpingTest.php
@@ -32,7 +32,7 @@ class JumpingTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->scrollingStyle = new \Laminas\Paginator\ScrollingStyle\Jumping();
@@ -44,7 +44,7 @@ protected function setUp()
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->scrollingStyle = null;
         $this->paginator = null;

diff --git a/test/ScrollingStyle/SlidingTest.php b/test/ScrollingStyle/SlidingTest.php
@@ -32,7 +32,7 @@ class SlidingTest extends \PHPUnit\Framework\TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->_scrollingStyle = new \Laminas\Paginator\ScrollingStyle\Sliding();
@@ -43,7 +43,7 @@ protected function setUp()
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->_scrollingStyle = null;
         $this->paginator = null;

diff --git a/test/ScrollingStylePluginManagerFactoryTest.php b/test/ScrollingStylePluginManagerFactoryTest.php
@@ -24,14 +24,6 @@ public function testFactoryReturnsPluginManager()
 
         $scrollingStyles = $factory($container, ScrollingStylePluginManager::class);
         $this->assertInstanceOf(ScrollingStylePluginManager::class, $scrollingStyles);
-
-        if (method_exists($scrollingStyles, 'configure')) {
-            // laminas-servicemanager v3
-            $this->assertAttributeSame($container, 'creationContext', $scrollingStyles);
-        } else {
-            // laminas-servicemanager v2
-            $this->assertSame($container, $scrollingStyles->getServiceLocator());
-        }
     }
 
     /**