Added more assertions to CachingConnectorTest::testGetSetCache.

Reordered methods in CachingConnector.

Author: Bilge

src/Connector/CachingConnector.php

@@ -49,24 +49,24 @@ public function fetch($source, EncapsulatedOptions $options = null)
 
     abstract public function fetchFreshData($source, EncapsulatedOptions $options = null);
 
-    public function enableCache()
+    public function getCache()
     {
-        $this->cacheEnabled = true;
+        return $this->cache;
     }
 
-    public function disableCache()
+    public function setCache(CacheItemPoolInterface $cache)
     {
-        $this->cacheEnabled = false;
+        $this->cache = $cache;
     }
 
-    public function getCache()
+    public function enableCache()
     {
-        return $this->cache;
+        $this->cacheEnabled = true;
     }
 
-    public function setCache(CacheItemPoolInterface $cache)
+    public function disableCache()
     {
-        $this->cache = $cache;
+        $this->cacheEnabled = false;
     }
 
     public function isCacheEnabled()

test/Integration/Porter/Connector/CachingConnectorTest.php

@@ -3,6 +3,7 @@
 
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery\MockInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use ScriptFUSION\Porter\Cache\MemoryCache;
 use ScriptFUSION\Porter\Connector\CachingConnector;
 use ScriptFUSION\Porter\Options\EncapsulatedOptions;
@@ -42,11 +43,12 @@ public function testCacheDisabled()
         self::assertSame('bar', $this->connector->fetch('baz', $this->options));
     }
 
-    public function testCache()
+    public function testGetSetCache()
     {
-        $cache = new MemoryCache;
-        $this->connector->setCache($cache);
+        self::assertInstanceOf(CacheItemPoolInterface::class, $this->connector->getCache());
+        self::assertNotSame($cache = new MemoryCache, $this->connector->getCache());
 
+        $this->connector->setCache($cache);
         self::assertSame($cache, $this->connector->getCache());
     }