improve test suite

Author: nyamsprod

src/PublicSuffixListManager.php

@@ -36,7 +36,7 @@ class PublicSuffixListManager
     private $sourceUrl;
 
     /**
-     * @var string Directory where text and php versions of list will be cached
+     * @var CacheInterface PSR-16 cache adapter
      */
     private $cacheAdapter;
 

tests/Cache/FileCacheAdapterTest.php

@@ -23,11 +23,11 @@
  */
 class FileCacheAdapterTest extends TestCase
 {
-    private $cache;
+    protected $cache;
 
-    private $root;
+    protected $root;
 
-    private $cacheDir;
+    protected $cacheDir;
 
     public function setUp()
     {

tests/CheckPublicSuffixTest.php

@@ -3,6 +3,7 @@
 namespace Pdp\Tests;
 
 use Pdp\Cache\FileCacheAdapter;
+use Pdp\Http\CurlHttpAdapter;
 use Pdp\PublicSuffixList;
 use Pdp\PublicSuffixListManager;
 use PHPUnit\Framework\TestCase;
@@ -21,11 +22,10 @@ class CheckPublicSuffixTest extends TestCase
      */
     private $list;
 
-    protected function setUp()
+    public function setUp()
     {
-        $cache = new FileCacheAdapter();
-        $rules = $cache->get(PublicSuffixListManager::ALL_DOMAINS);
-        $this->list = new PublicSuffixList($rules);
+        $manager = new PublicSuffixListManager(new FileCacheAdapter(), new CurlHttpAdapter());
+        $this->list = $manager->getList();
     }
 
     /**

tests/PublicSuffixListManagerTest.php

@@ -4,6 +4,7 @@
 
 namespace Pdp\Tests;
 
+use org\bovigo\vfs\vfsStream;
 use Pdp\Cache\FileCacheAdapter;
 use Pdp\Http\CurlHttpAdapter;
 use Pdp\PublicSuffixListManager;
@@ -15,24 +16,30 @@ class PublicSuffixListManagerTest extends TestCase
      * @var PublicSuffixListManager List manager
      */
     protected $manager;
-
+    protected $cache;
+    protected $root;
+    protected $cacheDir;
     protected $cachePool;
 
-    protected function setUp()
+    public function setUp()
     {
-        $this->cachePool = new FileCacheAdapter('/tmp/test-my-cache');
-
+        $this->root = vfsStream::setup('pdp');
+        vfsStream::create(['cache' => []], $this->root);
+        $this->cacheDir = vfsStream::url('pdp/cache');
+        $this->cachePool = new FileCacheAdapter($this->cacheDir);
         $this->manager = new PublicSuffixListManager(
             $this->cachePool,
             new CurlHttpAdapter(),
             'https://publicsuffix.org/list/public_suffix_list.dat'
         );
     }
 
-    protected function tearDown()
+    public function tearDown()
     {
         $this->manager = null;
         $this->cachePool = null;
+        $this->cacheDir = null;
+        $this->root = null;
     }
 
     public function testGetProvidedListFromDefaultCacheDir()

tests/PublicSuffixListTest.php

@@ -27,7 +27,7 @@ class PublicSuffixListTest extends TestCase
      */
     private $list;
 
-    protected function setUp()
+    public function setUp()
     {
         $cache = new FileCacheAdapter();
         $rules = $cache->get(PublicSuffixListManager::ALL_DOMAINS);