Update tests for PHPUnit 6

Author: jeremykendall

tests/src/Pdp/CheckPublicSuffixTest.php

@@ -2,29 +2,25 @@
 
 namespace Pdp;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * This test case is based on the test data linked at
  * http://publicsuffix.org/list/ and provided by Rob Strading of Comodo.
  *
  * @link
  * http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt?raw=1
  */
-class CheckPublicSuffixTest extends \PHPUnit_Framework_TestCase
+class CheckPublicSuffixTest extends TestCase
 {
     /**
-     * @var Parser
+     * @var PublicSuffixList
      */
-    protected $parser;
+    private $list;
 
     protected function setUp()
     {
-        $file = realpath(dirname(__DIR__) . '/../../data/public-suffix-list.php');
-        $this->parser = new Parser(new PublicSuffixList($file));
-    }
-
-    protected function tearDown()
-    {
-        $this->parser = null;
+        $this->list = new PublicSuffixList();
     }
 
     public function testPublicSuffixSpec()
@@ -142,6 +138,6 @@ public function testPublicSuffixSpec()
      */
     public function checkPublicSuffix($input, $expected)
     {
-        $this->assertSame($expected, $this->parser->getRegistrableDomain($input));
+        $this->assertSame($expected, $this->list->query($input)->getRegistrableDomain());
     }
 }

tests/src/Pdp/Exception/SeriouslyMalformedUrlExceptionTest.php

@@ -2,12 +2,14 @@
 
 namespace Pdp\Exception;
 
-class SeriouslyMalformedUrlExceptionTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class SeriouslyMalformedUrlExceptionTest extends TestCase
 {
     public function testInstanceOfPdpException()
     {
         $this->assertInstanceOf(
-            'Pdp\Exception\PdpException',
+            PdpException::class,
             new SeriouslyMalformedUrlException()
         );
     }
@@ -23,10 +25,8 @@ public function testInstanceOfInvalidArgumentException()
     public function testMessage()
     {
         $url = 'http:///example.com';
-        $this->setExpectedException(
-            'Pdp\Exception\SeriouslyMalformedUrlException',
-            sprintf('"%s" is one seriously malformed url.', $url)
-        );
+        $this->expectException(SeriouslyMalformedUrlException::class);
+        $this->expectExceptionMessage(sprintf('"%s" is one seriously malformed url.', $url));
 
         throw new SeriouslyMalformedUrlException($url);
     }

tests/src/Pdp/HttpAdapter/CurlHttpAdapterTest.php

@@ -2,10 +2,12 @@
 
 namespace Pdp\HttpAdapter;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @group internet
  */
-class CurlHttpAdapterTest extends \PHPUnit_Framework_TestCase
+class CurlHttpAdapterTest extends TestCase
 {
     /**
      * @var HttpAdapterInterface

tests/src/Pdp/PublicSuffixListManagerTest.php

@@ -4,8 +4,9 @@
 
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
+use PHPUnit\Framework\TestCase;
 
-class PublicSuffixListManagerTest extends \PHPUnit_Framework_TestCase
+class PublicSuffixListManagerTest extends TestCase
 {
     /**
      * @var PublicSuffixListManager List manager
@@ -146,7 +147,8 @@ public function testWritePhpCache()
 
     public function testWriteThrowsExceptionIfCanNotWrite()
     {
-        $this->setExpectedException('\Exception', "Cannot write '/does/not/exist/public-suffix-list.php'");
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage("Cannot write '/does/not/exist/public-suffix-list.php'");
         $manager = new PublicSuffixListManager('/does/not/exist');
         $manager->writePhpCache(array());
     }
@@ -169,10 +171,10 @@ public function testGetList()
             $this->cacheDir . '/' . PublicSuffixListManager::PDP_PSL_PHP_FILE
         );
         $publicSuffixList = $this->listManager->getList();
-        $this->assertInstanceOf('\Pdp\PublicSuffixList', $publicSuffixList);
+        $this->assertInstanceOf(PublicSuffixList::class, $publicSuffixList);
         $this->assertGreaterThanOrEqual(300, count($publicSuffixList));
-        $this->assertTrue(array_key_exists('stuff-4-sale', $publicSuffixList['org']) !== false);
-        $this->assertTrue(array_key_exists('net', $publicSuffixList['ac']) !== false);
+        $this->assertTrue(array_key_exists('stuff-4-sale', $publicSuffixList->getRules()['org']) !== false);
+        $this->assertTrue(array_key_exists('net', $publicSuffixList->getRules()['ac']) !== false);
     }
 
     public function testGetListWithoutCache()
@@ -182,11 +184,10 @@ public function testGetListWithoutCache()
         );
 
         /** @var PublicSuffixListManager $listManager */
-        $listManager = $this->getMock(
-            '\Pdp\PublicSuffixListManager',
-            array('refreshPublicSuffixList'),
-            array($this->cacheDir)
-        );
+        $listManager = $this->getMockBuilder(PublicSuffixListManager::class)
+            ->setConstructorArgs([$this->cacheDir])
+            ->setMethods(['refreshPublicSuffixList'])
+            ->getMock();
 
         $dataDir = $this->dataDir;
         $cacheDir = $this->cacheDir;
@@ -201,17 +202,24 @@ public function testGetListWithoutCache()
             }));
 
         $publicSuffixList = $listManager->getList();
-        $this->assertInstanceOf('\Pdp\PublicSuffixList', $publicSuffixList);
+        $this->assertInstanceOf(PublicSuffixList::class, $publicSuffixList);
     }
 
     public function testGetProvidedListFromDefaultCacheDir()
     {
         // By not providing cache I'm forcing use of default cache dir
         $listManager = new PublicSuffixListManager();
         $publicSuffixList = $listManager->getList();
-        $this->assertInstanceOf('\Pdp\PublicSuffixList', $publicSuffixList);
+        $this->assertInstanceOf(PublicSuffixList::class, $publicSuffixList);
         $this->assertGreaterThanOrEqual(300, count($publicSuffixList));
-        $this->assertTrue(array_key_exists('stuff-4-sale', $publicSuffixList['org']) !== false);
-        $this->assertTrue(array_key_exists('net', $publicSuffixList['ac']) !== false);
+        $this->assertTrue(array_key_exists('stuff-4-sale', $publicSuffixList->getRules()['org']) !== false);
+        $this->assertTrue(array_key_exists('net', $publicSuffixList->getRules()['ac']) !== false);
+    }
+
+    private function getMock(string $class)
+    {
+        return $this->getMockBuilder($class)
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 }