From cab1060a7636a64eb18137720fa0565e6d9e47f3 Mon Sep 17 00:00:00 2001
From: Drak <drak@zikula.org>
Date: Sun, 12 Feb 2012 20:05:27 +0545
Subject: [PATCH] [HttpFoundation] Add tests for session memcache/d storage
 drivers.

---
 .../Session/Storage/MemcachedSessionStorage.php      | 12 +++---------
 .../Session/Storage/MemcacheSessionStorageTest.php   | 11 ++---------
 .../Session/Storage/MemcachedSessionStorageTest.php  | 11 ++---------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php
index 180a3e74ff..51481cd9d1 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php
@@ -47,11 +47,9 @@ class MemcachedSessionStorage extends AbstractSessionStorage implements SessionS
 
         // defaults
         if (!isset($memcachedOptions['serverpool'])) {
-            $memcachedOptions['serverpool'] = array(
+            $memcachedOptions['serverpool'][] = array(
                 'host' => '127.0.0.1',
                 'port' => 11211,
-                'timeout' => 1,
-                'persistent' => false,
                 'weight' => 1);
         }
 
@@ -59,7 +57,7 @@ class MemcachedSessionStorage extends AbstractSessionStorage implements SessionS
 
         $this->memcached->setOption(\Memcached::OPT_PREFIX_KEY, isset($memcachedOptions['prefix']) ? $memcachedOptions['prefix'] : 'sf2s');
 
-        $this->memcacheOptions = $memcachedOptions;
+        $this->memcachedOptions = $memcachedOptions;
 
         parent::__construct($options);
     }
@@ -69,11 +67,7 @@ class MemcachedSessionStorage extends AbstractSessionStorage implements SessionS
      */
     public function openSession($savePath, $sessionName)
     {
-        foreach ($this->memcachedOptions['serverpool'] as $server) {
-            $this->addServer($server);
-        }
-
-        return true;
+        return $this->memcached->addServers($this->memcachedOptions['serverpool']);
     }
 
     /**
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php
index f644b06c52..7ae5db3680 100644
--- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php
+++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcacheSessionStorageTest.php
@@ -29,14 +29,6 @@ class MemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase
         $this->storage = null;
     }
 
-    public function testConstructor()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
     public function testOpenSession()
     {
         $this->memcache->expects($this->atLeastOnce())
@@ -48,7 +40,8 @@ class MemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase
     public function testCloseSession()
     {
         $this->memcache->expects($this->once())
-            ->method('close');
+            ->method('close')
+            ->will($this->returnValue(true));
 
         $this->assertTrue($this->storage->closeSession());
     }
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php
index a4a23b1e51..4f6d516b55 100644
--- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php
+++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MemcachedSessionStorageTest.php
@@ -29,18 +29,11 @@ class MemcacheddSessionStorageTest extends \PHPUnit_Framework_TestCase
         $this->storage = null;
     }
 
-    public function testConstructor()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
     public function testOpenSession()
     {
         $this->memcached->expects($this->atLeastOnce())
-            ->method('addServer');
+            ->method('addServers')
+            ->will($this->returnValue(true));
 
         $this->assertTrue($this->storage->openSession('', ''));
     }