diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 15:27:18 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 15:27:18 +0100 |
| commit | 3a7cf40aaa678bea1df143d2982d603b7a334eec (patch) | |
| tree | 63c1e3ad7f7f401d14411a4d44c523632906afc9 /apps/files_versions | |
| parent | 0568b012672d650c6b5a49e72c4028dde5463c60 (diff) | |
| download | nextcloud-server-3a7cf40aaa678bea1df143d2982d603b7a334eec.tar.gz nextcloud-server-3a7cf40aaa678bea1df143d2982d603b7a334eec.zip | |
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/tests/Command/CleanupTest.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/tests/Controller/PreviewControllerTest.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/tests/VersioningTest.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php index ace8e842e7b..69f822fcb84 100644 --- a/apps/files_versions/tests/Command/CleanupTest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php @@ -48,7 +48,7 @@ class CleanupTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IRootFolder */ protected $rootFolder; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder') diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php index e771b82a42d..79afb8bd536 100644 --- a/apps/files_versions/tests/Controller/PreviewControllerTest.php +++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php @@ -64,7 +64,7 @@ class PreviewControllerTest extends TestCase { /** @var IVersionManager|\PHPUnit_Framework_MockObject_MockObject */ private $versionManager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index d878ea9c3da..3f51f619629 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -620,10 +620,10 @@ class VersioningTest extends \Test\TestCase { $this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER)); } - /** - * @expectedException \OC\User\NoUserException - */ + public function testExpireNonexistingUser() { + $this->expectException(\OC\User\NoUserException::class); + $this->logout(); // needed to have a FS setup (the background job does this) \OC_Util::setupFS(self::TEST_VERSIONS_USER); |