Merge pull request #29 from kschroeder/develop

Testing the cache factory with the Redis and Filesystsem adapters
magium · Feb 17, 2017 · 84df873 · 84df873
2 parents 62d33e6 + 6c190c5
commit 84df873
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 5 deletions.
diff --git a/lib/Manager/CacheFactory.php b/lib/Manager/CacheFactory.php
@@ -14,11 +14,8 @@ public function getCache(\SimpleXMLElement $element)
             'options'   => []
         ];
         if (isset($element->options)) {
-            foreach ($element->options->children() as $value) {
-                if ($value instanceof \SimpleXMLElement) {
-                    $config['options'][$value->getName()] = (string)$value;
-                }
-            }
+            $options = json_encode($element->options);
+            $config['options'] = json_decode($options, true);
         }
         $cache = StorageFactory::factory($config);
         return $cache;

diff --git a/tests/Manager/CacheFactoryTest.php b/tests/Manager/CacheFactoryTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Magium\Configuration\Tests\Manager;
+
+use Magium\Configuration\Manager\CacheFactory;
+use PHPUnit\Framework\TestCase;
+use Zend\Cache\Storage\Adapter\Filesystem;
+use Zend\Cache\Storage\Adapter\Redis;
+
+class CacheFactoryTest extends TestCase
+{
+
+    public function testBasicCacheConfiguration()
+    {
+        $simpleXml = simplexml_load_string(
+            <<<XML
+<?xml version="1.0" encoding="UTF-8" ?>
+<magium xmlns="http://www.magiumlib.com/BaseConfiguration">
+    <persistenceConfiguration>
+        <driver></driver>
+        <database></database>
+    </persistenceConfiguration>
+    <contextConfigurationFile file="asd" type="xml"/>
+    <cache>
+        <adapter>filesystem</adapter>
+    </cache>
+</magium>
+XML
+        );
+
+        $cacheFactory = new CacheFactory();
+        $cache = $cacheFactory->getCache($simpleXml->cache);
+        self::assertInstanceOf(Filesystem::class, $cache);
+    }
+    public function testCacheConfigurationWithRecursiveOptions()
+    {
+        $redis = extension_loaded('redis');
+        if (!$redis) {
+            self::markTestSkipped('Redis extension is not loaded');
+        }
+        $simpleXml = simplexml_load_string(
+            <<<XML
+<?xml version="1.0" encoding="UTF-8" ?>
+<magium xmlns="http://www.magiumlib.com/BaseConfiguration">
+    <persistenceConfiguration>
+        <driver></driver>
+        <database></database>
+    </persistenceConfiguration>
+    <contextConfigurationFile file="asd" type="xml"/>
+    <cache>
+        <adapter>redis</adapter>
+        <options>
+                <server>localhost:6379</server>
+        </options>
+        
+    </cache>
+</magium>
+XML
+        );
+
+        $cacheFactory = new CacheFactory();
+        $methods = get_class_methods(new Redis());
+        $cache = $cacheFactory->getCache($simpleXml->cache);
+        self::assertInstanceOf(Redis::class, $cache);
+    }
+
+}