Merge branch 'master' of https://github.com/marc-mabe/zf2 into hotfix…

…/cache-pattern-tests
zendframework · Jan 9, 2012 · a75171a · a75171a
2 parents a9cb316 + c8c146e
commit a75171a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
@@ -75,9 +75,11 @@ public function __construct($options = null)
 
         parent::__construct($options);
 
+        // It's ok to add server as soon as possible because
+        // ext/memcached auto-connects to the server on first use
+        // TODO: Handle multiple servers
         $options = $this->getOptions();
         $this->memcached->addServer($options->getServer(), $options->getPort());
-
     }
 
     /* options */

diff --git a/test/Pattern/CallbackCacheTest.php b/test/Pattern/CallbackCacheTest.php
@@ -115,8 +115,6 @@ public function testMagicFunctionCall()
 
     public function testCallWithPredefinedCallbackAndArgumentKey()
     {
-        $this->markTestIncomplete();
-
         $callback = __NAMESPACE__ . '\TestCallbackCache::emptyMethod';
         $args     = array('arg1', 2, 3.33, null);
         $options = array(
@@ -125,26 +123,30 @@ public function testCallWithPredefinedCallbackAndArgumentKey()
         );
 
         $expectedKey = md5($options['callback_key'].$options['argument_key']);
+        $usedKey     = null;
+        $this->_options->getStorage()->events()->attach('setItem.pre', function ($event) use (&$usedKey) {
+            $params = $event->getParams();
+            $usedKey = $params['key'];
+        });
 
         $this->_pattern->call($callback, $args, $options);
-        $this->assertEquals(
-            $expectedKey,
-            $this->_storage->getLastKey() // get the last used key by storage
-        );
+        $this->assertEquals($expectedKey, $usedKey);
     }
 
     public function testGenerateKey()
     {
-        $this->markTestIncomplete();
-
         $callback = __NAMESPACE__ . '\TestCallbackCache::emptyMethod';
         $args     = array('arg1', 2, 3.33, null);
 
+        $generatedKey = $this->_pattern->generateKey($callback, $args);
+        $usedKey      = null;
+        $this->_options->getStorage()->events()->attach('setItem.pre', function ($event) use (&$usedKey) {
+            $params = $event->getParams();
+            $usedKey = $params['key'];
+        });
+
         $this->_pattern->call($callback, $args);
-        $this->assertEquals(
-            $this->_storage->getLastKey(), // get the last used key by storage
-            $this->_pattern->generateKey($callback, $args)
-        );
+        $this->assertEquals($generatedKey, $usedKey);
     }
 
     public function testGenerateKeyWithPredefinedCallbackAndArgumentKey()

diff --git a/test/Pattern/ClassCacheTest.php b/test/Pattern/ClassCacheTest.php
@@ -98,14 +98,17 @@ public function testCallDisabledCacheOutput()
 
     public function testGenerateKey()
     {
-        $this->markTestIncomplete();
-
         $args = array('arg1', 2, 3.33, null);
+
+        $generatedKey = $this->_pattern->generateKey('emptyMethod', $args);
+        $usedKey      = null;
+        $this->_options->getStorage()->events()->attach('setItem.pre', function ($event) use (&$usedKey) {
+            $params = $event->getParams();
+            $usedKey = $params['key'];
+        });
+
         $this->_pattern->call('emptyMethod', $args);
-        $this->assertEquals(
-            $this->_storage->getLastKey(), // get the last used key by storage
-            $this->_pattern->generateKey('emptyMethod', $args)
-        );
+        $this->assertEquals($generatedKey, $usedKey);
     }
 
     public function testCallUnknownMethodException()

diff --git a/test/Pattern/ObjectCacheTest.php b/test/Pattern/ObjectCacheTest.php
@@ -112,14 +112,17 @@ public function testCallInvoke()
 
     public function testGenerateKey()
     {
-        $this->markTestIncomplete();
-
         $args = array('arg1', 2, 3.33, null);
+
+        $generatedKey = $this->_pattern->generateKey('emptyMethod', $args);
+        $usedKey      = null;
+        $this->_options->getStorage()->events()->attach('setItem.pre', function ($event) use (&$usedKey) {
+            $params = $event->getParams();
+            $usedKey = $params['key'];
+        });
+
         $this->_pattern->call('emptyMethod', $args);
-        $this->assertEquals(
-            $this->_storage->getLastKey(), // get the last used key by storage
-            $this->_pattern->generateKey('emptyMethod', $args)
-        );
+        $this->assertEquals($generatedKey, $usedKey);
     }
 
     public function testGenerateKeyWithPredefinedCallbackAndArgumentKey()