Merge commit 'refs/merge-requests/19' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / plugins / OStatus / tests / MagicEnvelopeTest.php

diff --git a/plugins/OStatus/tests/MagicEnvelopeTest.php b/plugins/OStatus/tests/MagicEnvelopeTest.php
index ed17fdb09a8fad79c13b320144b374f2dc6f9330..fd5ad54129326a4d952cc0da12273626870f2e3a 100644 (file)
--- a/plugins/OStatus/tests/MagicEnvelopeTest.php
+++ b/plugins/OStatus/tests/MagicEnvelopeTest.php
@@ -17,26 +17,26 @@ class MagicEnvelopeTest extends PHPUnit_Framework_TestCase
      * Test that MagicEnvelope builds the correct plaintext for signing.
      * @dataProvider provider
      */
-    public function testSignatureText($env, $expected)
+    public function testSignatureText(MagicEnvelope $env, $expected)
     {
-        $magic = new MagicEnvelope;
-        $text = $magic->signingText($env);
+        $text = $env->signingText();
 
         $this->assertEquals($expected, $text, "'$text' should be '$expected'");
     }
 
     static public function provider()
     {
+        // Sample case given in spec:
+        // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-00.html#signing
+        $magic_env = new MagicEnvelope();
+        $magic_env->data = 'Tm90IHJlYWxseSBBdG9t';
+        $magic_env->data_type = 'application/atom+xml';
+        $magic_env->encoding = 'base64url';
+        $magic_env->alg = 'RSA-SHA256';
+
         return array(
             array(
-                // Sample case given in spec:
-                // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-00.html#signing
-                array(
-                    'data' => 'Tm90IHJlYWxseSBBdG9t',
-                    'data_type' => 'application/atom+xml',
-                    'encoding' => 'base64url',
-                    'alg' => 'RSA-SHA256'
-                ),
+                $magic_env,
                 'Tm90IHJlYWxseSBBdG9t.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='
             )
         );