Mode to modern phpunit

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

2 files changed, 11 insertions, 11 deletions

diff --git a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
index bc2b434bcf7..3135ced2612 100644
--- a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
+++ b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
@@ -51,7 +51,7 @@ class ChunkingPluginTest extends TestCase {
 	/** @var ResponseInterface | \PHPUnit_Framework_MockObject_MockObject */
 	private $response;
 
-	public function setUp(): void {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
@@ -141,11 +141,11 @@ class ChunkingPluginTest extends TestCase {
 		$this->assertFalse($this->plugin->beforeMove('source', 'target'));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
-	 * @expectedExceptionMessage Chunks on server do not sum up to 4 but to 3 bytes
-	 */
+	
 	public function testBeforeMoveSizeIsWrong() {
+		$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
+		$this->expectExceptionMessage('Chunks on server do not sum up to 4 but to 3 bytes');
+
 		$sourceNode = $this->createMock(FutureFile::class);
 		$sourceNode->expects($this->once())
 			->method('getSize')
diff --git a/apps/dav/tests/unit/Upload/FutureFileTest.php b/apps/dav/tests/unit/Upload/FutureFileTest.php
index 94be4ea66dd..cfe3491d13f 100644
--- a/apps/dav/tests/unit/Upload/FutureFileTest.php
+++ b/apps/dav/tests/unit/Upload/FutureFileTest.php
@@ -73,18 +73,18 @@ class FutureFileTest extends \Test\TestCase {
 		$f->delete();
 	}
 
-	/**
-	 * @expectedException Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testPut() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$f = $this->mockFutureFile();
 		$f->put('');
 	}
 
-	/**
-	 * @expectedException Sabre\DAV\Exception\Forbidden
-	 */
+	
 	public function testSetName() {
+		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
 		$f = $this->mockFutureFile();
 		$f->setName('');
 	}