Fix PHPDoc + Add handling for error cases

Makes static code analyzers happier.

1 files changed, 59 insertions, 5 deletions

diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php
index 0cdd76d6b44..82f5341960e 100644
--- a/apps/encryption/tests/lib/RecoveryTest.php
+++ b/apps/encryption/tests/lib/RecoveryTest.php
@@ -59,14 +59,44 @@ class RecoveryTest extends TestCase {
 	 */
 	private $instance;
 
-	public function testEnableAdminRecovery() {
+	public function testEnableAdminRecoverySuccessful() {
 		$this->keyManagerMock->expects($this->exactly(2))
 			->method('recoveryKeyExists')
 			->willReturnOnConsecutiveCalls(false, true);
 
 		$this->cryptMock->expects($this->once())
 			->method('createKeyPair')
-			->willReturn(true);
+			->willReturn([
+				'publicKey' => 'privateKey',
+				'privateKey' => 'publicKey',
+			]);
+
+		$this->keyManagerMock->expects($this->once())
+			->method('setRecoveryKey')
+			->willReturn(false);
+
+		$this->keyManagerMock->expects($this->exactly(2))
+			->method('checkRecoveryPassword')
+			->willReturnOnConsecutiveCalls(true, true);
+
+		$this->assertTrue($this->instance->enableAdminRecovery('password'));
+		$this->assertArrayHasKey('recoveryAdminEnabled', self::$tempStorage);
+		$this->assertEquals(1, self::$tempStorage['recoveryAdminEnabled']);
+
+		$this->assertTrue($this->instance->enableAdminRecovery('password'));
+	}
+
+	public function testEnableAdminRecoveryCouldNotCheckPassword() {
+		$this->keyManagerMock->expects($this->exactly(2))
+			->method('recoveryKeyExists')
+			->willReturnOnConsecutiveCalls(false, true);
+
+		$this->cryptMock->expects($this->once())
+			->method('createKeyPair')
+			->willReturn([
+					'publicKey' => 'privateKey',
+					'privateKey' => 'publicKey',
+			]);
 
 		$this->keyManagerMock->expects($this->once())
 			->method('setRecoveryKey')
@@ -83,7 +113,19 @@ class RecoveryTest extends TestCase {
 		$this->assertFalse($this->instance->enableAdminRecovery('password'));
 	}
 
-	public function testChangeRecoveryKeyPassword() {
+	public function testEnableAdminRecoveryCouldNotCreateKey() {
+		$this->keyManagerMock->expects($this->once())
+			->method('recoveryKeyExists')
+			->willReturn(false);
+
+		$this->cryptMock->expects($this->once())
+			->method('createKeyPair')
+			->willReturn(false);
+
+		$this->assertFalse($this->instance->enableAdminRecovery('password'));
+	}
+
+	public function testChangeRecoveryKeyPasswordSuccessful() {
 		$this->assertFalse($this->instance->changeRecoveryKeyPassword('password',
 			'passwordOld'));
 
@@ -101,6 +143,19 @@ class RecoveryTest extends TestCase {
 			'passwordOld'));
 	}
 
+	public function testChangeRecoveryKeyPasswordCouldNotDecryptPrivateRecoveryKey() {
+		$this->assertFalse($this->instance->changeRecoveryKeyPassword('password', 'passwordOld'));
+
+		$this->keyManagerMock->expects($this->once())
+			->method('getSystemPrivateKey');
+
+		$this->cryptMock->expects($this->once())
+			->method('decryptPrivateKey')
+			->will($this->returnValue(false));
+
+		$this->assertFalse($this->instance->changeRecoveryKeyPassword('password', 'passwordOld'));
+	}
+
 	public function testDisableAdminRecovery() {
 
 		$this->keyManagerMock->expects($this->exactly(2))
@@ -145,8 +200,7 @@ class RecoveryTest extends TestCase {
 
 		$this->cryptMock->expects($this->once())
 			->method('decryptPrivateKey');
-		$this->assertNull($this->instance->recoverUsersFiles('password',
-			'admin'));
+		$this->assertNull($this->instance->recoverUsersFiles('password', 'admin'));
 	}
 
 	public function testRecoverFile() {