Fix the tests

Author: nhatthm

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="true"
          stopOnFailure="false"
-         syntaxCheck="false"
          verbose="true"
 >
     <logging>

tests/Bucket/PlainTest.php

@@ -37,7 +37,7 @@ public function testSanitizeMetricName()
     {
         $this->assertEquals('-', Plain::sanitizeMetricName(''));
 
-        $this->assertEquals('-u-iunikod', Plain::sanitizeMetricName('юникод'));
+        $this->assertEquals('-u-unikod', Plain::sanitizeMetricName('юникод'));
         $this->assertEquals('-u-Apollon', Plain::sanitizeMetricName('Ἀπόλλων'));
         $this->assertEquals('-u-acougue', Plain::sanitizeMetricName('açougue'));
 
@@ -49,7 +49,7 @@ public function testSanitizeMetricName()
             Plain::sanitizeMetricName('metric.with.dots_and_underscores')
         );
 
-        $this->assertEquals('-u-iunikod_metrika', Plain::sanitizeMetricName('юникод.метрика'));
+        $this->assertEquals('-u-unikod_metrika', Plain::sanitizeMetricName('юникод.метрика'));
     }
 
     public function metrics()

tests/Client/LogTest.php

@@ -9,7 +9,7 @@
 
 class LogTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }

tests/Client/MemoryTest.php

@@ -7,7 +7,7 @@
 
 class MemoryTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }

tests/FactoryTest.php

@@ -27,15 +27,14 @@ public function testBuildStatsD()
         $this->assertInstanceOf(Client\StatsD::class, Factory::build('statsd://qwe:1234/asd', $logger));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Unknown client type
-     */
     public function testUnknownClient()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Psr\Log\LoggerInterface $logger */
         $logger = $this->getMockBuilder('\Psr\Log\LoggerInterface')->getMock();
 
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Unknown client type');
+
         Factory::build(uniqid(), $logger);
     }
 }

tests/HTTPMetricAlterCallback/HasIDAtSecondLevelTest.php

@@ -64,22 +64,20 @@ public function testRegisterSectionTest()
 
     /**
      * @dataProvider createFromStringMapProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid sections format
      *
      * @param string $map
      */
     public function testCreateFromStringMap_InvalidFormat($map)
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid sections format');
         HasIDAtSecondLevel::createFromStringMap($map);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Unknown section test callback name: foo
-     */
     public function testCreateFromStringMap_UnknownSectionTest()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Unknown section test callback name: foo');
         HasIDAtSecondLevel::createFromStringMap('users:foo');
     }
 

tests/Incrementer/LogTest.php

@@ -5,7 +5,7 @@
 
 class LogTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }

tests/Incrementer/MemoryTest.php

@@ -5,7 +5,7 @@
 
 class MemoryTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }

tests/Incrementer/NoOpTest.php

@@ -5,7 +5,7 @@
 
 class NoOpTest extends TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }

tests/Incrementer/StatsDTest.php

@@ -5,7 +5,7 @@
 
 class StatsDTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         mt_srand(time());
     }