1 files changed, 13 insertions, 14 deletions

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";