Mode to modern phpunit

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

28 files changed, 186 insertions, 172 deletions

diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php
index 3932e308de0..1b3f705b9b6 100644
--- a/tests/lib/Files/AppData/AppDataTest.php
+++ b/tests/lib/Files/AppData/AppDataTest.php
@@ -42,7 +42,7 @@ class AppDataTest extends \Test\TestCase {
 	/** @var IAppData */
 	private $appData;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php
index ceed1f4ed3a..fec464d6e3a 100644
--- a/tests/lib/Files/AppData/FactoryTest.php
+++ b/tests/lib/Files/AppData/FactoryTest.php
@@ -37,7 +37,7 @@ class FactoryTest extends \Test\TestCase {
 	/** @var Factory */
 	private $factory;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php
index bbf36329461..ce6b84ee4d0 100644
--- a/tests/lib/Files/Cache/PropagatorTest.php
+++ b/tests/lib/Files/Cache/PropagatorTest.php
@@ -20,7 +20,7 @@ class PropagatorTest extends TestCase {
 	/** @var  IStorage */
 	private $storage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage = new Temporary();
 		$this->storage->mkdir('foo/bar');
diff --git a/tests/lib/Files/Cache/QuerySearchHelperTest.php b/tests/lib/Files/Cache/QuerySearchHelperTest.php
index 5a9d3022099..d5aad09a8fb 100644
--- a/tests/lib/Files/Cache/QuerySearchHelperTest.php
+++ b/tests/lib/Files/Cache/QuerySearchHelperTest.php
@@ -48,7 +48,7 @@ class QuerySearchHelperTest extends TestCase {
 	/** @var  integer */
 	private $numericStorageId;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$this->mimetypeLoader = $this->createMock(IMimeTypeLoader::class);
@@ -83,7 +83,7 @@ class QuerySearchHelperTest extends TestCase {
 			->where($this->builder->expr()->eq('storage', new Literal($this->numericStorageId)));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 
 		$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php
index 1c0a8b0e0e9..6a025410cc3 100644
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@@ -250,8 +250,8 @@ class ScannerTest extends \Test\TestCase {
 		$this->cache->put('folder', array('mtime' => $this->storage->filemtime('folder'), 'storage_mtime' => $this->storage->filemtime('folder')));
 		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE);
 		$newData = $this->cache->get('');
-		$this->assertInternalType('string', $oldData['etag']);
-		$this->assertInternalType('string', $newData['etag']);
+		$this->assertIsString($oldData['etag']);
+		$this->assertIsString($newData['etag']);
 		$this->assertNotSame($oldData['etag'], $newData['etag']);
 		$this->assertEquals($oldData['size'], $newData['size']);
 
@@ -320,11 +320,11 @@ class ScannerTest extends \Test\TestCase {
 		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
 		/** @var CacheEntry $data0 */
 		$data0 = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $data0['etag']);
+		$this->assertIsString($data0['etag']);
 		$data1 = $this->cache->get('folder');
-		$this->assertInternalType('string', $data1['etag']);
+		$this->assertIsString($data1['etag']);
 		$data2 = $this->cache->get('');
-		$this->assertInternalType('string', $data2['etag']);
+		$this->assertIsString($data2['etag']);
 		$data0['etag'] = '';
 		$this->cache->put('folder/bar.txt', $data0->getData());
 
@@ -333,7 +333,7 @@ class ScannerTest extends \Test\TestCase {
 
 		// verify cache content
 		$newData0 = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $newData0['etag']);
+		$this->assertIsString($newData0['etag']);
 		$this->assertNotEmpty($newData0['etag']);
 	}
 
diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php
index e20cfe2ac12..a3b1a428c28 100644
--- a/tests/lib/Files/Cache/UpdaterLegacyTest.php
+++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php
@@ -93,13 +93,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		Filesystem::file_put_contents('foo.txt', 'asd');
 		$cachedData = $this->cache->get('foo.txt');
 		$this->assertEquals(3, $cachedData['size']);
-		$this->assertInternalType('string', $fooCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($fooCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($fooCachedData['etag'], $cachedData['etag']);
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$rootCachedData = $cachedData;
 
@@ -111,8 +111,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 2 * 3, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 	}
@@ -133,13 +133,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 	}
 
@@ -155,8 +155,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->assertFalse($this->cache->inCache('foo.txt'));
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 		$rootCachedData = $cachedData;
@@ -164,16 +164,16 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		Filesystem::mkdir('bar_folder');
 		$this->assertTrue($this->cache->inCache('bar_folder'));
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$rootCachedData = $cachedData;
 		$oldEtag = $rootCachedData['etag'];
 		Filesystem::rmdir('bar_folder');
 		$this->assertFalse($this->cache->inCache('bar_folder'));
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 	}
@@ -192,14 +192,14 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->assertFalse($cache2->inCache('foo.txt'));
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($substorageCachedData, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
 	}
@@ -221,8 +221,8 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 	}
 
@@ -253,15 +253,15 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$mtime = $cachedData['mtime'];
 
 		$cachedData = $cache2->get('');
-		$this->assertInternalType('string', $substorageCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($substorageCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		// rename can cause mtime change - invalid assert
 //		$this->assertEquals($mtime, $cachedData['mtime']);
 
 		$cachedData = $view->getFileInfo('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($oldEtag, $cachedData['etag']);
 		// rename can cause mtime change - invalid assert
 //		$this->assertEquals($mtime, $cachedData['mtime']);
@@ -272,13 +272,13 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$fooCachedData = $this->cache->get('foo.txt');
 		Filesystem::touch('foo.txt');
 		$cachedData = $this->cache->get('foo.txt');
-		$this->assertInternalType('string', $fooCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($fooCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
 
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 		$rootCachedData = $cachedData;
@@ -289,19 +289,19 @@ class UpdaterLegacyTest extends \Test\TestCase {
 		$this->cache->put('', ['mtime' => $time - 100]);
 		Filesystem::touch('folder/bar.txt', $time);
 		$cachedData = $this->cache->get('folder/bar.txt');
-		$this->assertInternalType('string', $barCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($barCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($barCachedData['etag'], $cachedData['etag']);
 		$this->assertEquals($time, $cachedData['mtime']);
 
 		$cachedData = $this->cache->get('folder');
-		$this->assertInternalType('string', $folderCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($folderCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($folderCachedData['etag'], $cachedData['etag']);
 
 		$cachedData = $this->cache->get('');
-		$this->assertInternalType('string', $rootCachedData['etag']);
-		$this->assertInternalType('string', $cachedData['etag']);
+		$this->assertIsString($rootCachedData['etag']);
+		$this->assertIsString($cachedData['etag']);
 		$this->assertNotSame($rootCachedData['etag'], $cachedData['etag']);
 		$this->assertEquals($time, $cachedData['mtime']);
 	}
diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
index 744e132d2cc..9c1a8c14101 100644
--- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
+++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php
@@ -24,7 +24,7 @@ class CacheJailTest extends CacheTest {
 	 */
 	protected $sourceCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage->mkdir('foo');
 		$this->sourceCache = $this->cache;
diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
index 0e2460f74e2..9883fc1da27 100644
--- a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
+++ b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php
@@ -24,7 +24,7 @@ class CachePermissionsMaskTest extends CacheTest {
 	 */
 	protected $sourceCache;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->storage->mkdir('foo');
 		$this->sourceCache = $this->cache;
diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php
index ba1011aa68e..d63693a655b 100644
--- a/tests/lib/Files/Config/UserMountCacheTest.php
+++ b/tests/lib/Files/Config/UserMountCacheTest.php
@@ -42,7 +42,7 @@ class UserMountCacheTest extends TestCase {
 
 	private $fileIds = [];
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		$this->fileIds = [];
 		$this->connection = \OC::$server->getDatabaseConnection();
 		$this->userManager = new Manager($this->createMock(IConfig::class), $this->createMock(EventDispatcherInterface::class));
@@ -54,7 +54,7 @@ class UserMountCacheTest extends TestCase {
 		$this->cache = new \OC\Files\Config\UserMountCache($this->connection, $this->userManager, $this->createMock(Log::class));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$builder = $this->connection->getQueryBuilder();
 
 		$builder->delete('mounts')->execute();
diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php
index 5c7c5cdc361..0037941b629 100644
--- a/tests/lib/Files/FileInfoTest.php
+++ b/tests/lib/Files/FileInfoTest.php
@@ -23,7 +23,7 @@ class FileInfoTest extends TestCase {
 
 	private $config;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->createUser('foo', 'foo');
 		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index 6b6e3feda33..6d0362772ca 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -323,18 +323,19 @@ class FilesystemTest extends \Test\TestCase {
 	/**
 	 * Tests that an exception is thrown when passed user does not exist.
 	 *
-	 * @expectedException \OC\User\NoUserException
 	 */
 	public function testLocalMountWhenUserDoesNotExist() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		$userId = $this->getUniqueID('user_');
 
 		\OC\Files\Filesystem::initMountPoints($userId);
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 */
+	
 	public function testNullUserThrows() {
+		$this->expectException(\OC\User\NoUserException::class);
+
 		\OC\Files\Filesystem::initMountPoints(null);
 	}
 
diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
index 5cd517df3c9..278872b8728 100644
--- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
+++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
@@ -21,7 +21,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
 	/** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */
 	protected $loader;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(IConfig::class);
diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php
index a17cc1d1a3a..2cdf9cbdc5a 100644
--- a/tests/lib/Files/Node/FileTest.php
+++ b/tests/lib/Files/Node/FileTest.php
@@ -59,10 +59,10 @@ class FileTest extends NodeTest {
 		$this->assertEquals('bar', $node->getContent());
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testGetContentNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
 			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
@@ -105,10 +105,10 @@ class FileTest extends NodeTest {
 		$node->putContent('bar');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testPutContentNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/** @var \OC\Files\Node\Root|\PHPUnit_Framework_MockObject_MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
 			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager])
@@ -213,10 +213,10 @@ class FileTest extends NodeTest {
 		$this->assertEquals(2, $hooksCalled);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			$this->view,
@@ -238,10 +238,10 @@ class FileTest extends NodeTest {
 		$node->fopen('r');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadWriteNoReadPermissions() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			$this->view,
@@ -263,10 +263,10 @@ class FileTest extends NodeTest {
 		$node->fopen('w');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testFOpenReadWriteNoWritePermissions() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$root = new \OC\Files\Node\Root(
 			$this->manager,
 			new $this->view,
diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php
index 3390d19feb7..d33fb4f68f8 100644
--- a/tests/lib/Files/Node/FolderTest.php
+++ b/tests/lib/Files/Node/FolderTest.php
@@ -176,10 +176,10 @@ class FolderTest extends NodeTest {
 		$this->assertEquals($child, $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testNewFolderNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$manager = $this->createMock(Manager::class);
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
@@ -230,10 +230,10 @@ class FolderTest extends NodeTest {
 		$this->assertEquals($child, $result);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testNewFileNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$manager = $this->createMock(Manager::class);
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php
index 9c47df02f3b..4c747a562b8 100644
--- a/tests/lib/Files/Node/HookConnectorTest.php
+++ b/tests/lib/Files/Node/HookConnectorTest.php
@@ -53,7 +53,7 @@ class HookConnectorTest extends TestCase {
 	 */
 	private $userId;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->userId = $this->getUniqueID();
 		$this->createUser($this->userId, 'pass');
@@ -71,7 +71,7 @@ class HookConnectorTest extends TestCase {
 		$this->eventDispatcher = \OC::$server->getEventDispatcher();
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		parent::tearDown();
 		\OC_Hook::clear('OC_Filesystem');
 		\OC_Util::tearDownFS();
diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php
index 14ae0b0ead3..7c8ddee6b5f 100644
--- a/tests/lib/Files/Node/NodeTest.php
+++ b/tests/lib/Files/Node/NodeTest.php
@@ -180,10 +180,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(2, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testDeleteNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->root->expects($this->any())
 			->method('getUser')
 			->will($this->returnValue($this->user));
@@ -437,10 +437,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(2, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testTouchNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->root->expects($this->any())
 			->method('getUser')
 			->will($this->returnValue($this->user));
@@ -454,10 +454,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->touch(100);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\InvalidPathException
-	 */
+	
 	public function testInvalidPath() {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+
 		$node = $this->createTestNode($this->root, $this->view, '/../foo');
 		$node->getFileInfo();
 	}
@@ -488,10 +488,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(3, $target->getId());
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
 		 */
@@ -519,10 +519,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->copy('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testCopyNoParent() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$this->view->expects($this->never())
 			->method('copy');
 
@@ -536,10 +536,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->copy('/bar/asd/foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyParentIsFile() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->never())
 			->method('copy');
 
@@ -659,10 +659,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$this->assertEquals(4, $hooksRun);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveNotPermitted() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('getFileInfo')
 			->will($this->returnValue($this->getFileInfo(['permissions' => \OCP\Constants::PERMISSION_READ])));
@@ -681,10 +681,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testMoveNoParent() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
 		 */
@@ -703,10 +703,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveParentIsFile() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->never())
 			->method('rename');
 
@@ -721,10 +721,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testMoveFailed() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('rename')
 			->with('/bar/foo', '/bar/asd')
@@ -744,10 +744,10 @@ abstract class NodeTest extends \Test\TestCase {
 		$node->move('/bar/asd');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testCopyFailed() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		$this->view->expects($this->any())
 			->method('copy')
 			->with('/bar/foo', '/bar/asd')
diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php
index 70ffe1b25c4..5067236ec58 100644
--- a/tests/lib/Files/Node/RootTest.php
+++ b/tests/lib/Files/Node/RootTest.php
@@ -87,10 +87,10 @@ class RootTest extends \Test\TestCase {
 		$this->assertInstanceOf('\OC\Files\Node\File', $node);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetNotFound() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
 		 */
@@ -121,10 +121,10 @@ class RootTest extends \Test\TestCase {
 		$root->get('/bar/foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotPermittedException
-	 */
+	
 	public function testGetInvalidPath() {
+		$this->expectException(\OCP\Files\NotPermittedException::class);
+
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
 		 */
@@ -143,10 +143,10 @@ class RootTest extends \Test\TestCase {
 		$root->get('/../foo');
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetNoStorages() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		/**
 		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
 		 */
@@ -201,11 +201,11 @@ class RootTest extends \Test\TestCase {
 		$this->assertEquals($folder, $root->getUserFolder('MyUserId'));
 	}
 
-	/**
-	 * @expectedException \OC\User\NoUserException
-	 * @expectedExceptionMessage Backends provided no user object
-	 */
+	
 	public function testGetUserFolderWithNoUserObj() {
+		$this->expectException(\OC\User\NoUserException::class);
+		$this->expectExceptionMessage('Backends provided no user object');
+
 		$root = new \OC\Files\Node\Root(
 			$this->createMock(Manager::class),
 			$this->createMock(View::class),
diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php
index 02ea3df6cb6..18637daf9d7 100644
--- a/tests/lib/Files/PathVerificationTest.php
+++ b/tests/lib/Files/PathVerificationTest.php
@@ -30,11 +30,11 @@ class PathVerificationTest extends \Test\TestCase {
 		$this->view = new View();
 	}
 
-	/**
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage File name is too long
-	 */
+	
 	public function testPathVerificationFileNameTooLong() {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('File name is too long');
+
 		$fileName = str_repeat('a', 500);
 		$this->view->verifyPath('', $fileName);
 	}
@@ -42,10 +42,11 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesEmptyFiles
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage Empty filename is not allowed
 	 */
 	public function testPathVerificationEmptyFileName($fileName) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('Empty filename is not allowed');
+
 		$this->view->verifyPath('', $fileName);
 	}
 
@@ -58,10 +59,11 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesDotFiles
-	 * @expectedException \OCP\Files\InvalidPathException
-	 * @expectedExceptionMessage Dot files are not allowed
 	 */
 	public function testPathVerificationDotFiles($fileName) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+		$this->expectExceptionMessage('Dot files are not allowed');
+
 		$this->view->verifyPath('', $fileName);
 	}
 
@@ -107,9 +109,10 @@ class PathVerificationTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider providesInvalidCharsPosix
-	 * @expectedException \OCP\Files\InvalidCharacterInPathException
 	 */
 	public function testPathVerificationInvalidCharsPosix($fileName) {
+		$this->expectException(\OCP\Files\InvalidCharacterInPathException::class);
+
 		$storage = new Local(['datadir' => '']);
 
 		$fileName = " 123{$fileName}456 ";
diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php
index ba8688fea01..07a7e79c7a3 100644
--- a/tests/lib/Files/SimpleFS/SimpleFileTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php
@@ -36,7 +36,7 @@ class SimpleFileTest extends \Test\TestCase  {
 	/** @var SimpleFile */
 	private $simpleFile;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->file = $this->createMock(File::class);
diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
index 9c55367f44f..9dcca32090f 100644
--- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php
+++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php
@@ -37,7 +37,7 @@ class SimpleFolderTest extends \Test\TestCase  {
 	/** @var SimpleFolder */
 	private $simpleFolder;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->folder = $this->createMock(Folder::class);
diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php
index 3b83a349cfa..23738a25c2a 100644
--- a/tests/lib/Files/Storage/LocalTest.php
+++ b/tests/lib/Files/Storage/LocalTest.php
@@ -63,24 +63,24 @@ class LocalTest extends Storage {
 		$this->assertNotEquals($etag1, $etag2);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testInvalidArgumentsEmptyArray() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new \OC\Files\Storage\Local([]);
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testInvalidArgumentsNoArray() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new \OC\Files\Storage\Local(null);
 	}
 
-	/**
-	 * @expectedException \OCP\Files\ForbiddenException
-	 */
+	
 	public function testDisallowSymlinksOutsideDatadir() {
+		$this->expectException(\OCP\Files\ForbiddenException::class);
+
 		$subDir1 = $this->tmpDir . 'sub1';
 		$subDir2 = $this->tmpDir . 'sub2';
 		$sym = $this->tmpDir . 'sub1/sym';
diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
index e8eb49ec014..f36958ad552 100644
--- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
+++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
@@ -35,7 +35,7 @@ class AvailabilityTest extends \Test\TestCase {
 	/** @var Availability  */
 	protected $wrapper;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->storageCache = $this->createMock(StorageCache::class);
@@ -66,9 +66,10 @@ class AvailabilityTest extends \Test\TestCase {
 	/**
 	 * Storage marked unavailable, TTL not expired
 	 *
-	 * @expectedException \OCP\Files\StorageNotAvailableException
 	 */
 	public function testUnavailable() {
+		$this->expectException(\OCP\Files\StorageNotAvailableException::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => false, 'last_checked' => time()]);
@@ -105,9 +106,10 @@ class AvailabilityTest extends \Test\TestCase {
 	/**
 	 * Storage marked available, but throws StorageNotAvailableException
 	 *
-	 * @expectedException \OCP\Files\StorageNotAvailableException
 	 */
 	public function testAvailableThrowStorageNotAvailable() {
+		$this->expectException(\OCP\Files\StorageNotAvailableException::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => true, 'last_checked' => 0]);
@@ -146,9 +148,10 @@ class AvailabilityTest extends \Test\TestCase {
 	 * Storage available, but throws exception
 	 * Standard exception does not indicate storage unavailability
 	 *
-	 * @expectedException \Exception
 	 */
 	public function testAvailableThrow() {
+		$this->expectException(\Exception::class);
+
 		$this->storage->expects($this->once())
 			->method('getAvailability')
 			->willReturn(['available' => true, 'last_checked' => 0]);
diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
index 5b4443eecfc..9060ca2dac3 100644
--- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
@@ -18,7 +18,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary([]);
 		$this->instance = new \OC\Files\Storage\Wrapper\Encoding([
@@ -26,7 +26,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
 		]);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->sourceStorage->cleanUp();
 		parent::tearDown();
 	}
diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php
index 1091809f96c..cb7003cb7ea 100644
--- a/tests/lib/Files/Storage/Wrapper/JailTest.php
+++ b/tests/lib/Files/Storage/Wrapper/JailTest.php
@@ -15,7 +15,7 @@ class JailTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
 		$this->sourceStorage->mkdir('foo');
@@ -25,7 +25,7 @@ class JailTest extends \Test\Files\Storage\Storage {
 		));
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		// test that nothing outside our jail is touched
 		$contents = array();
 		$dh = $this->sourceStorage->opendir('');
diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
index c9545ae3f28..bfdd3d3ddbb 100644
--- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
+++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
@@ -22,13 +22,13 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage {
 	 */
 	private $sourceStorage;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
 		$this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL);
 	}
 
-	public function tearDown(): void {
+	protected function tearDown(): void {
 		$this->sourceStorage->cleanUp();
 		parent::tearDown();
 	}
diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php
index c0cd2a24411..e522239f001 100644
--- a/tests/lib/Files/Type/DetectionTest.php
+++ b/tests/lib/Files/Type/DetectionTest.php
@@ -28,7 +28,7 @@ class DetectionTest extends \Test\TestCase {
 	/** @var Detection */
 	private $detection;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 		$this->detection = new Detection(
 			\OC::$server->getURLGenerator(),
diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php
index 9f057960b60..4af252735f6 100644
--- a/tests/lib/Files/Utils/ScannerTest.php
+++ b/tests/lib/Files/Utils/ScannerTest.php
@@ -157,11 +157,12 @@ class ScannerTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider invalidPathProvider
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage Invalid path to scan
 	 * @param string $invalidPath
 	 */
 	public function testInvalidPathScanning($invalidPath) {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('Invalid path to scan');
+
 		$scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
 		$scanner->scan($invalidPath);
 	}
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 1e564c69092..57050059375 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -242,10 +242,10 @@ class ViewTest extends \Test\TestCase {
 		$this->assertEquals('/foo.txt', $folderView->getPath($id2));
 	}
 
-	/**
-	 * @expectedException \OCP\Files\NotFoundException
-	 */
+	
 	public function testGetPathNotExisting() {
+		$this->expectException(\OCP\Files\NotFoundException::class);
+
 		$storage1 = $this->getTestStorage();
 		Filesystem::mount($storage1, [], '/');
 
@@ -1049,9 +1049,10 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider tooLongPathDataProvider
-	 * @expectedException \OCP\Files\InvalidPathException
 	 */
 	public function testTooLongPath($operation, $param0 = null) {
+		$this->expectException(\OCP\Files\InvalidPathException::class);
+
 
 		$longPath = '';
 		// 4000 is the maximum path length in file_cache.path
@@ -1242,10 +1243,11 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider directoryTraversalProvider
-	 * @expectedException \Exception
 	 * @param string $root
 	 */
 	public function testConstructDirectoryTraversalException($root) {
+		$this->expectException(\Exception::class);
+
 		new View($root);
 	}
 
@@ -1289,17 +1291,16 @@ class ViewTest extends \Test\TestCase {
 		$this->assertNull($view->getRelativePath(null));
 	}
 
-	/**
-	 * @expectedException \InvalidArgumentException
-	 */
+	
 	public function testNullAsRoot() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		new View(null);
 	}
 
 	/**
 	 * e.g. reading from a folder that's being renamed
 	 *
-	 * @expectedException \OCP\Lock\LockedException
 	 *
 	 * @dataProvider dataLockPaths
 	 *
@@ -1307,6 +1308,8 @@ class ViewTest extends \Test\TestCase {
 	 * @param string $pathPrefix
 	 */
 	public function testReadFromWriteLockedPath($rootPath, $pathPrefix) {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$rootPath = str_replace('{folder}', 'files', $rootPath);
 		$pathPrefix = str_replace('{folder}', 'files', $pathPrefix);
 
@@ -1339,7 +1342,6 @@ class ViewTest extends \Test\TestCase {
 	/**
 	 * e.g. writing a file that's being downloaded
 	 *
-	 * @expectedException \OCP\Lock\LockedException
 	 *
 	 * @dataProvider dataLockPaths
 	 *
@@ -1347,6 +1349,8 @@ class ViewTest extends \Test\TestCase {
 	 * @param string $pathPrefix
 	 */
 	public function testWriteToReadLockedFile($rootPath, $pathPrefix) {
+		$this->expectException(\OCP\Lock\LockedException::class);
+
 		$rootPath = str_replace('{folder}', 'files', $rootPath);
 		$pathPrefix = str_replace('{folder}', 'files', $pathPrefix);
 
@@ -1507,11 +1511,12 @@ class ViewTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider pathRelativeToFilesProviderExceptionCases
-	 * @expectedException \InvalidArgumentException
-	 * @expectedExceptionMessage $absolutePath must be relative to "files"
 	 * @param string $path
 	 */
 	public function testGetPathRelativeToFilesWithInvalidArgument($path) {
+		$this->expectException(\InvalidArgumentException::class);
+		$this->expectExceptionMessage('$absolutePath must be relative to "files"');
+
 		$view = new View();
 		$view->getPathRelativeToFiles($path);
 	}
@@ -2141,9 +2146,10 @@ class ViewTest extends \Test\TestCase {
 	 * simulate a failed copy operation.
 	 * We expect that we catch the exception, free the lock and re-throw it.
 	 *
-	 * @expectedException \Exception
 	 */
 	public function testLockFileCopyException() {
+		$this->expectException(\Exception::class);
+
 		$view = new View('/' . $this->user . '/files/');
 
 		/** @var Temporary|\PHPUnit_Framework_MockObject_MockObject $storage */