Refactored Authorization Cache

- Updated Authorization Cache Common Code
- Unit Tests

lib/PayPal/Cache/AuthorizationCache.php

@@ -84,12 +84,8 @@ abstract class AuthorizationCache
      */
     public static function isEnabled($config)
     {
-        $config = ($config && is_array($config)) ? $config : PayPalConfigManager::getInstance()->getConfigHashmap();
+        $value = self::getConfigValue('cache.enabled', $config);
-        if (array_key_exists("cache.enabled", $config)) {
+        return empty($value) ? false : ((trim($value) == true || trim($value) == 'true') ?  true : false);
-            $value = $config['cache.enabled'];
-            return (trim($value) == true || trim($value) == 'true') ?  true : false;
-        }
-        return false;
     }
     
     /**
@@ -100,10 +96,23 @@ abstract class AuthorizationCache
      */
     public static function cachePath($config)
     {
-        $config = ($config && is_array($config)) ? $config : PPConfigManager::getInstance()->getConfigHashmap();
+        $cachePath = self::getConfigValue('cache.FileName', $config);
-        $cachePath = (array_key_exists("cache.FileName", $config)) ? trim($config['cache.FileName']) : null;
         return empty($cachePath) ? __DIR__ . self::$CACHE_PATH : $cachePath;
     }
 
+    /**
+     * Returns the Value of the key if found in given config, or from PayPal Config Manager
+     * Returns null if not found
+     *
+     * @param $key
+     * @param $config
+     * @return null|string
+     */
+    private static function getConfigValue($key, $config)
+    {
+        $config = ($config && is_array($config)) ? $config : PayPalConfigManager::getInstance()->getConfigHashmap();
+        return (array_key_exists($key, $config)) ? trim($config[$key]) : null;
+    }
+
 
 }

tests/PayPal/Test/Cache/AuthorizationCacheTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace PayPal\Test\Cache;
+use PayPal\Cache\AuthorizationCache;
+
+/**
+ * Test class for AuthorizationCacheTest.
+ *
+ */
+class AuthorizationCacheTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    public static function EnabledProvider()
+    {
+        return array(
+            array(array('cache.enabled' => 'true'), true),
+            array(array('cache.enabled' => true), true),
+            array(array(), false),
+            array(null, false)
+        );
+    }
+
+    public static function CachePathProvider()
+    {
+        return array(
+            array(array('cache.FileName' => 'temp.cache'), 'temp.cache'),
+            array(array(), 'auth.cache'),
+            array(null, 'auth.cache')
+        );
+    }
+
+    /**
+     *
+     * @dataProvider EnabledProvider
+     */
+    public function testIsEnabled($config, $expected)
+    {
+        $result = AuthorizationCache::isEnabled($config);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @dataProvider CachePathProvider
+     */
+    public function testCachePath($config, $expected)
+    {
+        $result = AuthorizationCache::cachePath($config);
+        $this->assertContains($expected, $result);
+    }
+
+}