summaryrefslogtreecommitdiffstats
path: root/Tests/Auth/Yadis
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/Auth/Yadis')
-rw-r--r--Tests/Auth/Yadis/Discover_Yadis.php11
-rw-r--r--Tests/Auth/Yadis/ParseHTML.php5
-rw-r--r--Tests/Auth/Yadis/XRDS.php13
-rw-r--r--Tests/Auth/Yadis/XRI.php11
-rw-r--r--Tests/Auth/Yadis/Yadis.php5
5 files changed, 20 insertions, 25 deletions
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()
{
generated by cgit v1.1 at 2025-05-17 12:25:11 +0000