5.3 syntax...

This commit is contained in:
Robin Appelman 2014-08-31 13:16:28 +02:00
parent bfa0c4b78a
commit 3a85767182
1 changed files with 14 additions and 9 deletions

View File

@ -4,7 +4,7 @@
* This file is licensed under the Affero General Public License version 3 or * This file is licensed under the Affero General Public License version 3 or
* later. * later.
* See the COPYING-README file. * See the COPYING-README file.
*/ */
use \OC\Security\Certificate; use \OC\Security\Certificate;
@ -18,11 +18,11 @@ class CertificateTest extends \PHPUnit_Framework_TestCase {
protected $expiredCertificate; protected $expiredCertificate;
function setUp() { function setUp() {
$goodCertificate = file_get_contents(__DIR__.'/../../data/certificates/goodCertificate.crt'); $goodCertificate = file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt');
$this->goodCertificate = new Certificate($goodCertificate, 'GoodCertificate'); $this->goodCertificate = new Certificate($goodCertificate, 'GoodCertificate');
$badCertificate = file_get_contents(__DIR__.'/../../data/certificates/badCertificate.crt'); $badCertificate = file_get_contents(__DIR__ . '/../../data/certificates/badCertificate.crt');
$this->invalidCertificate = new Certificate($badCertificate, 'BadCertificate'); $this->invalidCertificate = new Certificate($badCertificate, 'BadCertificate');
$expiredCertificate = file_get_contents(__DIR__.'/../../data/certificates/expiredCertificate.crt'); $expiredCertificate = file_get_contents(__DIR__ . '/../../data/certificates/expiredCertificate.crt');
$this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate'); $this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate');
} }
@ -55,14 +55,19 @@ class CertificateTest extends \PHPUnit_Framework_TestCase {
} }
function testGetIssueDate() { function testGetIssueDate() {
$this->assertEquals((new DateTime('2014-08-27 08:45:52 GMT'))->getTimestamp(), $this->goodCertificate->getIssueDate()->getTimestamp()); $expected = new DateTime('2014-08-27 08:45:52 GMT');
$this->assertEquals((new DateTime('2014-08-27 08:48:51 GMT'))->getTimestamp(), $this->invalidCertificate->getIssueDate()->getTimestamp()); $this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getIssueDate()->getTimestamp());
$expected = new DateTime('2014-08-27 08:48:51 GMT');
$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getIssueDate()->getTimestamp());
} }
function testGetExpireDate() { function testGetExpireDate() {
$this->assertEquals((new DateTime('2015-08-27 08:45:52 GMT'))->getTimestamp(), $this->goodCertificate->getExpireDate()->getTimestamp()); $expected = new DateTime('2015-08-27 08:45:52 GMT');
$this->assertEquals((new DateTime('2015-08-27 08:48:51 GMT'))->getTimestamp(), $this->invalidCertificate->getExpireDate()->getTimestamp()); $this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getExpireDate()->getTimestamp());
$this->assertEquals((new DateTime('2014-08-28 09:12:43 GMT'))->getTimestamp(), $this->expiredCertificate->getExpireDate()->getTimestamp()); $expected = new DateTime('2015-08-27 08:48:51 GMT');
$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getExpireDate()->getTimestamp());
$expected = new DateTime('2014-08-28 09:12:43 GMT');
$this->assertEquals($expected->getTimestamp(), $this->expiredCertificate->getExpireDate()->getTimestamp());
} }
/** /**