Mode to modern phpunit

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

5 files changed, 15 insertions, 14 deletions

diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index 75ea3f8ef53..e2c76db7ed9 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -67,7 +67,7 @@ class DecryptAllTest extends TestCase {
 	/** @var  DecryptAll */
 	protected $instance;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userManager = $this->getMockBuilder(IUserManager::class)
diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php
index 8e9e774347b..93987a8bb20 100644
--- a/tests/lib/Encryption/EncryptionWrapperTest.php
+++ b/tests/lib/Encryption/EncryptionWrapperTest.php
@@ -43,7 +43,7 @@ class EncryptionWrapperTest extends TestCase {
 	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */
 	private $arrayCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->arrayCache = $this->createMock(ArrayCache::class);
diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php
index 611044ba920..31936a4176b 100644
--- a/tests/lib/Encryption/Keys/StorageTest.php
+++ b/tests/lib/Encryption/Keys/StorageTest.php
@@ -42,7 +42,7 @@ class StorageTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	protected $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->util = $this->getMockBuilder('OC\Encryption\Util')
diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php
index 0919bda36b0..6e18cd296a3 100644
--- a/tests/lib/Encryption/ManagerTest.php
+++ b/tests/lib/Encryption/ManagerTest.php
@@ -35,7 +35,7 @@ class ManagerTest extends TestCase {
 	/** @var ArrayCache|\PHPUnit_Framework_MockObject_MockObject */
 	private $arrayCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->logger = $this->createMock(ILogger::class);
@@ -81,10 +81,11 @@ class ManagerTest extends TestCase {
 
 	/**
 	 * @depends testModuleRegistration
-	 * @expectedException \OC\Encryption\Exceptions\ModuleAlreadyExistsException
-	 * @expectedExceptionMessage Id "ID0" already used by encryption module "TestDummyModule0"
 	 */
 	public function testModuleReRegistration($manager) {
+		$this->expectException(\OC\Encryption\Exceptions\ModuleAlreadyExistsException::class);
+		$this->expectExceptionMessage('Id "ID0" already used by encryption module "TestDummyModule0"');
+
 		$this->addNewEncryptionModule($manager, 0);
 	}
 
@@ -98,11 +99,11 @@ class ManagerTest extends TestCase {
 
 	}
 
-	/**
-	 * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
-	 * @expectedExceptionMessage Module with ID: unknown does not exist.
-	 */
+	
 	public function testGetEncryptionModuleUnknown() {
+		$this->expectException(\OC\Encryption\Exceptions\ModuleDoesNotExistsException::class);
+		$this->expectExceptionMessage('Module with ID: unknown does not exist.');
+
 		$this->config->expects($this->any())->method('getAppValue')->willReturn(true);
 		$this->addNewEncryptionModule($this->manager, 0);
 		$this->assertCount(1, $this->manager->getEncryptionModules());
diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php
index ee616d20793..e503da109a8 100644
--- a/tests/lib/Encryption/UtilTest.php
+++ b/tests/lib/Encryption/UtilTest.php
@@ -32,7 +32,7 @@ class UtilTest extends TestCase {
 	/** @var  \OC\Encryption\Util */
 	private $util;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
@@ -96,10 +96,10 @@ class UtilTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @expectedException \OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException
-	 */
+	
 	public function testCreateHeaderFailed() {
+		$this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
+
 
 		$header = array('header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo');