[project @ Be explicit about implicit namespaces]

3 files changed, 67 insertions, 7 deletions

diff --git a/Tests/Auth/OpenID/Consumer.php b/Tests/Auth/OpenID/Consumer.php
index 0605afc..7af9fb7 100644
--- a/Tests/Auth/OpenID/Consumer.php
+++ b/Tests/Auth/OpenID/Consumer.php
@@ -227,7 +227,8 @@ class Tests_Auth_OpenID_Consumer extends PHPUnit_TestCase {
         $expected = array(
                           'openid.mode' => $mode,
                           'openid.identity' => $delegate_url,
-                          'openid.trust_root' => $trust_root
+                          'openid.trust_root' => $trust_root,
+                          'openid.ns' => Auth_OpenID_OPENID1_NS
                           );
 
         if ($consumer->_use_assocs) {
diff --git a/Tests/Auth/OpenID/Message.php b/Tests/Auth/OpenID/Message.php
index 633955c..325bce9 100644
--- a/Tests/Auth/OpenID/Message.php
+++ b/Tests/Auth/OpenID/Message.php
@@ -324,6 +324,7 @@ class Tests_Auth_OpenID_OpenID1Message extends MessageTest {
     {
         $this->assertEquals($this->msg->getOpenIDNamespace(),
                                Auth_OpenID_OPENID1_NS);
+        $this->assertTrue($this->msg->namespaces->isImplicit(Auth_OpenID_OPENID1_NS));
     }
 
     function test_getKeyOpenID()
@@ -545,13 +546,69 @@ class Tests_Auth_OpenID_OpenID1Message extends MessageTest {
     }
 }
 
-class Tests_Auth_OpenID_OpenID1ExplicitMessage extends Tests_Auth_OpenID_OpenID1Message {
+class Tests_Auth_OpenID_OpenID1ExplicitMessage extends MessageTest {
     function setUp()
     {
         $this->msg = Auth_OpenID_Message::fromPostArgs(array('openid.mode' => 'error',
                                                              'openid.error' => 'unit test',
                                                              'openid.ns' => Auth_OpenID_OPENID1_NS));
     }
+
+    function test_isOpenID1()
+    {
+        $this->assertTrue($this->msg->isOpenID1());
+        $this->assertFalse($this->msg->namespaces->isImplicit(Auth_OpenID_OPENID1_NS));
+    }
+
+    function test_isOpenID2()
+    {
+        $this->assertFalse($this->msg->isOpenID2());
+    }
+
+    function test_toPostArgs()
+    {
+        $this->assertEquals($this->msg->toPostArgs(),
+                               array('openid.mode' => 'error',
+                                     'openid.error' => 'unit test',
+                                     'openid.ns' => Auth_OpenID_OPENID1_NS));
+    }
+
+    function test_toArgs()
+    {
+        $this->assertEquals($this->msg->toArgs(),
+                               array('mode' => 'error',
+                                     'error' => 'unit test',
+                                     'ns' => Auth_OpenID_OPENID1_NS));
+    }
+
+    function test_toKVForm()
+    {
+        $this->assertEquals($this->msg->toKVForm(),
+                            "error:unit test\nmode:error\nns:".
+                            Auth_OpenID_OPENID1_NS."\n");
+    }
+
+    function test_toURLEncoded()
+    {
+        $this->assertEquals($this->msg->toURLEncoded(),
+                               'openid.error=unit+test&openid.mode=error&openid.ns=http%3A%2F%2Fopenid.net%2Fsignon%2F1.0');
+    }
+
+    function test_toURL()
+    {
+        $base_url = 'http://base.url/';
+        $actual = $this->msg->toURL($base_url);
+        $actual_base = substr($actual, 0, strlen($base_url));
+        $this->assertEquals($actual_base, $base_url);
+        $this->assertEquals($actual[strlen($base_url)], '?');
+        $query = substr($actual, strlen($base_url) + 1);
+
+        $parsed = Auth_OpenID::parse_str($query);
+
+        $this->assertEquals($parsed, array('openid.mode' => 'error',
+                                           'openid.error' => 'unit test',
+                                           'openid.ns' => Auth_OpenID_OPENID1_NS));
+    }
 }
 
 class Tests_Auth_OpenID_OpenID2Message extends MessageTest {
@@ -1088,4 +1145,4 @@ $Tests_Auth_OpenID_Message_other = array(
                                          new Tests_Auth_OpenID_GeneralMessageTest()
                                          );
 
-?>
\ No newline at end of file
+?>
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index a8af901..31ca542 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -75,7 +75,8 @@ class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase {
         $this->assertTrue($e->hasReturnTo());
         $expected_args = array(
             'openid.mode' => 'error',
-            'openid.error' => 'plucky');
+            'openid.error' => 'plucky',
+            'openid.ns' => Auth_OpenID_OPENID1_NS);
 
         $encoded = $e->encodeToURL();
         if (Auth_OpenID_isError($encoded)) {
@@ -154,7 +155,8 @@ class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase {
         $e = new Auth_OpenID_ServerError($args, "plucky");
         $this->assertTrue($e->hasReturnTo());
         $expected_args = array('openid.mode' => 'error',
-                               'openid.error' => 'plucky');
+                               'openid.error' => 'plucky',
+                               'openid.ns' => Auth_OpenID_OPENID1_NS);
 
         $this->assertTrue($e->whichEncoding() == Auth_OpenID_ENCODE_URL);
 
@@ -1249,7 +1251,7 @@ class Tests_Auth_OpenID_CheckID extends PHPUnit_TestCase {
         $answer = $this->request->answer(false, $server_url);
 
         $this->assertEquals($answer->request, $this->request);
-        $this->assertEquals(count($answer->fields->toPostArgs()), 2);
+        $this->assertEquals(count($answer->fields->toPostArgs()), 3);
 	$this->assertEquals($answer->fields->getOpenIDNamespace(),
 			    Auth_OpenID_OPENID1_NS);
         $this->assertEquals($answer->fields->getArg(Auth_OpenID_OPENID_NS, 'mode'),
@@ -2238,4 +2240,4 @@ class Tests_Auth_OpenID_Server extends PHPUnit_TestSuite {
     }
 }
 
-?>
\ No newline at end of file
+?>