From 3a7cf40aaa678bea1df143d2982d603b7a334eec Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 27 Nov 2019 15:27:18 +0100 Subject: Mode to modern phpunit Signed-off-by: Roeland Jago Douma --- apps/user_ldap/tests/User/DeletedUsersIndexTest.php | 4 ++-- apps/user_ldap/tests/User/ManagerTest.php | 2 +- apps/user_ldap/tests/User/UserTest.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/user_ldap/tests/User') diff --git a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php index e81a81f742f..c6f2d9bebd2 100644 --- a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php +++ b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php @@ -48,7 +48,7 @@ class DeletedUsersIndexTest extends \Test\TestCase { /** @var UserMapping|\PHPUnit_Framework_MockObject_MockObject */ protected $mapping; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); // no mocks for those as tests go against DB @@ -63,7 +63,7 @@ class DeletedUsersIndexTest extends \Test\TestCase { $this->dui = new DeletedUsersIndex($this->config, $this->db, $this->mapping); } - public function tearDown(): void { + protected function tearDown(): void { $this->config->deleteAppFromAllUsers('user_ldap'); parent::tearDown(); } diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index a8abd1e4667..896e981883f 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -86,7 +86,7 @@ class ManagerTest extends \Test\TestCase { /** @var Manager */ protected $manager; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->access = $this->createMock(Access::class); diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 992d3ce990c..5a94dd39cc6 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -76,7 +76,7 @@ class UserTest extends \Test\TestCase { /** @var User */ protected $user; - public function setUp(): void { + protected function setUp(): void { parent::setUp(); $this->connection = $this->createMock(Connection::class); @@ -1114,10 +1114,10 @@ class UserTest extends \Test\TestCase { $this->assertFalse($this->user->getHomePath()); } - /** - * @expectedException \Exception - */ + public function testGetHomePathConfiguredNotAvailableNotAllowed() { + $this->expectException(\Exception::class); + $this->connection->expects($this->any()) ->method('__get') ->with($this->equalTo('homeFolderNamingRule')) -- cgit v1.2.3