Adjust unit testing

lib/private/Encryption/DecryptAll.php

@@ -62,6 +62,7 @@ class DecryptAll {
 	 * @param Manager $encryptionManager
 	 * @param IUserManager $userManager
 	 * @param View $rootView
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		Manager $encryptionManager,
@@ -147,6 +148,7 @@ protected function prepareEncryptionModules($user) {
 	 * iterate over all user and encrypt their files
 	 *
 	 * @param string $user which users files should be decrypted, default = all users
+	 * @return bool
 	 */
 	protected function decryptAllUsersFiles($user = '') {
 
@@ -204,7 +206,7 @@ protected function decryptAllUsersFiles($user = '') {
 		$progress->finish();
 
 		$this->output->writeln("\n\n");
-
+		return true;
 	}
 
 	/**

tests/lib/Encryption/DecryptAllTest.php

@@ -36,6 +36,7 @@
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Test\TestCase;
 
@@ -257,10 +258,18 @@ public function dataTestDecryptAllUsersFiles() {
 		];
 	}
 
-	public function testDecryptUsersFiles() {
-		$storage = $this->getMockBuilder(SharedStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
+	public function providesData() {
+		return[
+			[true],
+			[false]
+		];
+	}
+	/**
+	 * @param $throwsExceptionInDecrypt
+	 * @dataProvider providesData
+	 */
+	public function testDecryptUsersFiles($throwsExceptionInDecrypt) {
+		$storage = $this->createMock(SharedStorage::class);
 
 		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject  $instance */
 		$instance = $this->getMockBuilder(DecryptAll::class)
@@ -300,18 +309,23 @@ function($path) {
 				}
 			);
 
-		$instance->expects($this->at(0))
-			->method('decryptFile')
-			->with('/user1/files/bar');
-		$instance->expects($this->at(1))
-			->method('decryptFile')
-			->with('/user1/files/foo/subfile');
+		if ($throwsExceptionInDecrypt) {
+			$instance->expects($this->at(0))
+				->method('decryptFile')
+				->with('/user1/files/bar')
+				->willThrowException(new \Exception());
+		} else {
+			$instance->expects($this->at(0))
+				->method('decryptFile')
+				->with('/user1/files/bar');
+			$instance->expects($this->at(1))
+				->method('decryptFile')
+				->with('/user1/files/foo/subfile');
+		}
 
-		$progressBar = $this->getMockBuilder(ProgressBar::class)
-			->disableOriginalConstructor()->getMock();
+		$progressBar = new ProgressBar(new NullOutput());
 
 		$this->invokePrivate($instance, 'decryptUsersFiles', ['user1', $progressBar, '']);
-
 	}
 
 	public function testDecryptFile() {