[project @ Move Memcached store to contrib since it's not owned by JanRain]

2 files changed, 48 insertions, 39 deletions

diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php
index 4c7e43a..7c48cac 100644
--- a/Tests/Auth/OpenID/StoreTest.php
+++ b/Tests/Auth/OpenID/StoreTest.php
@@ -47,12 +47,6 @@ global $_Auth_OpenID_db_test_host;
 $_Auth_OpenID_db_test_host = 'dbtest';
 
 /**
- * This is the host where the Memcache stores should save data
- */
-global $_Auth_OpenID_memcache_test_host;
-$_Auth_OpenID_memcache_test_host = 'localhost';
-
-/**
  * Generate a sufficently unique database name so many hosts can run
  * SQL store tests on the server at the same time and not step on each
  * other.
@@ -71,7 +65,8 @@ function _Auth_OpenID_getTmpDbName()
 }
 
 /**
- * Tests the OpenID stores.
+ * Superclass that has methods for testing OpenID stores. Subclass this to
+ * test your own store implementation.
  *
  * @package OpenID
  */
@@ -402,6 +397,13 @@ explicitly');
         $Auth_OpenID_SKEW = $orig_skew;
     }
 
+}
+/**
+ * Class that tests all of the stores included with the OpenID library
+ *
+ * @package OpenID
+ */
+class Tests_Auth_OpenID_Included_StoreTest extends Tests_Auth_OpenID_StoreTest {
     function test_memstore()
     {
         require_once 'Tests/Auth/OpenID/MemStore.php';
@@ -431,38 +433,6 @@ explicitly');
         $store->destroy();
     }
 
-    function test_memcachedstore()
-    {
-        // If the memcache extension isn't loaded or loadable, succeed
-        // because we can't run the test.
-        if (!(extension_loaded('memcache') ||
-              @dl('memcache.so') ||
-              @dl('php_memcache.dll'))) {
-            print "(skipping memcache store tests)";
-            $this->pass();
-            return;
-        }
-
-        global $_Auth_OpenID_memcache_test_host;
-
-        $memcached = new Memcache();
-        if (!$memcached->connect($_Auth_OpenID_memcache_test_host)) {
-            // "Couldn't connect to Memcache server at '".
-            // $_Auth_OpenID_memcache_test_host);
-            $this->pass();
-        }
-
-        require_once 'Auth/OpenID/MemcachedStore.php';
-
-        $store = new Auth_OpenID_MemcachedStore($memcached);
-
-        $this->_testStore($store);
-        $this->_testNonce($store);
-        $this->_testNonceCleanup($store);
-
-        $memcached->close();
-    }
-
     function test_postgresqlstore()
     {
         // If the postgres extension isn't loaded or loadable, succeed
diff --git a/Auth/OpenID/MemcachedStore.php b/contrib/MemcachedStore.php
index 7f9b180..c75384a 100644
--- a/Auth/OpenID/MemcachedStore.php
+++ b/contrib/MemcachedStore.php
@@ -204,4 +204,43 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
     }
 }
 
+if (@require_once('Tests/Auth/OpenID/StoreTest.php')) {
+    /**
+     * This is the host that the store test will use
+     */
+    global $_Auth_OpenID_memcache_test_host;
+    $_Auth_OpenID_memcache_test_host = 'localhost';
+
+    class Tests_Auth_OpenID_MemcachedStore_Test extends Tests_Auth_OpenID_StoreTest {
+        function test_memcache()
+        {
+            // If the memcache extension isn't loaded or loadable, succeed
+            // because we can't run the test.
+            if (!(extension_loaded('memcache') ||
+                  @dl('memcache.so') ||
+                  @dl('php_memcache.dll'))) {
+                print "(skipping memcache store tests)";
+                $this->pass();
+                return;
+            }
+
+            global $_Auth_OpenID_memcache_test_host;
+
+            $memcached = new Memcache();
+            if (!$memcached->connect($_Auth_OpenID_memcache_test_host)) {
+                print "(skipping memcache store tests - couldn't connect)";
+                $this->pass();
+            } else {
+                $store = new Auth_OpenID_MemcachedStore($memcached);
+
+                $this->_testStore($store);
+                $this->_testNonce($store);
+                $this->_testNonceCleanup($store);
+
+                $memcached->close();
+            }
+        }
+    }
+}
+
 ?>
\ No newline at end of file