Merge branch 'master' into php5

* master:
  ASN1Test: Even better, use assertCount instead of assertSame.
  ASN1Test: The expected value comes first in assertEquals/assertSame.
  ASN1Test: Also check the type by using assertSame instead of assertEquals.
This commit is contained in:
Andreas Fischer 2014-09-04 22:54:01 +02:00
commit 6360f2f8b8

View File

@ -241,7 +241,7 @@ class Unit_File_ASN1Test extends PhpseclibTestCase
{
$asn1 = new File_ASN1();
$decoded = $asn1->decodeBER(file_get_contents(dirname(__FILE__) . '/ASN1/FE.pdf.p7m'));
$this->assertEquals(count($decoded[0]['content'][1]['content'][0]['content']), 5); // older versions would have returned 3
$this->assertCount(5, $decoded[0]['content'][1]['content'][0]['content']); // older versions would have returned 3
}
public function testDefiniteLength()
@ -266,6 +266,6 @@ class Unit_File_ASN1Test extends PhpseclibTestCase
'IOkKcGQRCMha8X2e7GmlpdWC1ycenlbN0nbVeSv3JUMcafC4+Q==';
$asn1 = new File_ASN1();
$decoded = $asn1->decodeBER(base64_decode($str));
$this->assertEquals(count($decoded[0]['content']), 3);
$this->assertCount(3, $decoded[0]['content']);
}
}