Update the tests. Strengthen the unescape and escape tests and add more

server tests.

2 files changed, 21 insertions, 5 deletions

diff --git a/tests/oauth1/rfc5849/test_server.py b/tests/oauth1/rfc5849/test_server.py
index 2f5e12e..47dc426 100644
--- a/tests/oauth1/rfc5849/test_server.py
+++ b/tests/oauth1/rfc5849/test_server.py
@@ -40,11 +40,25 @@ class ServerTests(TestCase):
 
         uri, body, headers = c.sign(u'http://server.example.com:80/init')
 
-        str_headers = {}
-        for k, v in headers.iteritems():
-            str_headers[str(k)] = str(v)
+        headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
 
         s = self.TestServer()
-        r = s.check_request_signature(uri, body=body, headers=str_headers)
+        self.assertTrue(s.check_request_signature(uri, body=body,
+            headers=headers))
+
+    def test_server_callback_request(self):
+        c = Client(self.CLIENT_KEY,
+            client_secret=self.CLIENT_SECRET,
+            resource_owner_key=self.RESOURCE_OWNER_KEY,
+            resource_owner_secret=self.RESOURCE_OWNER_SECRET,
+            callback_uri=u'http://client.example.com/callback'
+        )
+
+        uri, body, headers = c.sign(u'http://server.example.com:80/init')
+
+        headers = dict([(str(k), str(v)) for k, v in headers.iteritems()])
+
+        s = self.TestServer()
+        self.assertTrue(s.check_request_signature(uri, body=body,
+            headers=headers))
 
-        self.assertTrue(r)
diff --git a/tests/oauth1/rfc5849/test_utils.py b/tests/oauth1/rfc5849/test_utils.py
index 037be0a..3ed1a59 100644
--- a/tests/oauth1/rfc5849/test_utils.py
+++ b/tests/oauth1/rfc5849/test_utils.py
@@ -128,10 +128,12 @@ class UtilsTests(TestCase):
     def test_escape(self):
         self.assertRaises(ValueError, escape, "I am a string type. Not a unicode type.")
         self.assertEqual(escape(u"I am a unicode type."), u"I%20am%20a%20unicode%20type.")
+        self.assertIsInstance(escape(u"I am a unicode type."), str)
 
     def test_unescape(self):
         self.assertRaises(ValueError, unescape, u"I am a unicode type. Not a string type.")
         self.assertEqual(unescape("I%20am%20a%20unicode%20type."), u'I am a unicode type.')
+        self.assertIsInstance(unescape("I%20am%20a%20unicode%20type."), unicode)
 
     def test_urlencode(self):