diff options
| -rw-r--r-- | Auth/OpenID/MemcachedStore.php (renamed from contrib/MemcachedStore.php) | 44 | ||||
| -rw-r--r-- | Tests/Auth/OpenID/StoreTest.php | 54 | ||||
| -rw-r--r-- | admin/runtests | 1 |
3 files changed, 55 insertions, 44 deletions
diff --git a/contrib/MemcachedStore.php b/Auth/OpenID/MemcachedStore.php index c75384a..d357c6b 100644 --- a/contrib/MemcachedStore.php +++ b/Auth/OpenID/MemcachedStore.php @@ -10,8 +10,9 @@ * * @package OpenID * @author Artemy Tregubenko <me@arty.name> - * @copyright Open Web Technologies <http://openwebtech.ru/> - * @license http://www.gnu.org/copyleft/lesser.html LGPL + * @copyright 2008 JanRain, Inc. + * @license http://www.apache.org/licenses/LICENSE-2.0 Apache + * Contributed by Open Web Technologies <http://openwebtech.ru/> */ /** @@ -204,43 +205,4 @@ 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 diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php index 7c48cac..b656ba0 100644 --- a/Tests/Auth/OpenID/StoreTest.php +++ b/Tests/Auth/OpenID/StoreTest.php @@ -70,7 +70,7 @@ function _Auth_OpenID_getTmpDbName() * * @package OpenID */ -class Tests_Auth_OpenID_StoreTest extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Store extends PHPUnit_TestCase { /** * Prepares for the SQL store tests. @@ -403,7 +403,7 @@ explicitly'); * * @package OpenID */ -class Tests_Auth_OpenID_Included_StoreTest extends Tests_Auth_OpenID_StoreTest { +class Tests_Auth_OpenID_Included_StoreTest extends Tests_Auth_OpenID_Store { function test_memstore() { require_once 'Tests/Auth/OpenID/MemStore.php'; @@ -652,4 +652,54 @@ class Tests_Auth_OpenID_Included_StoreTest extends Tests_Auth_OpenID_StoreTest { } } +/** + * 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_Store { + 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; + } + require_once 'Auth/OpenID/MemcachedStore.php'; + + 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(); + } + } +} + +class Tests_Auth_OpenID_StoreTest extends PHPUnit_TestSuite { + function getName() + { + return "Tests_Auth_OpenID_StoreTest"; + } + + function Tests_Auth_OpenID_StoreTest() + { + $this->addTestSuite('Tests_Auth_OpenID_Included_StoreTest'); + $this->addTestSuite('Tests_Auth_OpenID_MemcachedStore_Test'); + } +} ?> diff --git a/admin/runtests b/admin/runtests index e1ce090..b018c87 100644 --- a/admin/runtests +++ b/admin/runtests @@ -37,7 +37,6 @@ test_docblocks () { } test_php () { - TEXTTEST_ARGS="--extra-tests=contrib/MemcachedStore.php" if uname -a | grep -i cygwin >/dev/null 2>/dev/null ; then /usr/bin/env php "$(dirname "$0")/texttest.php" --insecure-rand \ $TEXTTEST_ARGS |