diff options
Diffstat (limited to 'apps/encryption/tests/Crypto/EncryptionTest.php')
| -rw-r--r-- | apps/encryption/tests/Crypto/EncryptionTest.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/encryption/tests/Crypto/EncryptionTest.php b/apps/encryption/tests/Crypto/EncryptionTest.php index 4136673a6ec..94e0729317f 100644 --- a/apps/encryption/tests/Crypto/EncryptionTest.php +++ b/apps/encryption/tests/Crypto/EncryptionTest.php @@ -73,7 +73,7 @@ class EncryptionTest extends TestCase { /** @var \OCP\Files\Storage|\PHPUnit_Framework_MockObject_MockObject */ private $storageMock; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->storageMock = $this->getMockBuilder(Storage::class) @@ -131,9 +131,10 @@ class EncryptionTest extends TestCase { /** * test if public key from owner is missing * - * @expectedException \OCA\Encryption\Exceptions\PublicKeyMissingException */ public function testEndUser2() { + $this->expectException(\OCA\Encryption\Exceptions\PublicKeyMissingException::class); + $this->instance->begin('/foo/bar', 'user2', 'r', array(), array('users' => array('user1', 'user2', 'user3'))); $this->endTest(); } @@ -431,11 +432,11 @@ class EncryptionTest extends TestCase { ); } - /** - * @expectedException \OC\Encryption\Exceptions\DecryptionFailedException - * @expectedExceptionMessage Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you. - */ + public function testDecrypt() { + $this->expectException(\OC\Encryption\Exceptions\DecryptionFailedException::class); + $this->expectExceptionMessage('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.'); + $this->instance->decrypt('abc'); } |