}
define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true); // compatibility
require_once INSTALLDIR . '/lib/common.php';
* 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=='
)
);
}
-
-
- /**
- * Test that MagicEnvelope builds the correct plaintext for signing.
- * @dataProvider provider
- */
- public function testSignatureTextCompat($env, $expected)
- {
- // Our old code didn't add the extra fields, just used the armored text.
- $alt = $env['data'];
-
- $magic = new MagicEnvelopeCompat;
- $text = $magic->signingText($env);
-
- $this->assertEquals($alt, $text, "'$text' should be '$alt'");
- }
-
}