Mode to modern phpunit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

3 files changed, 13 insertions, 12 deletions

diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
index 0f56cf53fa8..d17050e7245 100644
--- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
+++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php
@@ -63,7 +63,7 @@ class ChangeKeyStorageRootTest extends TestCase {
 	/** @var \OCP\UserInterface |  \PHPUnit_Framework_MockObject_MockObject */
 	protected $userInterface;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->getMockBuilder(View::class)->getMock();
@@ -181,12 +181,13 @@ class ChangeKeyStorageRootTest extends TestCase {
 
 	/**
 	 * @dataProvider dataTestPrepareNewRootException
-	 * @expectedException \Exception
 	 *
 	 * @param bool $dirExists
 	 * @param bool $couldCreateFile
 	 */
 	public function testPrepareNewRootException($dirExists, $couldCreateFile) {
+		$this->expectException(\Exception::class);
+
 		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
 			->willReturn($dirExists);
 		$this->view->expects($this->any())->method('file_put_contents')->willReturn($couldCreateFile);
@@ -370,10 +371,10 @@ class ChangeKeyStorageRootTest extends TestCase {
 		);
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testTargetExistsException() {
+		$this->expectException(\Exception::class);
+
 		$this->view->expects($this->once())->method('file_exists')->with('path')
 			->willReturn(true);
 
diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php
index 7fa95351045..acdaff4bbab 100644
--- a/tests/Core/Command/Encryption/DecryptAllTest.php
+++ b/tests/Core/Command/Encryption/DecryptAllTest.php
@@ -54,7 +54,7 @@ class DecryptAllTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\DecryptAll */
 	protected $decryptAll;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder(IConfig::class)
@@ -181,10 +181,10 @@ class DecryptAllTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testExecuteFailure() {
+		$this->expectException(\Exception::class);
+
 		$instance = new DecryptAll(
 			$this->encryptionManager,
 			$this->appManager,
diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php
index 9c9818475f5..778d51fd8b8 100644
--- a/tests/Core/Command/Encryption/EncryptAllTest.php
+++ b/tests/Core/Command/Encryption/EncryptAllTest.php
@@ -128,10 +128,10 @@ class EncryptAllTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \Exception
-	 */
+	
 	public function testExecuteException() {
+		$this->expectException(\Exception::class);
+
 		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
 		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(false);
 		$this->encryptionManager->expects($this->never())->method('getEncryptionModule');