updates tests for PHPUnit 8.5 (#122)

matomo-org · Feb 27, 2020 · b6ca21a · b6ca21a
1 parent 5a39a1a
commit b6ca21a
Show file tree

Hide file tree

Showing 18 changed files with 106 additions and 130 deletions.
diff --git a/tests/Framework/TestCase/IntegrationTestCase.php b/tests/Framework/TestCase/IntegrationTestCase.php
@@ -22,7 +22,7 @@ class IntegrationTestCase extends \Piwik\Tests\Framework\TestCase\IntegrationTes
 {
     protected $testRequiresRedis = true;
 
-    public function setUp()
+    public function setUp(): void
     {
         if ($this->testRequiresRedis && !self::isRedisAvailable()) {
             $this->markTestSkipped('Redis extension is not installed, skipping test');

diff --git a/tests/Integration/Queue/Backend/MysqlTest.php b/tests/Integration/Queue/Backend/MysqlTest.php
@@ -30,7 +30,7 @@ class MysqlTest extends IntegrationTestCase
     private $listKey = 'testMyListTestKey';
     private $key = 'testKeyValueKey';
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!$this->hasDependencies()) {
             parent::setUp();
@@ -50,7 +50,7 @@ public function setUp()
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $GLOBALS['PIWIK_TRACKER_MODE'] = false;
         Db::destroyDatabaseObject();

diff --git a/tests/Integration/Queue/Backend/RedisTest.php b/tests/Integration/Queue/Backend/RedisTest.php
@@ -28,7 +28,7 @@ class RedisTest extends IntegrationTestCase
     private $listKey = 'testMyListTestKey';
     private $key = 'testKeyValueKey';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/Integration/Queue/Backend/SentinelTest.php b/tests/Integration/Queue/Backend/SentinelTest.php
@@ -20,15 +20,15 @@
  */
 class SentinelTest extends RedisTest
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (self::isTravisCI()) {
             $this->markTestSkipped('Sentinel is not installed on travis');
         }
         parent::setUp();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Config::getInstance()->QueuedTracking = array();
         parent::tearDown();
@@ -64,12 +64,11 @@ public function test_canCreateInstanceWithMultipleSentinelAndFallback()
         $this->assertTrue($sentinel->testConnection());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage QueuedTracking_NumHostsNotMatchNumPorts
-     */
     public function test_connect_ShouldThrowException_IfNotExactSameHostAndPortNumbersGiven()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('QueuedTracking_NumHostsNotMatchNumPorts');
+
         $this->enableRedisSentinel();
 
         $settings = Factory::getSettings();

diff --git a/tests/Integration/Queue/FactoryTest.php b/tests/Integration/Queue/FactoryTest.php
@@ -58,12 +58,11 @@ public function test_makeBackend_shouldReturnARedisInstance()
         $this->assertFalse($backend instanceof Queue\Backend\Sentinel);
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage You must configure a sentinel master name
-     */
     public function test_makeBackend_shouldFailToCreateASentinelInstance_IfNotFullyConfigured()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('You must configure a sentinel master name');
+
         Config::getInstance()->QueuedTracking = array('useSentinelBackend' => '1', 'sentinelMasterName' => '');
         Factory::makeBackend();
     }

diff --git a/tests/Integration/Queue/LockTest.php b/tests/Integration/Queue/LockTest.php
@@ -31,15 +31,15 @@ class LockTest extends IntegrationTestCase
      */
     public $lock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $redis = $this->createMySQLBackend();
         $this->lock = $this->createLock($redis);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearBackend();
         parent::tearDown();

diff --git a/tests/Integration/Queue/ManagerTest.php b/tests/Integration/Queue/ManagerTest.php
@@ -42,7 +42,7 @@ class ManagerTest extends IntegrationTestCase
      */
     private $lock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -64,7 +64,7 @@ private function createQueueManager()
         return array('queue' => $queue, 'lock' => $lock);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearBackend();
         parent::tearDown();

diff --git a/tests/Integration/Queue/Processor/HandlerTest.php b/tests/Integration/Queue/Processor/HandlerTest.php
@@ -42,7 +42,7 @@ class HandlerTest extends IntegrationTestCase
      */
     private $tracker;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -54,7 +54,7 @@ public function setUp()
         $this->handler->init($this->tracker);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->handler->rollBack($this->tracker);
 

diff --git a/tests/Integration/Queue/ProcessorTest.php b/tests/Integration/Queue/ProcessorTest.php
@@ -55,7 +55,7 @@ class ProcessorTest extends IntegrationTestCase
      */
     private $lock;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -72,7 +72,7 @@ public function setUp()
         $this->processor = $this->createProcessor();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearBackend();
         parent::tearDown();
@@ -155,12 +155,11 @@ public function test_process_shouldProcessEachBulkRequestsWithinRequest()
         $this->assertNumberOfRequestSetsLeftInQueue(2);
     }
 
-    /**
-     * @expectedException \Piwik\Plugins\QueuedTracking\Queue\LockExpiredException
-     * @expectedExceptionMessage Rolled back
-     */
     public function test_processRequestSets_ShouldThrowAnExceptionAndRollback_InCaseWeDoNoLongerHaveTheLock()
     {
+        $this->expectException(\Piwik\Plugins\QueuedTracking\Queue\LockExpiredException::class);
+        $this->expectExceptionMessage('Rolled back');
+
         $queuedRequestSets = array(
             $this->buildRequestSet(5)
         );

diff --git a/tests/Integration/QueueTest.php b/tests/Integration/QueueTest.php
@@ -27,7 +27,7 @@ class QueueTest extends IntegrationTestCase
      */
     private $queue;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -44,7 +44,7 @@ private function createQueue($id)
         return $queue;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearBackend();
         parent::tearDown();

diff --git a/tests/Integration/QueuedTrackingTest.php b/tests/Integration/QueuedTrackingTest.php
@@ -25,7 +25,7 @@ class QueuedTrackingTest extends IntegrationTestCase
      */
     private $plugin;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->plugin = new QueuedTracking();

diff --git a/tests/Integration/Settings/NumWorkersTest.php b/tests/Integration/Settings/NumWorkersTest.php
@@ -26,7 +26,7 @@ class NumWorkersTest extends IntegrationTestCase
      */
     private $settings;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->clearBackend();
@@ -35,7 +35,7 @@ public function setUp()
         $this->settings = $container->get('Piwik\Plugins\QueuedTracking\SystemSettings');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->clearBackend();
         parent::tearDown();