diff options
| -rw-r--r-- | Tests/Auth/OpenID/Discover_OpenID.php (renamed from Tests/Auth/OpenID/Discover.php) | 2 | ||||
| -rw-r--r-- | Tests/Services/Yadis/Discover_Yadis.php (renamed from Tests/Services/Yadis/Discover.php) | 6 | ||||
| -rw-r--r-- | Tests/TestDriver.php | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Tests/Auth/OpenID/Discover.php b/Tests/Auth/OpenID/Discover_OpenID.php index 06ff4d2..40bc04d 100644 --- a/Tests/Auth/OpenID/Discover.php +++ b/Tests/Auth/OpenID/Discover_OpenID.php @@ -372,7 +372,7 @@ function __serviceCheck_discover_cb($url, $fetcher) return array($__Tests_BOGUS_SERVICE); } -class Tests_Auth_OpenID_Discover extends _DiscoveryBase { +class Tests_Auth_OpenID_Discover_OpenID extends _DiscoveryBase { function _usedYadis($service) { $this->assertTrue($service->used_yadis, diff --git a/Tests/Services/Yadis/Discover.php b/Tests/Services/Yadis/Discover_Yadis.php index 27a9ebc..b07747e 100644 --- a/Tests/Services/Yadis/Discover.php +++ b/Tests/Services/Yadis/Discover_Yadis.php @@ -150,14 +150,14 @@ class _TestCase extends PHPUnit_TestCase { } } -class Tests_Services_Yadis_Discover extends PHPUnit_TestSuite { +class Tests_Services_Yadis_Discover_Yadis extends PHPUnit_TestSuite { function getName() { - return "Tests_Services_Yadis_Discover"; + return "Tests_Services_Yadis_Discover_Yadis"; } - function Tests_Services_Yadis_Discover() + function Tests_Services_Yadis_Discover_Yadis() { global $testlist; diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php index 0cf1866..8065975 100644 --- a/Tests/TestDriver.php +++ b/Tests/TestDriver.php @@ -117,7 +117,7 @@ $_tests = array( 'Consumer', 'CryptUtil', 'DiffieHellman', - 'Discover', + 'Discover_OpenID', 'HMACSHA1', 'KVForm', 'Message', @@ -136,7 +136,7 @@ $_tests = array( 'ParseHTML', 'XRDS', 'Yadis', - 'Discover', + 'Discover_Yadis', 'XRI' ) ) @@ -182,10 +182,12 @@ function loadSuite($names=null) } } $selected = selectTests($names); + $result = array(); foreach ($_tests as $package) { $result = array_merge($result, loadTests($package['dir'], $selected)); } + return $result; } ?> |