diff options
| author | Luke Shepard <lshepard@devrs006.snc1.facebook.com> | 2009-05-27 10:54:14 -0700 |
|---|---|---|
| committer | Luke Shepard <lshepard@devrs006.snc1.facebook.com> | 2009-05-27 10:54:14 -0700 |
| commit | ae52c6b3a3b9741c0ef60b6c91ba27af1d85eab7 (patch) | |
| tree | 450c172565fffe576264e64ea83a9c4978709da9 | |
| parent | 5a96dc7b3fbd600f5acbbf08cf8d2d131aa7f2d3 (diff) | |
| download | php-openid-ae52c6b3a3b9741c0ef60b6c91ba27af1d85eab7.zip php-openid-ae52c6b3a3b9741c0ef60b6c91ba27af1d85eab7.tar.gz php-openid-ae52c6b3a3b9741c0ef60b6c91ba27af1d85eab7.tar.bz2 | |
[ Upgrading php-openid test framework to use PHPUnit 3.3 ]
Reviewed By: Will Norris
The set of tests assumes PHPUnit 2.3, which conflicts with my environment setup.
I think PHPUnit 3.3 is pretty widespread now, and under active maintenance
(latest rev 4/10/2009).
There's a few changes included here. I did a few mostly automated code
transformations:
replace "PHPUnit_TestCase" "PHPUnit_Framework_TestCase"
replace "PHPUnit_TestSuite" "PHPUnit_Framework_TestSuite"
removed all require_once "PHPUnit.php" - they are unnecessary.
"call by reference" is now deprecated, so changed "&$" to "$"
I also made a few changes to admin/testtext.php and Tests/TestDriver.php to
accomodate the new syntax.
Note that this just upgrades the framework; it does not guarantee that all tests
pass. I'll submit future diffs to fix or disable failing unit tests. I wasn't
able to get the tests running with the previous version, so I don't know if
these have always been failing.
I doubt that the github has automatically running unit tests, but if so then
we'll have to make sure that the central repo is running the same version of
PHPUnit.
37 files changed, 215 insertions, 250 deletions
diff --git a/Auth/OpenID/AX.php b/Auth/OpenID/AX.php index 4a617ae..2a52448 100644 --- a/Auth/OpenID/AX.php +++ b/Auth/OpenID/AX.php @@ -888,7 +888,7 @@ class Auth_OpenID_AX_FetchResponse extends Auth_OpenID_AX_KeyValueMessage { $ax_args['update_url'] = $update_url; } - Auth_OpenID::update(&$ax_args, $kv_args); + Auth_OpenID::update($ax_args, $kv_args); return $ax_args; } @@ -960,7 +960,7 @@ class Auth_OpenID_AX_StoreRequest extends Auth_OpenID_AX_KeyValueMessage { { $ax_args = $this->_newArgs(); $kv_args = $this->_getExtensionKVArgs($aliases); - Auth_OpenID::update(&$ax_args, $kv_args); + Auth_OpenID::update($ax_args, $kv_args); return $ax_args; } } diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php index 62aeb1d..c10c82d 100644 --- a/Auth/OpenID/Discover.php +++ b/Auth/OpenID/Discover.php @@ -433,7 +433,7 @@ function Auth_OpenID_discoverWithYadis($uri, &$fetcher, $openid_services = array(); $response = call_user_func_array($discover_function, - array($uri, &$fetcher)); + array($uri, $fetcher)); $yadis_url = $response->normalized_uri; $yadis_services = array(); @@ -460,7 +460,7 @@ function Auth_OpenID_discoverWithYadis($uri, &$fetcher, } $openid_services = call_user_func_array($endpoint_filter, - array(&$openid_services)); + array($openid_services)); return array($yadis_url, $openid_services); } diff --git a/Auth/Yadis/ParanoidHTTPFetcher.php b/Auth/Yadis/ParanoidHTTPFetcher.php index 6a41826..a62f36c 100644 --- a/Auth/Yadis/ParanoidHTTPFetcher.php +++ b/Auth/Yadis/ParanoidHTTPFetcher.php @@ -109,9 +109,9 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher { } curl_setopt($c, CURLOPT_WRITEFUNCTION, - array(&$this, "_writeData")); + array($this, "_writeData")); curl_setopt($c, CURLOPT_HEADERFUNCTION, - array(&$this, "_writeHeader")); + array($this, "_writeHeader")); if ($extra_headers) { curl_setopt($c, CURLOPT_HTTPHEADER, $extra_headers); @@ -190,7 +190,7 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher { curl_setopt($c, CURLOPT_TIMEOUT, $this->timeout); curl_setopt($c, CURLOPT_URL, $url); curl_setopt($c, CURLOPT_WRITEFUNCTION, - array(&$this, "_writeData")); + array($this, "_writeData")); curl_exec($c); diff --git a/Tests/Auth/OpenID/AX.php b/Tests/Auth/OpenID/AX.php index 1b46945..f723379 100644 --- a/Tests/Auth/OpenID/AX.php +++ b/Tests/Auth/OpenID/AX.php @@ -4,7 +4,6 @@ * Tests for the attribute exchange extension module */ -require_once "PHPUnit.php"; require_once "Auth/OpenID/AX.php"; require_once "Auth/OpenID/Message.php"; require_once "Auth/OpenID/Consumer.php"; @@ -19,7 +18,7 @@ class BogusAXMessage extends Auth_OpenID_AX_Message { } } -class AXMessageTest extends PHPUnit_TestCase { +class AXMessageTest extends PHPUnit_Framework_TestCase { function setUp() { $this->bax = new BogusAXMessage(); @@ -48,7 +47,7 @@ class AXMessageTest extends PHPUnit_TestCase { } } -class AttrInfoTest extends PHPUnit_TestCase { +class AttrInfoTest extends PHPUnit_Framework_TestCase { function test_construct() { $type_uri = 'a uri'; @@ -61,7 +60,7 @@ class AttrInfoTest extends PHPUnit_TestCase { } } -class ToTypeURIsTest extends PHPUnit_TestCase { +class ToTypeURIsTest extends PHPUnit_Framework_TestCase { function setUp() { $this->aliases = new Auth_OpenID_NamespaceMap(); @@ -107,7 +106,7 @@ class ToTypeURIsTest extends PHPUnit_TestCase { } } -class ParseAXValuesTest extends PHPUnit_TestCase { +class ParseAXValuesTest extends PHPUnit_Framework_TestCase { function failUnlessAXKeyError($ax_args) { $msg = new Auth_OpenID_AX_KeyValueMessage(); @@ -250,7 +249,7 @@ class ParseAXValuesTest extends PHPUnit_TestCase { } } -class FetchRequestTest extends PHPUnit_TestCase { +class FetchRequestTest extends PHPUnit_Framework_TestCase { function setUp() { $this->msg = new Auth_OpenID_AX_FetchRequest(); @@ -523,7 +522,7 @@ class FauxEndpoint { } } -class FetchResponseTest extends PHPUnit_TestCase { +class FetchResponseTest extends PHPUnit_Framework_TestCase { function setUp() { $this->msg = new Auth_OpenID_AX_FetchResponse(); @@ -638,9 +637,9 @@ class FetchResponseTest extends PHPUnit_TestCase { function test_fromSuccessResponseWithoutExtension() { - $args = array( + $args = array( 'mode' => 'id_res', - 'ns' => Auth_OpenID_OPENID2_NS + 'ns' => Auth_OpenID_OPENID2_NS ); $sf = array(); foreach (array_keys($args) as $k) { @@ -655,7 +654,7 @@ class FetchResponseTest extends PHPUnit_TestCase { function test_fromSuccessResponseWithoutData() { - $args = array( + $args = array( 'mode' => 'id_res', 'ns' => Auth_OpenID_OPENID2_NS, 'ns.ax' => Auth_OpenID_AX_NS_URI, @@ -677,7 +676,7 @@ class FetchResponseTest extends PHPUnit_TestCase { $name = "ziggy"; $value = "stardust"; $uri = "http://david.bowie.name/"; - $args = array( + $args = array( 'mode' => 'id_res', 'ns' => Auth_OpenID_OPENID2_NS, 'ns.ax' => Auth_OpenID_AX_NS_URI, @@ -702,7 +701,7 @@ class FetchResponseTest extends PHPUnit_TestCase { } } -class StoreRequestTest extends PHPUnit_TestCase { +class StoreRequestTest extends PHPUnit_Framework_TestCase { function setUp() { $this->msg = new Auth_OpenID_AX_StoreRequest(); @@ -742,7 +741,7 @@ class StoreRequestTest extends PHPUnit_TestCase { } } -class StoreResponseTest extends PHPUnit_TestCase { +class StoreResponseTest extends PHPUnit_Framework_TestCase { function test_success() { $msg = new Auth_OpenID_AX_StoreResponse(); @@ -772,7 +771,7 @@ class StoreResponseTest extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_AX extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_AX extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_OpenID_AX"; diff --git a/Tests/Auth/OpenID/Association.php b/Tests/Auth/OpenID/Association.php index 9fc6e17..98b2e64 100644 --- a/Tests/Auth/OpenID/Association.php +++ b/Tests/Auth/OpenID/Association.php @@ -13,10 +13,9 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/Association.php'; -class Tests_Auth_OpenID_Association extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Association extends PHPUnit_Framework_TestCase { function test_me() { $issued = time(); diff --git a/Tests/Auth/OpenID/AssociationResponse.php b/Tests/Auth/OpenID/AssociationResponse.php index da80d15..bb37350 100644 --- a/Tests/Auth/OpenID/AssociationResponse.php +++ b/Tests/Auth/OpenID/AssociationResponse.php @@ -1,6 +1,5 @@ <?php -require_once "PHPUnit.php"; require_once "Tests/Auth/OpenID/TestUtil.php"; require_once "Tests/Auth/OpenID/MemStore.php"; @@ -39,7 +38,7 @@ function mkAssocResponse($keys) return Auth_OpenID_Message::fromOpenIDArgs($args); } -class Tests_Auth_OpenID_AssociationResponse extends PHPUnit_TestCase { +class Tests_Auth_OpenID_AssociationResponse extends PHPUnit_Framework_TestCase { function setUp() { $this->store = new Tests_Auth_OpenID_MemStore(); diff --git a/Tests/Auth/OpenID/AuthRequest.php b/Tests/Auth/OpenID/AuthRequest.php index 63e4d4e..9f73814 100644 --- a/Tests/Auth/OpenID/AuthRequest.php +++ b/Tests/Auth/OpenID/AuthRequest.php @@ -1,7 +1,5 @@ <?php -require_once 'PHPUnit.php'; - require_once 'Tests/Auth/OpenID/TestUtil.php'; require_once 'Auth/OpenID/Association.php'; @@ -283,7 +281,7 @@ class TestAuthRequestOpenID2Immediate extends TestAuthRequestOpenID2 { var $expected_mode = 'checkid_immediate'; } -class Tests_Auth_OpenID_AuthRequest extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_AuthRequest extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/Auth/OpenID/BigMath.php b/Tests/Auth/OpenID/BigMath.php index 2a51871..951c9e2 100644 --- a/Tests/Auth/OpenID/BigMath.php +++ b/Tests/Auth/OpenID/BigMath.php @@ -13,15 +13,14 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/BigMath.php'; require_once 'Tests/Auth/OpenID/TestUtil.php'; -class Tests_Auth_OpenID_BinLongConvertRnd extends PHPUnit_TestCase { +class Tests_Auth_OpenID_BinLongConvertRnd extends PHPUnit_Framework_TestCase { var $lib; var $max; - function Tests_Auth_OpenID_BinLongConvertRnd(&$lib, $max) + function Tests_Auth_OpenID_BinLongConvertRnd($lib, $max) { $this->lib =& $lib; $this->max = $max; @@ -41,12 +40,12 @@ class Tests_Auth_OpenID_BinLongConvertRnd extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_BinLongConvert extends PHPUnit_TestCase { +class Tests_Auth_OpenID_BinLongConvert extends PHPUnit_Framework_TestCase { var $lib; var $bin; var $lng; - function Tests_Auth_OpenID_BinLongConvert(&$lib, $bin, $lng) + function Tests_Auth_OpenID_BinLongConvert($lib, $bin, $lng) { $this->lib =& $lib; $this->bin = $bin; @@ -62,12 +61,12 @@ class Tests_Auth_OpenID_BinLongConvert extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Base64ToLong extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Base64ToLong extends PHPUnit_Framework_TestCase { var $num; var $b64; var $lib; - function Tests_Auth_OpenID_Base64ToLong(&$lib, $b64, $num) + function Tests_Auth_OpenID_Base64ToLong($lib, $b64, $num) { $this->lib = $lib; $this->b64 = $b64; @@ -82,7 +81,7 @@ class Tests_Auth_OpenID_Base64ToLong extends PHPUnit_TestCase { } class Tests_Auth_OpenID_LongToBase64 extends Tests_Auth_OpenID_Base64ToLong { - function Tests_Auth_OpenID_LongToBase64(&$lib, $b64, $num) + function Tests_Auth_OpenID_LongToBase64($lib, $b64, $num) { $this->lib = $lib; $this->b64 = $b64; @@ -96,8 +95,8 @@ class Tests_Auth_OpenID_LongToBase64 extends Tests_Auth_OpenID_Base64ToLong { } } -class Tests_Auth_OpenID_Rand extends PHPUnit_TestCase { - function Tests_Auth_OpenID_Rand(&$lib) +class Tests_Auth_OpenID_Rand extends PHPUnit_Framework_TestCase { + function Tests_Auth_OpenID_Rand($lib) { $this->lib =& $lib; } @@ -141,7 +140,7 @@ function Tests_Auth_OpenID_maxint() } -class Tests_Auth_OpenID_BigMath extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_BigMath extends PHPUnit_Framework_TestSuite { function _parseBase64Data() { $lines = Tests_Auth_OpenID_readlines('n2b64'); @@ -220,15 +219,16 @@ class Tests_Auth_OpenID_BigMath extends PHPUnit_TestSuite { function Tests_Auth_OpenID_BigMath($name) { $this->setName($name); - - if (!defined('Auth_OpenID_NO_MATH_SUPPORT')) { - $this->addTestSuite('Tests_Auth_OpenID_BigInt'); - $this->_addB64Tests(); - $this->_addBinLongTests(); - $test = new Tests_Auth_OpenID_Rand(Auth_OpenID_getMathLib()); - $test->setName('Big number rand'); - $this->addTest($test); + + if (defined('Auth_OpenID_NO_MATH_SUPPORT')) { + return; } + + $this->_addB64Tests(); + $this->_addBinLongTests(); + $test = new Tests_Auth_OpenID_Rand(Auth_OpenID_getMathLib()); + $test->setName('Big number rand'); + $this->addTest($test); } } diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php index a762a9d..aa12671 100644 --- a/Tests/Auth/OpenID/Consumer.php +++ b/Tests/Auth/OpenID/Consumer.php @@ -13,8 +13,6 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -@session_start(); - require_once 'Auth/OpenID/CryptUtil.php'; require_once 'Auth/Yadis/HTTPFetcher.php'; require_once 'Auth/OpenID/DiffieHellman.php'; @@ -26,7 +24,6 @@ require_once 'Auth/OpenID/Nonce.php'; require_once 'Auth/OpenID/SReg.php'; require_once 'Auth/OpenID/Message.php'; require_once 'Tests/Auth/OpenID/MemStore.php'; -require_once 'PHPUnit.php'; /* * Convenience function to create a SuccessResponse with the given @@ -54,7 +51,7 @@ class FastConsumerSession extends Auth_OpenID_DiffieHellmanSHA1ConsumerSession { } } -function setConsumerSession(&$con) +function setConsumerSession($con) { $con->session_types = array('DH-SHA1' => 'FastConsumerSession'); } @@ -192,10 +189,10 @@ $_Auth_OpenID_server_url = "http://server.example.com/"; global $_Auth_OpenID_consumer_url; $_Auth_OpenID_consumer_url = "http://consumer.example.com/"; -class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Consumer extends PHPUnit_Framework_TestCase { - function _run(&$consumer, $user_url, $mode, $delegate_url, - &$fetcher, &$store, $immediate) + function _run($consumer, $user_url, $mode, $delegate_url, + $fetcher, $store, $immediate) { global $_Auth_OpenID_consumer_url, $_Auth_OpenID_server_url; @@ -372,7 +369,7 @@ class ConfigurableConsumer extends Auth_OpenID_GenericConsumer { } } -class _TestIdRes extends PHPUnit_TestCase { +class _TestIdRes extends PHPUnit_Framework_TestCase { var $consumer_class = 'ConfigurableConsumer'; function setUp() @@ -1133,7 +1130,7 @@ class TempConsumer extends ConfigurableConsumer { } } -class TestCompleteMissingSig extends PHPUnit_TestCase { +class TestCompleteMissingSig extends PHPUnit_Framework_TestCase { function setUp() { @@ -1224,7 +1221,7 @@ class TestCompleteMissingSig extends PHPUnit_TestCase { } } -class TestReturnToArgs extends PHPUnit_TestCase { +class TestReturnToArgs extends PHPUnit_Framework_TestCase { function setUp() { $store = null; @@ -1586,7 +1583,7 @@ class Tests_Auth_OpenID_Consumer_TestCheckAuth extends _TestIdRes { } } -class Tests_Auth_OpenID_Consumer_TestFetchAssoc extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Consumer_TestFetchAssoc extends PHPUnit_Framework_TestCase { function setUp() { $this->store = new Tests_Auth_OpenID_MemStore(); @@ -1659,7 +1656,7 @@ class Tests_Auth_OpenID_Consumer_TestFetchAssoc extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_AuthRequestHTMLMarkup extends PHPUnit_TestCase { +class Tests_Auth_OpenID_AuthRequestHTMLMarkup extends PHPUnit_Framework_TestCase { function setUp() { $this->endpoint = new Auth_OpenID_ServiceEndpoint(); @@ -1681,7 +1678,7 @@ class Tests_Auth_OpenID_AuthRequestHTMLMarkup extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_SuccessResponse extends PHPUnit_TestCase { +class Tests_Auth_OpenID_SuccessResponse extends PHPUnit_Framework_TestCase { function setUp() { $this->endpoint = new Auth_OpenID_ServiceEndpoint(); @@ -1781,7 +1778,7 @@ class _StubConsumer { } } -class Tests_Auth_OpenID_DiscoFailure extends PHPUnit_TestCase { +class Tests_Auth_OpenID_DiscoFailure extends PHPUnit_Framework_TestCase { var $consumerClass = null; function setUp() @@ -1796,9 +1793,9 @@ class Tests_Auth_OpenID_DiscoFailure extends PHPUnit_TestCase { $this->store = null; $this->session = new Auth_Yadis_PHPSession(); $cls = $this->consumerClass; - $this->consumer =& new $cls($this->store, &$this->session); + $this->consumer =& new $cls($this->store, $this->session); $this->consumer->consumer =& new _StubConsumer(); - $this->discovery =& new Auth_Yadis_Discovery(&$this->session, + $this->discovery =& new Auth_Yadis_Discovery($this->session, $this->claimed_id, $this->consumer->session_key_prefix); } @@ -1815,7 +1812,7 @@ class Consumer_completeEmptySession extends Auth_OpenID_GenericConsumer { } } -class Tests_Auth_OpenID_ConsumerTest2 extends PHPUnit_TestCase { +class Tests_Auth_OpenID_ConsumerTest2 extends PHPUnit_Framework_TestCase { function setUp() { foreach ($_SESSION as $k => $v) { @@ -1829,7 +1826,7 @@ class Tests_Auth_OpenID_ConsumerTest2 extends PHPUnit_TestCase { $this->session = new Auth_Yadis_PHPSession(); $this->consumer =& new Auth_OpenID_Consumer($this->store, $this->session); $this->consumer->consumer =& new _StubConsumer(); - $this->discovery =& new Auth_Yadis_Discovery(&$this->session, + $this->discovery =& new Auth_Yadis_Discovery($this->session, $this->claimed_id, $this->consumer->session_key_prefix); } @@ -2047,7 +2044,7 @@ class IDPDrivenTest_Consumer2 extends ConfigurableConsumer { } } -class IDPDrivenTest extends PHPUnit_TestCase { +class IDPDrivenTest extends PHPUnit_Framework_TestCase { function setUp() { $this->store = new GoodAssocStore(); @@ -2067,7 +2064,7 @@ class IDPDrivenTest extends PHPUnit_TestCase { global $GOODSIG; $this->consumer = new IDPDrivenTest_Consumer1($this->store); - $this->consumer->failure_cb = array(&$this, "assertTrue"); + $this->consumer->failure_cb = array($this, "assertTrue"); $this->consumer->check_endpoint =& $this->endpoint; $identifier = '=directed_identifier'; @@ -2134,7 +2131,7 @@ class TestDiscoveryVerification_test_otherServer extends Auth_OpenID_GenericCons } } -class TestDiscoveryVerification extends PHPUnit_TestCase { +class TestDiscoveryVerification extends PHPUnit_Framework_TestCase { var $services = array(); function discoveryFunc($identifier) @@ -2240,7 +2237,7 @@ class DummyEndpoint { } } -class TestCreateAssociationRequest extends PHPUnit_TestCase { +class TestCreateAssociationRequest extends PHPUnit_Framework_TestCase { function setUp() { $this->endpoint = new DummyEndpoint(); @@ -2354,7 +2351,7 @@ class TestCreateAssociationRequest extends PHPUnit_TestCase { } } -class TestDiffieHellmanResponseParameters extends PHPUnit_TestCase { +class TestDiffieHellmanResponseParameters extends PHPUnit_Framework_TestCase { var $session_cls = null; var $message_namespace = null; @@ -2454,7 +2451,7 @@ if (!defined('Auth_OpenID_NO_MATH_SUPPORT') && } } -class Tests_Auth_OpenID_KVPost extends PHPUnit_TestCase { +class Tests_Auth_OpenID_KVPost extends PHPUnit_Framework_TestCase { function setUp() { $this->server_url = 'http://unittest/bogus'; diff --git a/Tests/Auth/OpenID/CryptUtil.php b/Tests/Auth/OpenID/CryptUtil.php index f158c1c..a4f838c 100644 --- a/Tests/Auth/OpenID/CryptUtil.php +++ b/Tests/Auth/OpenID/CryptUtil.php @@ -13,11 +13,10 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID.php'; require_once 'Auth/OpenID/CryptUtil.php'; -class Tests_Auth_OpenID_CryptUtil extends PHPUnit_TestCase { +class Tests_Auth_OpenID_CryptUtil extends PHPUnit_Framework_TestCase { function test_length() { $cases = array(1, 10, 255); diff --git a/Tests/Auth/OpenID/DiffieHellman.php b/Tests/Auth/OpenID/DiffieHellman.php index 080d909..173fc35 100644 --- a/Tests/Auth/OpenID/DiffieHellman.php +++ b/Tests/Auth/OpenID/DiffieHellman.php @@ -14,11 +14,10 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/DiffieHellman.php'; require_once 'Tests/Auth/OpenID/TestUtil.php'; -class Tests_Auth_OpenID_DiffieHellman_CheckCases extends PHPUnit_TestCase { +class Tests_Auth_OpenID_DiffieHellman_CheckCases extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_DiffieHellman_CheckCases($cases, $n) { $this->cases = $cases; @@ -31,7 +30,7 @@ class Tests_Auth_OpenID_DiffieHellman_CheckCases extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_DiffieHellman_Private extends PHPUnit_TestCase { +class Tests_Auth_OpenID_DiffieHellman_Private extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_DiffieHellman_Private($name, $input, $expected) { $this->setName("$name"); @@ -47,7 +46,7 @@ class Tests_Auth_OpenID_DiffieHellman_Private extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_DiffieHellman_Exch extends PHPUnit_TestCase { +class Tests_Auth_OpenID_DiffieHellman_Exch extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_DiffieHellman_Exch($name, $p1, $p2, $shared) { $this->setName("$name"); @@ -69,7 +68,7 @@ class Tests_Auth_OpenID_DiffieHellman_Exch extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_DiffieHellman extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_DiffieHellman extends PHPUnit_Framework_TestSuite { function _readPrivateTestCases() { $lines = Tests_Auth_OpenID_readlines('dhpriv'); diff --git a/Tests/Auth/OpenID/Discover_OpenID.php b/Tests/Auth/OpenID/Discover_OpenID.php index a00873f..a1d62d8 100644 --- a/Tests/Auth/OpenID/Discover_OpenID.php +++ b/Tests/Auth/OpenID/Discover_OpenID.php @@ -1,6 +1,5 @@ <?php -require_once 'PHPUnit.php'; require_once 'TestUtil.php'; require_once 'Auth/OpenID.php'; @@ -27,7 +26,7 @@ class _SimpleMockFetcher { } } -class Tests_Auth_OpenID_ServiceEndpoint extends PHPUnit_TestCase { +class Tests_Auth_OpenID_ServiceEndpoint extends PHPUnit_Framework_TestCase { function setUp() { $this->endpoint = new Auth_OpenID_ServiceEndpoint(); } @@ -53,13 +52,13 @@ class Tests_Auth_OpenID_ServiceEndpoint extends PHPUnit_TestCase { foreach ($urls as $url) { $this->endpoint->claimed_id = $url; $split = explode('#', $url); - $this->assertEquals($split[0], + $this->assertEquals($split[0], $this->endpoint->getDisplayIdentifier()); } } } -class Tests_Auth_OpenID_DiscoveryFailure extends PHPUnit_TestCase { +class Tests_Auth_OpenID_DiscoveryFailure extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_DiscoveryFailure($responses) { @@ -120,7 +119,7 @@ define('E_AUTH_OPENID_VALUE_ERROR', 'e_valueerror'); define('E_AUTH_OPENID_RUNTIME_ERROR', 'e_runtimeerror'); define('E_AUTH_OPENID_OI', 'e_oi'); -class Tests_Auth_OpenID_Discover_FetchException extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Discover_FetchException extends PHPUnit_Framework_TestCase { // Make sure exceptions get passed through discover function from // fetcher. @@ -152,10 +151,10 @@ class Tests_Auth_OpenID_Discover_FetchException extends PHPUnit_TestCase { // Tests for openid.consumer.discover.discover class _DiscoveryMockFetcher extends Auth_Yadis_HTTPFetcher { - function _DiscoveryMockFetcher(&$documents) + function _DiscoveryMockFetcher($documents) { $this->redirect = null; - $this->documents = &$documents; + $this->documents = $documents; $this->fetchlog = array(); } @@ -193,7 +192,7 @@ class _DiscoveryMockFetcher extends Auth_Yadis_HTTPFetcher { } } -class _DiscoveryBase extends PHPUnit_TestCase { +class _DiscoveryBase extends PHPUnit_Framework_TestCase { var $id_url = "http://someuser.unittest/"; var $fetcherClass = '_DiscoveryMockFetcher'; @@ -590,7 +589,7 @@ class TestXRIDiscovery extends _DiscoveryBase { function setUp() { parent::setUp(); - + $this->fetcher->documents = array('=smoker' => array('application/xrds+xml', Tests_Auth_OpenID_readdata('yadis_2entries_delegate.xml')), '=smoker*bad' => array('application/xrds+xml', @@ -704,7 +703,7 @@ class _NonFetcher extends _DiscoveryMockFetcher { } } -class Tests_Auth_OpenID_SSLSupport extends PHPUnit_TestCase { +class Tests_Auth_OpenID_SSLSupport extends PHPUnit_Framework_TestCase { function test_discoverDropSSL() { // In the absence of SSL support, the discovery process should diff --git a/Tests/Auth/OpenID/Extension.php b/Tests/Auth/OpenID/Extension.php index 477110d..398cc42 100644 --- a/Tests/Auth/OpenID/Extension.php +++ b/Tests/Auth/OpenID/Extension.php @@ -1,6 +1,5 @@ <?php -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/Message.php'; require_once 'Auth/OpenID/Extension.php'; @@ -14,7 +13,7 @@ class _ExtensionTest_DummyExtension extends Auth_OpenID_Extension { } } -class Tests_Auth_OpenID_Extension extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Extension extends PHPUnit_Framework_TestCase { function test_OpenID1() { $oid1_msg = new Auth_OpenID_Message(Auth_OpenID_OPENID1_NS); diff --git a/Tests/Auth/OpenID/HMAC.php b/Tests/Auth/OpenID/HMAC.php index 874892a..85aa5b0 100644 --- a/Tests/Auth/OpenID/HMAC.php +++ b/Tests/Auth/OpenID/HMAC.php @@ -14,11 +14,10 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/HMAC.php'; require_once 'Tests/Auth/OpenID/TestUtil.php'; -class Tests_Auth_OpenID_HMAC_TestCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_HMAC_TestCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_HMAC_TestCase( $name, $key, $data, $expected, $hmac_func) { @@ -37,7 +36,7 @@ class Tests_Auth_OpenID_HMAC_TestCase extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_HMAC extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_HMAC extends PHPUnit_Framework_TestSuite { function _strConvert($s) { $repeat_pat = '/^0x([a-f0-9]{2}) repeated (\d+) times$/'; diff --git a/Tests/Auth/OpenID/KVForm.php b/Tests/Auth/OpenID/KVForm.php index eb7162a..d9de1de 100644 --- a/Tests/Auth/OpenID/KVForm.php +++ b/Tests/Auth/OpenID/KVForm.php @@ -13,7 +13,6 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/KVForm.php'; global $_Tests_Auth_OpenID_kverrors; @@ -29,7 +28,7 @@ function Tests_Auth_OpenID_kvHandleError($errno, $errmsg) } -class Tests_Auth_OpenID_KVForm_TestCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_KVForm_TestCase extends PHPUnit_Framework_TestCase { var $errs; function runTest() @@ -112,7 +111,7 @@ extends Tests_Auth_OpenID_KVForm_TestCase { } } -class Tests_Auth_OpenID_KVForm extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_KVForm extends PHPUnit_Framework_TestSuite { function Tests_Auth_OpenID_KVForm($name) { $this->setName($name); @@ -249,7 +248,7 @@ class Tests_Auth_OpenID_KVForm extends PHPUnit_TestSuite { } else { $lossy = 'neither'; } - $test = new Tests_Auth_OpenID_KVForm_TestCase( + $test = new Tests_Auth_OpenID_KVForm_TestCase_Parse( $arr, $str, $lossy, $errs); } $test->setName($testdata["name"]); diff --git a/Tests/Auth/OpenID/Message.php b/Tests/Auth/OpenID/Message.php index 7f86848..3c5896f 100644 --- a/Tests/Auth/OpenID/Message.php +++ b/Tests/Auth/OpenID/Message.php @@ -6,9 +6,8 @@ require_once "Auth/OpenID/Message.php"; require_once "Auth/OpenID.php"; -require_once "PHPUnit.php"; -class MessageTest extends PHPUnit_TestCase { +class MessageTest extends PHPUnit_Framework_TestCase { function _argTest($ns, $key, $expected = null) { $a_default = 'a bogus default value'; @@ -554,7 +553,7 @@ class Tests_Auth_OpenID_OpenID1Message extends MessageTest { } } -class Tests_Auth_OpenID_OpenID1ExplicitMessage extends PHPUnit_TestCase { +class Tests_Auth_OpenID_OpenID1ExplicitMessage extends PHPUnit_Framework_TestCase { function setUp() { $this->msg = Auth_OpenID_Message::fromPostArgs(array('openid.mode' => 'error', @@ -952,7 +951,7 @@ class Tests_Auth_OpenID_OpenID2Message extends MessageTest { } } -class Tests_Auth_OpenID_GeneralMessageTest extends PHPUnit_TestCase { +class Tests_Auth_OpenID_GeneralMessageTest extends PHPUnit_Framework_TestCase { function setUp() { $this->postargs = array( @@ -1139,7 +1138,7 @@ class Tests_Auth_OpenID_GeneralMessageTest extends PHPUnit_TestCase { $this->assertEquals($ns, $m->getOpenIDNamespace()); $this->assertTrue($m->namespaces->isImplicit($ns)); } - } + } function test_isOpenID2() { @@ -1199,7 +1198,7 @@ class Tests_Auth_OpenID_GeneralMessageTest extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_NamespaceMap extends PHPUnit_TestCase { +class Tests_Auth_OpenID_NamespaceMap extends PHPUnit_Framework_TestCase { function test_onealias() { $nsm = new Auth_OpenID_NamespaceMap(); @@ -1236,7 +1235,7 @@ class Tests_Auth_OpenID_NamespaceMap extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Message extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Message extends PHPUnit_Framework_TestCase { } global $Tests_Auth_OpenID_Message_other; diff --git a/Tests/Auth/OpenID/Negotiation.php b/Tests/Auth/OpenID/Negotiation.php index c5ad873..52fe9fd 100644 --- a/Tests/Auth/OpenID/Negotiation.php +++ b/Tests/Auth/OpenID/Negotiation.php @@ -1,6 +1,5 @@ <?php -require_once "PHPUnit.php"; require_once "Tests/Auth/OpenID/TestUtil.php"; require_once "Tests/Auth/OpenID/MemStore.php"; @@ -36,7 +35,7 @@ class ErrorRaisingConsumer extends Auth_OpenID_GenericConsumer { /** * Test the session type negotiation behavior of an OpenID 2 consumer. */ -class TestOpenID2SessionNegotiation extends PHPUnit_TestCase { +class TestOpenID2SessionNegotiation extends PHPUnit_Framework_TestCase { function setUp() { $dumb = null; @@ -201,7 +200,7 @@ class TestOpenID2SessionNegotiation extends PHPUnit_TestCase { * of these tests pass openid2-style messages to the openid 1 * association processing logic to be sure it ignores the extra data. */ -class TestOpenID1SessionNegotiation extends PHPUnit_TestCase { +class TestOpenID1SessionNegotiation extends PHPUnit_Framework_TestCase { function setUp() { $dumb = null; @@ -297,7 +296,7 @@ class TestOpenID1SessionNegotiation extends PHPUnit_TestCase { } } -class TestNegotiatorBehaviors extends PHPUnit_TestCase { +class TestNegotiatorBehaviors extends PHPUnit_Framework_TestCase { function setUp() { $this->allowed_types = array( @@ -330,7 +329,7 @@ class TestNegotiatorBehaviors extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Negotiation extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_Negotiation extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/Auth/OpenID/Nonce.php b/Tests/Auth/OpenID/Nonce.php index 1936735..25d9ea5 100644 --- a/Tests/Auth/OpenID/Nonce.php +++ b/Tests/Auth/OpenID/Nonce.php @@ -13,13 +13,12 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/Nonce.php'; define('Tests_Auth_OpenID_nonce_re', '/\A\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ/'); -class Tests_Auth_OpenID_Nonce extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_Nonce extends PHPUnit_Framework_TestSuite { function Tests_Auth_OpenID_Nonce() { $this->addTestSuite('Tests_Auth_OpenID_NonceTests'); @@ -95,7 +94,7 @@ class Tests_Auth_OpenID_Nonce extends PHPUnit_TestSuite { } } -class Tests_Auth_OpenID_Nonce_TimestampCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Nonce_TimestampCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_Nonce_TimestampCase( $nonce_str, $skew, $now, $expected) { @@ -114,7 +113,7 @@ class Tests_Auth_OpenID_Nonce_TimestampCase extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_NonceTests extends PHPUnit_TestCase { +class Tests_Auth_OpenID_NonceTests extends PHPUnit_Framework_TestCase { function test_mkNonce() { $nonce_str = Auth_OpenID_mkNonce(); @@ -151,7 +150,7 @@ class Tests_Auth_OpenID_NonceTests extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Nonce_BadSplitCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Nonce_BadSplitCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_Nonce_BadSplitCase($nonce_str) { $this->nonce_str = $nonce_str; diff --git a/Tests/Auth/OpenID/OpenID_Yadis.php b/Tests/Auth/OpenID/OpenID_Yadis.php index 02981c0..b16e3b8 100644 --- a/Tests/Auth/OpenID/OpenID_Yadis.php +++ b/Tests/Auth/OpenID/OpenID_Yadis.php @@ -5,7 +5,6 @@ * protocol. */ -require_once "PHPUnit.php"; require_once "Auth/Yadis/XRDS.php"; require_once "Auth/OpenID/Discover.php"; @@ -141,13 +140,13 @@ function __subsets($list) return $subsets_list; } -class Tests_Auth_OpenID_Tester extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Tester extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_Tester($uris, $type_uris, $delegate) { + parent::__construct(); $this->uris = $uris; $this->type_uris = $type_uris; $this->local_id = $delegate; - parent::PHPUnit_TestCase(); } function setUp() @@ -211,7 +210,7 @@ class Tests_Auth_OpenID_Tester extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_OpenID_Yadis extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_OpenID_Yadis extends PHPUnit_Framework_TestSuite { function Tests_Auth_OpenID_OpenID_Yadis() { global $__data; diff --git a/Tests/Auth/OpenID/PAPE.php b/Tests/Auth/OpenID/PAPE.php index d53fb04..c258e82 100644 --- a/Tests/Auth/OpenID/PAPE.php +++ b/Tests/Auth/OpenID/PAPE.php @@ -1,12 +1,10 @@ <?php -require_once "PHPUnit.php"; - require_once "Auth/OpenID/PAPE.php"; require_once "Auth/OpenID/Message.php"; require_once "Auth/OpenID/Server.php"; -class PapeRequestTestCase extends PHPUnit_TestCase { +class PapeRequestTestCase extends PHPUnit_Framework_TestCase { function setUp() { $this->req = new Auth_OpenID_PAPE_Request(); @@ -107,7 +105,7 @@ class PAPE_DummySuccessResponse { } } -class PapeResponseTestCase extends PHPUnit_TestCase { +class PapeResponseTestCase extends PHPUnit_Framework_TestCase { function setUp() { $this->req = new Auth_OpenID_PAPE_Response(); } @@ -118,7 +116,7 @@ class PapeResponseTestCase extends PHPUnit_TestCase { $this->assertEquals('pape', $this->req->ns_alias); $this->assertEquals(null, $this->req->nist_auth_level); - $req2 = new Auth_OpenID_PAPE_Response(array(PAPE_AUTH_MULTI_FACTOR), + $req2 = new Auth_OpenID_PAPE_Response(array(PAPE_AUTH_MULTI_FACTOR), '2001-01-01T04:05:23Z', 3); $this->assertEquals(array(PAPE_AUTH_MULTI_FACTOR), $req2->auth_policies); @@ -179,7 +177,7 @@ class PapeResponseTestCase extends PHPUnit_TestCase { $this->assertEquals(null, $this->req->auth_time); $this->assertEquals(array(), $this->req->auth_policies); } - + function test_parseExtensionArgs_strict_bogus1() { $args = array('auth_policies' => 'http://foo http://bar', 'auth_time' => 'yesterday'); @@ -232,7 +230,7 @@ class PapeResponseTestCase extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_PAPE extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_PAPE extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_OpenID_PAPE"; } diff --git a/Tests/Auth/OpenID/Parse.php b/Tests/Auth/OpenID/Parse.php index 9a3547c..e4d473f 100644 --- a/Tests/Auth/OpenID/Parse.php +++ b/Tests/Auth/OpenID/Parse.php @@ -15,9 +15,8 @@ require_once 'Tests/Auth/OpenID/TestUtil.php'; require_once 'Auth/OpenID/Parse.php'; -require_once 'PHPUnit.php'; -class Tests_Auth_OpenID_Link extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Link extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_Link($case) { list($desc, $markup, $links, $case_text) = $case; @@ -85,7 +84,7 @@ class Tests_Auth_OpenID_Link extends PHPUnit_TestCase { } } -class NumTestCases extends PHPUnit_TestCase { +class NumTestCases extends PHPUnit_Framework_TestCase { function NumTestCases($test_cases, $num_tests) { $this->test_cases = $test_cases; @@ -99,7 +98,7 @@ class NumTestCases extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Parse extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_Parse extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/Auth/OpenID/RPVerify.php b/Tests/Auth/OpenID/RPVerify.php index 59c8b1a..4b5cf75 100644 --- a/Tests/Auth/OpenID/RPVerify.php +++ b/Tests/Auth/OpenID/RPVerify.php @@ -9,8 +9,6 @@ require_once 'Auth/OpenID/TrustRoot.php'; require_once 'Auth/Yadis/Yadis.php'; -require_once 'PHPUnit.php'; - // Because "null" cannot be passed by reference. $NULL_FETCHER = null; @@ -18,7 +16,7 @@ $NULL_FETCHER = null; * Tests for building the discovery URL from a realm and a return_to * URL */ -class Tests_Auth_OpenID_BuildDiscoveryURL extends PHPUnit_TestCase { +class Tests_Auth_OpenID_BuildDiscoveryURL extends PHPUnit_Framework_TestCase { /* * Build a discovery URL out of the realm and a return_to and make * sure that it matches the expected discovery URL @@ -50,7 +48,7 @@ class Tests_Auth_OpenID_BuildDiscoveryURL extends PHPUnit_TestCase { } class _MockDiscover { - function _MockDiscover(&$data) { + function _MockDiscover($data) { $this->data =& $data; } @@ -63,13 +61,13 @@ class _MockDiscover { } } -class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_TestCase { +class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_Framework_TestCase { var $disco_url = 'http://example.com/'; function failUnlessXRDSHasReturnURLs($data, $expected_return_urls) { $discover_object = new _MockDiscover($data); - $actual_return_urls = Auth_OpenID_getAllowedReturnURLs($this->disco_url, $NULL_FETCHER, array(&$discover_object, 'mockDiscover')); + $actual_return_urls = Auth_OpenID_getAllowedReturnURLs($this->disco_url, $NULL_FETCHER, array($discover_object, 'mockDiscover')); $this->assertEquals($expected_return_urls, $actual_return_urls); } @@ -77,7 +75,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_TestCase { function failUnlessDiscoveryFailure($text) { $discover_object = new _MockDiscover($text); - $this->assertFalse(Auth_OpenID_getAllowedReturnURLs($this->disco_url, $NULL_FETCHER, array(&$discover_object, 'mockDiscover'))); + $this->assertFalse(Auth_OpenID_getAllowedReturnURLs($this->disco_url, $NULL_FETCHER, array($discover_object, 'mockDiscover'))); } function test_empty() @@ -181,7 +179,7 @@ class Tests_Auth_OpenID_ExtractReturnToURLs extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_ReturnToMatches extends PHPUnit_TestCase { +class Tests_Auth_OpenID_ReturnToMatches extends PHPUnit_Framework_TestCase { function test_noEntries() { $this->assertFalse(Auth_OpenID_returnToMatches(array(), 'anything')); @@ -224,7 +222,7 @@ class Tests_Auth_OpenID_ReturnToMatches extends PHPUnit_TestCase { } class Verifier { - function Verifier(&$test_case, $return_to) + function Verifier($test_case, $return_to) { $this->tc =& $test_case; $this->return_to = $return_to; @@ -242,8 +240,8 @@ class Verifier { } } -class Tests_Auth_OpenID_VerifyReturnTo extends PHPUnit_TestCase { - +class Tests_Auth_OpenID_VerifyReturnTo extends PHPUnit_Framework_TestCase { + function test_bogusRealm() { $this->assertFalse(Auth_OpenID_verifyReturnTo('', 'http://example.com/', $NULL_FETCHER)); @@ -256,7 +254,7 @@ class Tests_Auth_OpenID_VerifyReturnTo extends PHPUnit_TestCase { $v = new Verifier($this, $return_to); - $this->assertTrue(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array(&$v, 'verify'))); + $this->assertTrue(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array($v, 'verify'))); } function test_verifyFailWithDiscoveryCalled() @@ -266,7 +264,7 @@ class Tests_Auth_OpenID_VerifyReturnTo extends PHPUnit_TestCase { $v = new Verifier($this, 'http://something-else.invalid/'); - $this->assertFalse(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array(&$v, 'verify'))); + $this->assertFalse(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array($v, 'verify'))); } function test_verifyFailIfDiscoveryRedirects() @@ -276,11 +274,11 @@ class Tests_Auth_OpenID_VerifyReturnTo extends PHPUnit_TestCase { $v = new Verifier($this, false); - $this->assertFalse(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array(&$v, 'verify'))); + $this->assertFalse(Auth_OpenID_verifyReturnTo($realm, $return_to, $NULL_FETCHER, array($v, 'verify'))); } } -class Tests_Auth_OpenID_RPVerify extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_RPVerify extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_OpenID_RPVerify"; diff --git a/Tests/Auth/OpenID/SReg.php b/Tests/Auth/OpenID/SReg.php index 5142b63..3e453b9 100644 --- a/Tests/Auth/OpenID/SReg.php +++ b/Tests/Auth/OpenID/SReg.php @@ -8,9 +8,7 @@ require_once 'Auth/OpenID/SReg.php'; require_once 'Auth/OpenID/Message.php'; require_once 'Auth/OpenID/Server.php'; -require_once 'PHPUnit.php'; - -class SRegURITest extends PHPUnit_TestCase { +class SRegURITest extends PHPUnit_Framework_TestCase { function test_is11() { $this->assertEquals(Auth_OpenID_SREG_NS_URI_1_1, @@ -18,7 +16,7 @@ class SRegURITest extends PHPUnit_TestCase { } } -class CheckFieldNameTest extends PHPUnit_TestCase { +class CheckFieldNameTest extends PHPUnit_Framework_TestCase { function test_goodNamePasses() { global $Auth_OpenID_sreg_data_fields; @@ -54,7 +52,7 @@ class FakeEndpoint { } } -class SupportsSRegTest extends PHPUnit_TestCase { +class SupportsSRegTest extends PHPUnit_Framework_TestCase { function test_unsupported() { $endpoint = new FakeEndpoint(array()); @@ -95,7 +93,7 @@ class FakeMessage { } } -class GetNSTest extends PHPUnit_TestCase { +class GetNSTest extends PHPUnit_Framework_TestCase { function setUp() { $this->msg = new FakeMessage(); @@ -182,7 +180,7 @@ $__args_sentinel = 'args_sentinel'; $__ns_sentinel = 'ns_sentinel'; class SentinelFakeMessage { - function SentinelFakeMessage(&$test_case) + function SentinelFakeMessage($test_case) { $this->test_case =& $test_case; $this->message = new Auth_OpenID_Message(); @@ -200,7 +198,7 @@ class SentinelFakeMessage { global $__TestingReq_TEST_CASE; $__TestingReq_TEST_CASE = "FLUB"; -function __setTestCase(&$thing) { +function __setTestCase($thing) { global $__TestingReq_TEST_CASE; $__TestingReq_TEST_CASE = $thing; } @@ -211,7 +209,7 @@ function &__getTestCase() { } class TestingReq extends Auth_OpenID_SRegRequest { - function fromOpenIDRequest(&$thing, &$test_case) + function fromOpenIDRequest($thing, $test_case) { __setTestCase($test_case); $obj = parent::fromOpenIDRequest($thing, 'TestingReq'); @@ -232,7 +230,7 @@ class TestingReq extends Auth_OpenID_SRegRequest { } } -class SRegRequestTest extends PHPUnit_TestCase { +class SRegRequestTest extends PHPUnit_Framework_TestCase { function test_constructEmpty() { $req = Auth_OpenID_SRegRequest::build(); @@ -573,7 +571,7 @@ class DummySuccessResponse { } } -class SRegResponseTest extends PHPUnit_TestCase { +class SRegResponseTest extends PHPUnit_Framework_TestCase { function test_fromSuccessResponse_signed() { $message = Auth_OpenID_Message::fromOpenIDArgs(array( @@ -599,7 +597,7 @@ class SRegResponseTest extends PHPUnit_TestCase { } } -class SendFieldsTest extends PHPUnit_TestCase { +class SendFieldsTest extends PHPUnit_Framework_TestCase { function _test($uri) { // Create a request message with simple registration fields @@ -654,7 +652,7 @@ class SendFieldsTest extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_SReg extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_SReg extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_OpenID_SReg"; diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php index 79a7593..ba2160c 100644 --- a/Tests/Auth/OpenID/Server.php +++ b/Tests/Auth/OpenID/Server.php @@ -4,7 +4,6 @@ * Tests for Auth_OpenID_Server */ -require_once "PHPUnit.php"; require_once "Tests/Auth/OpenID/MemStore.php"; require_once "Auth/OpenID.php"; require_once "Auth/OpenID/DiffieHellman.php"; @@ -57,7 +56,7 @@ function _Auth_OpenID_NotAuthorized() return false; } -class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_Framework_TestCase { function test_browserWithReturnTo() { $return_to = "http://rp.unittest/consumer"; @@ -187,7 +186,7 @@ class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Test_Decode extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Test_Decode extends PHPUnit_Framework_TestCase { function setUp() { $this->id_url = "http://decoder.am.unittest/"; @@ -469,7 +468,7 @@ class Tests_Auth_OpenID_Test_Decode extends PHPUnit_TestCase { 'openid.mode' => 'associate', 'openid.session_type' => 'DH-SHA1', 'openid.dh_consumer_public' => "Rzup9265tw=="); - + $r = $this->decoder->decode($args); $this->assertTrue(is_a($r, 'Auth_OpenID_AssociateRequest')); $this->assertEquals($r->mode, "associate"); @@ -634,7 +633,7 @@ class Tests_Auth_OpenID_Test_Decode extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Test_Encode extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Test_Encode extends PHPUnit_Framework_TestCase { function setUp() { $this->encoder = new Auth_OpenID_Encoder(); @@ -787,10 +786,10 @@ class Tests_Auth_OpenID_Test_Encode extends PHPUnit_TestCase { 'http://burr.unittest/', false, null, $this->server); - + $response = new Auth_OpenID_ServerResponse($request); $response->fields = Auth_OpenID_Message::fromOpenIDArgs(array('mode' => 'cancel')); - + $form = $response->toFormMarkup(); $pos = strpos($form, 'http://burr.unittest/999'); $this->assertTrue($pos !== false, var_export($pos, true)); @@ -863,7 +862,7 @@ class Tests_Auth_OpenID_Test_Encode extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_SigningEncode extends PHPUnit_TestCase { +class Tests_Auth_OpenID_SigningEncode extends PHPUnit_Framework_TestCase { function setUp() { // Use filestore here instead of memstore @@ -991,7 +990,7 @@ class Tests_Auth_OpenID_SigningEncode extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase { +class Tests_Auth_OpenID_CheckID extends PHPUnit_Framework_TestCase { function setUp() { $this->store = new Tests_Auth_OpenID_MemStore(); @@ -1015,7 +1014,7 @@ class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase { function test_fromMessageClaimedIDWithoutIdentityOpenID2() { $name = 'https://example.myopenid.com'; - + $msg = new Auth_OpenID_Message(Auth_OpenID_OPENID2_NS); $msg->setArg(Auth_OpenID_OPENID_NS, 'mode', 'checkid_setup'); $msg->setArg(Auth_OpenID_OPENID_NS, 'return_to', @@ -1031,7 +1030,7 @@ class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase { function test_fromMessageIdentityWithoutClaimedIDOpenID2() { $name = 'https://example.myopenid.com'; - + $msg = new Auth_OpenID_Message(Auth_OpenID_OPENID2_NS); $msg->setArg(Auth_OpenID_OPENID_NS, 'mode', 'checkid_setup'); $msg->setArg(Auth_OpenID_OPENID_NS, 'return_to', @@ -1111,10 +1110,10 @@ class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase { function test_returnToVerified_callsVerify() { // Ensure that True and False are passed through unchanged - $this->request->verifyReturnTo = array(&$this, '_verifyTrue'); + $this->request->verifyReturnTo = array($this, '_verifyTrue'); $this->assertEquals(true, $this->request->returnToVerified()); - $this->request->verifyReturnTo = array(&$this, '_verifyFalse'); + $this->request->verifyReturnTo = array($this, '_verifyFalse'); $this->assertEquals(false, $this->request->returnToVerified()); } @@ -1485,7 +1484,7 @@ class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_CheckIDExtension extends PHPUnit_TestCase { +class Tests_Auth_OpenID_CheckIDExtension extends PHPUnit_Framework_TestCase { function setUp() { $this->op_endpoint = 'http://endpoint.unittest/ext'; @@ -1577,7 +1576,7 @@ class _MockSignatory { } } -class Tests_Auth_OpenID_CheckAuth extends PHPUnit_TestCase { +class Tests_Auth_OpenID_CheckAuth extends PHPUnit_Framework_TestCase { function setUp() { $this->assoc_handle = 'mooooooooo'; @@ -1642,7 +1641,7 @@ class Tests_Auth_OpenID_CheckAuth extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Associate extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Associate extends PHPUnit_Framework_TestCase { // TODO: test DH with non-default values for modulus and gen. // (important to do because we actually had it broken for a // while.) @@ -2031,7 +2030,7 @@ class Counter { } } -class Tests_Auth_OpenID_ServerTest extends PHPUnit_TestCase { +class Tests_Auth_OpenID_ServerTest extends PHPUnit_Framework_TestCase { function setUp() { $this->store = new Tests_Auth_OpenID_MemStore(); @@ -2146,7 +2145,7 @@ class Tests_Auth_OpenID_ServerTest extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Signatory extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Signatory extends PHPUnit_Framework_TestCase { function setUp() { $this->store =& new Tests_Auth_OpenID_MemStore(); @@ -2436,7 +2435,7 @@ class Tests_Auth_OpenID_Signatory extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_Server extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_Server extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/Auth/OpenID/StoreTest.php b/Tests/Auth/OpenID/StoreTest.php index b656ba0..bd46e02 100644 --- a/Tests/Auth/OpenID/StoreTest.php +++ b/Tests/Auth/OpenID/StoreTest.php @@ -20,7 +20,6 @@ require_once 'Auth/OpenID/Association.php'; require_once 'Auth/OpenID/CryptUtil.php'; require_once 'Auth/OpenID/Nonce.php'; require_once 'Auth/OpenID.php'; -require_once 'PHPUnit.php'; function _Auth_OpenID_mkdtemp() { @@ -70,7 +69,9 @@ function _Auth_OpenID_getTmpDbName() * * @package OpenID */ -class Tests_Auth_OpenID_Store extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Store extends PHPUnit_Framework_TestCase { + + function pass() {} /** * Prepares for the SQL store tests. @@ -98,7 +99,7 @@ class Tests_Auth_OpenID_Store extends PHPUnit_TestCase { /** * @access private */ - function _checkRetrieve(&$store, $url, $handle, $expected, $name = null) + function _checkRetrieve($store, $url, $handle, $expected, $name = null) { $retrieved_assoc = $store->getAssociation($url, $handle); if ($expected === null) { @@ -108,7 +109,7 @@ class Tests_Auth_OpenID_Store extends PHPUnit_TestCase { } } - function _checkRemove(&$store, $url, $handle, $expected, $name = null) + function _checkRemove($store, $url, $handle, $expected, $name = null) { $present = $store->removeAssociation($url, $handle); $this->assertTrue((!$expected && !$present) || @@ -124,7 +125,7 @@ class Tests_Auth_OpenID_Store extends PHPUnit_TestCase { * * OpenIDStore -> NoneType */ - function _testStore(&$store) + function _testStore($store) { // Association functions $now = time(); @@ -295,7 +296,7 @@ explicitly'); if (!$store->supportsCleanup()) { return; } - + $store->cleanupAssociations(); $store->storeAssociation($server_url . '1', $assocValid1); $store->storeAssociation($server_url . '1', $assocExpired1); @@ -306,14 +307,14 @@ explicitly'); $this->assertEquals(2, $cleaned); } - function _checkUseNonce(&$store, $nonce, $expected, $server_url, $msg=null) + function _checkUseNonce($store, $nonce, $expected, $server_url, $msg=null) { list($stamp, $salt) = Auth_OpenID_splitNonce($nonce); $actual = $store->useNonce($server_url, $stamp, $salt); $this->assertEquals(intval($expected), intval($actual), "_checkUseNonce failed: $server_url, $msg"); } - function _testNonce(&$store) + function _testNonce($store) { // Nonce functions @@ -341,11 +342,11 @@ explicitly'); } } - function _testNonceCleanup(&$store) { + function _testNonceCleanup($store) { if (!$store->supportsCleanup()) { return; } - + $server_url = 'http://www.myopenid.com/openid'; $now = time(); @@ -364,15 +365,15 @@ explicitly'); $params = Auth_OpenID_splitNonce($old_nonce1); array_unshift($params, $server_url); - $this->assertTrue(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertTrue(call_user_func_array(array($store, 'useNonce'), $params)); $params = Auth_OpenID_splitNonce($old_nonce2); array_unshift($params, $server_url); - $this->assertTrue(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertTrue(call_user_func_array(array($store, 'useNonce'), $params)); $params = Auth_OpenID_splitNonce($recent_nonce); array_unshift($params, $server_url); - $this->assertTrue(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertTrue(call_user_func_array(array($store, 'useNonce'), $params)); $Auth_OpenID_SKEW = 3600; $cleaned = $store->cleanupNonces(); @@ -384,15 +385,15 @@ explicitly'); $params = Auth_OpenID_splitNonce($old_nonce1); array_unshift($params, $server_url); - $this->assertTrue(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertTrue(call_user_func_array(array($store, 'useNonce'), $params)); $params = Auth_OpenID_splitNonce($old_nonce2); array_unshift($params, $server_url); - $this->assertTrue(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertTrue(call_user_func_array(array($store, 'useNonce'), $params)); // The recent nonce wasn't cleaned, so it should still fail. $params = Auth_OpenID_splitNonce($recent_nonce); array_unshift($params, $server_url); - $this->assertFalse(call_user_func_array(array(&$store, 'useNonce'), $params)); + $this->assertFalse(call_user_func_array(array($store, 'useNonce'), $params)); $Auth_OpenID_SKEW = $orig_skew; } @@ -690,7 +691,7 @@ class Tests_Auth_OpenID_MemcachedStore_Test extends Tests_Auth_OpenID_Store { } } -class Tests_Auth_OpenID_StoreTest extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_StoreTest extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_OpenID_StoreTest"; diff --git a/Tests/Auth/OpenID/TestUtil.php b/Tests/Auth/OpenID/TestUtil.php index 54b110d..eabf3d3 100644 --- a/Tests/Auth/OpenID/TestUtil.php +++ b/Tests/Auth/OpenID/TestUtil.php @@ -4,7 +4,6 @@ * Utilites for test functions */ -require_once 'PHPUnit.php'; function Tests_Auth_OpenID_datafile($name, $reader) { @@ -29,7 +28,7 @@ function Tests_Auth_OpenID_readlines($name) return Tests_Auth_OpenID_datafile($name, 'file'); } -class OpenIDTestMixin extends PHPUnit_TestCase { +class OpenIDTestMixin extends PHPUnit_Framework_TestCase { function failUnlessOpenIDValueEquals($msg, $key, $expected, $ns=null) { if ($ns === null) { diff --git a/Tests/Auth/OpenID/TrustRoot.php b/Tests/Auth/OpenID/TrustRoot.php index 9c7c40e..5ba1918 100644 --- a/Tests/Auth/OpenID/TrustRoot.php +++ b/Tests/Auth/OpenID/TrustRoot.php @@ -6,9 +6,8 @@ require_once "Auth/OpenID/TrustRoot.php"; require_once "Tests/Auth/OpenID/TestUtil.php"; -require_once "PHPUnit.php"; -class Tests_Auth_OpenID_TRParseCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_TRParseCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_TRParseCase($desc, $case, $expected) { $this->setName($desc); @@ -36,7 +35,7 @@ class Tests_Auth_OpenID_TRParseCase extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_TRMatchCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_TRMatchCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_TRMatchCase($desc, $tr, $rt, $matches) { $this->setName($desc); @@ -155,7 +154,7 @@ function Tests_Auth_OpenID_trustRootTests() return array_merge($parsecases, $matchcases); } -class Tests_Auth_OpenID_TrustRoot extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_TrustRoot extends PHPUnit_Framework_TestSuite { function Tests_Auth_OpenID_TrustRoot($name) { $this->setName($name); diff --git a/Tests/Auth/OpenID/URINorm.php b/Tests/Auth/OpenID/URINorm.php index a184034..da94d59 100644 --- a/Tests/Auth/OpenID/URINorm.php +++ b/Tests/Auth/OpenID/URINorm.php @@ -14,11 +14,10 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID/URINorm.php'; require_once 'Tests/Auth/OpenID/TestUtil.php'; -class Tests_Auth_OpenID_URINorm_TestCase extends PHPUnit_TestCase { +class Tests_Auth_OpenID_URINorm_TestCase extends PHPUnit_Framework_TestCase { function Tests_Auth_OpenID_URINorm_TestCase( $name, $uri, $expected) { @@ -35,7 +34,7 @@ class Tests_Auth_OpenID_URINorm_TestCase extends PHPUnit_TestCase { } } -class Tests_Auth_OpenID_URINorm extends PHPUnit_TestSuite { +class Tests_Auth_OpenID_URINorm extends PHPUnit_Framework_TestSuite { function _readTestCases() { $lines = Tests_Auth_OpenID_readlines('urinorm.txt'); diff --git a/Tests/Auth/OpenID/Util.php b/Tests/Auth/OpenID/Util.php index a53da47..e055423 100644 --- a/Tests/Auth/OpenID/Util.php +++ b/Tests/Auth/OpenID/Util.php @@ -13,10 +13,9 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; require_once 'Auth/OpenID.php'; -class Tests_Auth_OpenID_Util extends PHPUnit_TestCase { +class Tests_Auth_OpenID_Util extends PHPUnit_Framework_TestCase { function test_base64() { // This is not good for international use, but PHP doesn't @@ -87,7 +86,7 @@ class Tests_Auth_OpenID_Util extends PHPUnit_TestCase { foreach ($cases as $pair) { list($orig, $after) = $pair; - list($base, $frag) = Auth_OpenID::urldefrag($orig); + list($base, $frag) = Auth_OpenID::urldefrag($orig); $this->assertEquals($after, $base); $this->assertEquals($frag, ''); diff --git a/Tests/Auth/OpenID/VerifyDisco.php b/Tests/Auth/OpenID/VerifyDisco.php index f3b63a3..015e021 100644 --- a/Tests/Auth/OpenID/VerifyDisco.php +++ b/Tests/Auth/OpenID/VerifyDisco.php @@ -1,6 +1,5 @@ <?php -require_once "PHPUnit.php"; require_once "Tests/Auth/OpenID/TestUtil.php"; require_once "Tests/Auth/OpenID/MemStore.php"; @@ -70,7 +69,7 @@ class Tests_openID1Fallback1_0 extends _DiscoverAndVerify { $resp_msg = Auth_OpenID_Message::fromOpenIDArgs( array('ns' => Auth_OpenID_OPENID1_NS, 'identity' => $claimed_id)); - $resp_msg->setArg(Auth_OpenID_BARE_NS, 'openid1_claimed_id', + $resp_msg->setArg(Auth_OpenID_BARE_NS, 'openid1_claimed_id', $claimed_id); $expected_endpoint = new Auth_OpenID_ServiceEndpoint(); $expected_endpoint->type_uris = array(Auth_OpenID_TYPE_1_0); @@ -84,18 +83,18 @@ class Tests_openID1Fallback1_0 extends _DiscoverAndVerify { $resp_msg, null); $this->assertTrue(is_a($actual_endpoint, "Auth_OpenID_ServiceEndpoint")); - - $this->assertEquals($expected_endpoint->local_id, + + $this->assertEquals($expected_endpoint->local_id, $actual_endpoint->local_id); $this->assertEquals($expected_endpoint->server_url, $actual_endpoint->server_url); - $this->assertEquals($expected_endpoint->type_uris, + $this->assertEquals($expected_endpoint->type_uris, $actual_endpoint->type_uris); - $this->assertEquals($expected_endpoint->claimed_id, + $this->assertEquals($expected_endpoint->claimed_id, $actual_endpoint->claimed_id); - + } } @@ -325,7 +324,7 @@ class Tests_openID2MismatchedDoesDisco extends Tests_Auth_OpenID_VerifyDisco { } } -class Tests_openID2MismatchedDoesDisco_failure extends PHPUnit_TestCase { +class Tests_openID2MismatchedDoesDisco_failure extends PHPUnit_Framework_TestCase { var $consumer_class = 'Tests_openID2NoEndpointDoesDisco_failure'; function setUp() diff --git a/Tests/Auth/Yadis/Discover_Yadis.php b/Tests/Auth/Yadis/Discover_Yadis.php index 8f308cf..6e2d38b 100644 --- a/Tests/Auth/Yadis/Discover_Yadis.php +++ b/Tests/Auth/Yadis/Discover_Yadis.php @@ -1,6 +1,5 @@ <?php -require_once "PHPUnit.php"; require_once "Tests/Auth/Yadis/DiscoverData.php"; require_once "Auth/Yadis/Yadis.php"; require_once "Auth/Yadis/HTTPFetcher.php"; @@ -90,7 +89,7 @@ class MockFetcher { } } -class TestSecondGet extends PHPUnit_TestCase { +class TestSecondGet extends PHPUnit_Framework_TestCase { function test_404() { $uri = "http://something.unittest/"; @@ -101,17 +100,17 @@ class TestSecondGet extends PHPUnit_TestCase { } } -class _TestCase extends PHPUnit_TestCase { +class _TestCase extends PHPUnit_Framework_TestCase { var $base_url = 'http://invalid.unittest/'; function _TestCase($input_name, $id_name, $result_name, $success) { + parent::__construct(); $this->input_name = $input_name; $this->id_name = $id_name; $this->result_name = $result_name; $this->success = $success; $this->fetcher = new TestFetcher($this->base_url); - parent::PHPUnit_TestCase(); } function setUp() @@ -163,7 +162,7 @@ class _TestCase extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_Discover_Yadis extends PHPUnit_TestSuite { +class Tests_Auth_Yadis_Discover_Yadis extends PHPUnit_Framework_TestSuite { function getName() { @@ -181,7 +180,7 @@ class Tests_Auth_Yadis_Discover_Yadis extends PHPUnit_TestSuite { } } -class Tests_Auth_Yadis_Discover_Yadis_ContentTypes extends PHPUnit_TestCase { +class Tests_Auth_Yadis_Discover_Yadis_ContentTypes extends PHPUnit_Framework_TestCase { function test_is_xrds_yadis_location() { $result = new Auth_Yadis_DiscoveryResult('http://request.uri/'); diff --git a/Tests/Auth/Yadis/ParseHTML.php b/Tests/Auth/Yadis/ParseHTML.php index aae9ad7..bc7574f 100644 --- a/Tests/Auth/Yadis/ParseHTML.php +++ b/Tests/Auth/Yadis/ParseHTML.php @@ -15,9 +15,8 @@ require_once 'Tests/Auth/Yadis/TestUtil.php'; require_once 'Auth/Yadis/ParseHTML.php'; -require_once 'PHPUnit.php'; -class Tests_Auth_Yadis_ParseTest extends PHPUnit_TestCase { +class Tests_Auth_Yadis_ParseTest extends PHPUnit_Framework_TestCase { function Tests_Auth_Yadis_ParseTest($case) { list($result, $comment, $html) = $case; @@ -47,7 +46,7 @@ class Tests_Auth_Yadis_ParseTest extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_ParseHTML extends PHPUnit_TestSuite { +class Tests_Auth_Yadis_ParseHTML extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/Auth/Yadis/XRDS.php b/Tests/Auth/Yadis/XRDS.php index 466b207..7d9048e 100644 --- a/Tests/Auth/Yadis/XRDS.php +++ b/Tests/Auth/Yadis/XRDS.php @@ -4,13 +4,12 @@ * XRDS-parsing tests for the Yadis library. */ -require_once 'PHPUnit.php'; require_once 'Auth/Yadis/XRDS.php'; require_once 'Auth/Yadis/XRIRes.php'; require_once 'Auth/Yadis/XRI.php'; require_once 'Tests/Auth/Yadis/TestUtil.php'; -class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { +class Tests_Auth_Yadis_XRDS extends PHPUnit_Framework_TestCase { function test_good() { @@ -108,7 +107,7 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { foreach ($canonicalIDtests as $tupl) { list($iname, $filename, $expectedID) = $tupl; - + $xml = Tests_Auth_Yadis_readdata($filename); $xrds = Auth_Yadis_XRDS::parseXRDS($xml); $this->_getCanonicalID($iname, $xrds, $expectedID); @@ -153,7 +152,7 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { $types = $s2->getTypes(); $this->assertEquals(count($types), 1, "second type check"); - function _DelegateFilter(&$service) + function _DelegateFilter($service) { if ($service->getElements('openid:Delegate')) { return true; @@ -167,7 +166,7 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { "_DelegateFilter check"); // This filter should match all services in the document. - function _HasTypeAndURI(&$service) + function _HasTypeAndURI($service) { if ($service->getTypes() && $service->getURIs()) { @@ -177,7 +176,7 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { } // This filter should only match one. - function _URIMatchesSchtuff(&$service) + function _URIMatchesSchtuff($service) { $uris = $service->getURIs(); @@ -190,7 +189,7 @@ class Tests_Auth_Yadis_XRDS extends PHPUnit_TestCase { } // This filter should only match one. - function _URIMatchesMyOpenID(&$service) + function _URIMatchesMyOpenID($service) { $uris = $service->getURIs(); diff --git a/Tests/Auth/Yadis/XRI.php b/Tests/Auth/Yadis/XRI.php index 8960d7a..7f2b04d 100644 --- a/Tests/Auth/Yadis/XRI.php +++ b/Tests/Auth/Yadis/XRI.php @@ -9,12 +9,11 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once "PHPUnit.php"; require_once "Auth/Yadis/XRIRes.php"; require_once "Auth/Yadis/XRI.php"; require_once "Auth/Yadis/Yadis.php"; -class Tests_Auth_Yadis_XriDiscoveryTestCase extends PHPUnit_TestCase { +class Tests_Auth_Yadis_XriDiscoveryTestCase extends PHPUnit_Framework_TestCase { function runTest() { $this->assertEquals( @@ -34,7 +33,7 @@ class Tests_Auth_Yadis_XriDiscoveryTestCase extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_XriEscapingTestCase extends PHPUnit_TestCase { +class Tests_Auth_Yadis_XriEscapingTestCase extends PHPUnit_Framework_TestCase { function test_escaping_percents() { $this->assertEquals(Auth_Yadis_escapeForIRI('@example/abc%2Fd/ef'), @@ -60,7 +59,7 @@ class Tests_Auth_Yadis_XriEscapingTestCase extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_ProxyQueryTestCase extends PHPUnit_TestCase { +class Tests_Auth_Yadis_ProxyQueryTestCase extends PHPUnit_Framework_TestCase { function setUp() { $this->proxy_url = 'http://xri.example.com/'; @@ -95,7 +94,7 @@ class Tests_Auth_Yadis_ProxyQueryTestCase extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_TestGetRootAuthority extends PHPUnit_TestCase { +class Tests_Auth_Yadis_TestGetRootAuthority extends PHPUnit_Framework_TestCase { function runTest() { $xris = array( @@ -126,7 +125,7 @@ class Tests_Auth_Yadis_TestGetRootAuthority extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_XRI extends PHPUnit_TestSuite { +class Tests_Auth_Yadis_XRI extends PHPUnit_Framework_TestSuite { function getName() { return "Tests_Auth_Yadis_XRI"; diff --git a/Tests/Auth/Yadis/Yadis.php b/Tests/Auth/Yadis/Yadis.php index 837e447..8c55558 100644 --- a/Tests/Auth/Yadis/Yadis.php +++ b/Tests/Auth/Yadis/Yadis.php @@ -4,11 +4,10 @@ * Tests for the core of the PHP Yadis library. */ -require_once 'PHPUnit.php'; require_once 'Auth/Yadis/Yadis.php'; require_once 'Tests/Auth/Yadis/TestUtil.php'; -class Tests_Auth_Yadis_DiscoveryTest extends PHPUnit_TestCase { +class Tests_Auth_Yadis_DiscoveryTest extends PHPUnit_Framework_TestCase { function Tests_Auth_Yadis_DiscoveryTest($input_url, $redir_uri, $xrds_uri, $num) @@ -48,7 +47,7 @@ class Tests_Auth_Yadis_DiscoveryTest extends PHPUnit_TestCase { } } -class Tests_Auth_Yadis_Yadis extends PHPUnit_TestSuite { +class Tests_Auth_Yadis_Yadis extends PHPUnit_Framework_TestSuite { function getName() { diff --git a/Tests/TestDriver.php b/Tests/TestDriver.php index a19b502..44675af 100644 --- a/Tests/TestDriver.php +++ b/Tests/TestDriver.php @@ -13,8 +13,8 @@ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache */ -require_once 'PHPUnit.php'; -require_once 'PHPUnit/GUI/HTML.php'; +require_once 'PHPUnit/Framework.php'; +//require_once 'PHPUnit/GUI/HTML.php'; error_reporting(E_ALL); @@ -85,8 +85,8 @@ function loadTests($test_dir, $test_names) function makeSuite($class_name) { $test = new $class_name($class_name); - if (is_a($test, 'PHPUnit_TestCase')) { - $s = new PHPUnit_TestSuite(); + if (is_a($test, 'PHPUnit_Framework_TestCase')) { + $s = new PHPUnit_Framework_TestSuite(); $s->setName($class_name); $s->addTestSuite($class_name); $test = $s; diff --git a/admin/texttest.php b/admin/texttest.php index b1c0a3c..422dd1d 100644 --- a/admin/texttest.php +++ b/admin/texttest.php @@ -1,19 +1,19 @@ <?php require_once 'Tests/TestDriver.php'; -require_once 'PHPUnit/TestResult.php'; +require_once 'PHPUnit/Framework.php'; require_once 'Console/Getopt.php'; -class TextTestResult extends PHPUnit_TestResult { - function addError(&$test, &$t) +class TextTestResult extends PHPUnit_Framework_TestResult { + function addError(&$test, &$t, $time=0) { - parent::addError($test, $t); + parent::addError($test, $t, $time); echo "E"; } - function addFailure(&$test, &$t) + function addFailure(&$test, &$t, $time=0) { - parent::addFailure($test, $t); + parent::addFailure($test, $t, $time); echo "F"; } @@ -134,7 +134,7 @@ foreach ($extra_test_modules as $filename) { $class_name = "Tests_Auth_OpenID_${module_name}_Test"; $suites[] = makeSuite($class_name); } - + $totals = array( 'run' => 0, @@ -155,7 +155,7 @@ Test suite: $name $suite->run($result); $after = microtime_float(); - $run = $result->runCount(); + $run = $result->count(); $error = $result->errorCount(); $failure = $result->failureCount(); $delta = $after - $before; |