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 /tests/lib/Collaboration | |
| 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 'tests/lib/Collaboration')
7 files changed, 9 insertions, 8 deletions
diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php index d5a84e9b1b5..3d81134680a 100644 --- a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php @@ -60,7 +60,7 @@ class GroupPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index 40fee52f234..15dccf2c84c 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -55,7 +55,7 @@ class LookupPluginTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userSession = $this->createMock(IUserSession::class); diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php index af5cb7d3036..9cf308cd414 100644 --- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php @@ -59,7 +59,7 @@ class MailPluginTest extends TestCase { /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ protected $userSession; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 03140ddc6eb..4ac2cc124ee 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -57,7 +57,7 @@ class RemotePluginTest extends TestCase { /** @var SearchResult */ protected $searchResult; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); @@ -137,9 +137,10 @@ class RemotePluginTest extends TestCase { * @dataProvider dataTestSplitUserRemoteError * * @param string $id - * @expectedException \Exception */ public function testSplitUserRemoteError($id) { + $this->expectException(\Exception::class); + $this->instantiatePlugin(); $this->plugin->splitUserRemote($id); } diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php index 717693e7592..43672345226 100644 --- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php @@ -39,7 +39,7 @@ class SearchResultTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/lib/Collaboration/Collaborators/SearchTest.php index 9116352ef19..284d8270c49 100644 --- a/tests/lib/Collaboration/Collaborators/SearchTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchTest.php @@ -39,7 +39,7 @@ class SearchTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php index 57b9cbde856..3aeeaa3eecb 100644 --- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php @@ -62,7 +62,7 @@ class UserPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); |