diff options
Diffstat (limited to 'tests/lib/Group')
| -rw-r--r-- | tests/lib/Group/GroupTest.php | 20 | ||||
| -rw-r--r-- | tests/lib/Group/ManagerTest.php | 10 |
2 files changed, 11 insertions, 19 deletions
diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php index 798b997e82a..58bb1c4133b 100644 --- a/tests/lib/Group/GroupTest.php +++ b/tests/lib/Group/GroupTest.php @@ -13,18 +13,14 @@ use OC\User\User; use OCP\EventDispatcher\IEventDispatcher; use OCP\IUser; use PHPUnit\Framework\MockObject\MockObject; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; class GroupTest extends \Test\TestCase { - /** @var EventDispatcherInterface|MockObject */ + /** @var IEventDispatcher|MockObject */ protected $dispatcher; - /** @var EventDispatcherInterface|MockObject */ - protected $eventDispatcher; protected function setUp(): void { parent::setUp(); - $this->dispatcher = $this->createMock(EventDispatcherInterface::class); - $this->eventDispatcher = $this->createMock(IEventDispatcher::class); + $this->dispatcher = $this->createMock(IEventDispatcher::class); } /** @@ -309,7 +305,7 @@ class GroupTest extends \Test\TestCase { $backend->expects($this->once()) ->method('searchInGroup') ->with('group1', '2') - ->willReturn(['user2' => new \OC\User\User('user2', null, $this->eventDispatcher)]); + ->willReturn(['user2' => new \OC\User\User('user2', null, $this->dispatcher)]); $users = $group->searchUsers('2'); @@ -331,11 +327,11 @@ class GroupTest extends \Test\TestCase { $backend1->expects($this->once()) ->method('searchInGroup') ->with('group1', '2') - ->willReturn(['user2' => new \OC\User\User('user2', null, $this->eventDispatcher)]); + ->willReturn(['user2' => new \OC\User\User('user2', null, $this->dispatcher)]); $backend2->expects($this->once()) ->method('searchInGroup') ->with('group1', '2') - ->willReturn(['user2' => new \OC\User\User('user2', null, $this->eventDispatcher)]); + ->willReturn(['user2' => new \OC\User\User('user2', null, $this->dispatcher)]); $users = $group->searchUsers('2'); @@ -354,7 +350,7 @@ class GroupTest extends \Test\TestCase { $backend->expects($this->once()) ->method('searchInGroup') ->with('group1', 'user', 1, 1) - ->willReturn(['user2' => new \OC\User\User('user2', null, $this->eventDispatcher)]); + ->willReturn(['user2' => new \OC\User\User('user2', null, $this->dispatcher)]); $users = $group->searchUsers('user', 1, 1); @@ -376,11 +372,11 @@ class GroupTest extends \Test\TestCase { $backend1->expects($this->once()) ->method('searchInGroup') ->with('group1', 'user', 2, 1) - ->willReturn(['user2' => new \OC\User\User('user2', null, $this->eventDispatcher)]); + ->willReturn(['user2' => new \OC\User\User('user2', null, $this->dispatcher)]); $backend2->expects($this->once()) ->method('searchInGroup') ->with('group1', 'user', 2, 1) - ->willReturn(['user1' => new \OC\User\User('user1', null, $this->eventDispatcher)]); + ->willReturn(['user1' => new \OC\User\User('user1', null, $this->dispatcher)]); $users = $group->searchUsers('user', 2, 1); diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 679223888bb..2887d14acaa 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -33,7 +33,6 @@ use OCP\ICacheFactory; use OCP\IUser; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Test\TestCase; interface ISearchableGroupInterface extends ISearchableGroupBackend, GroupInterface { @@ -42,10 +41,8 @@ interface ISearchableGroupInterface extends ISearchableGroupBackend, GroupInterf class ManagerTest extends TestCase { /** @var Manager|MockObject */ protected $userManager; - /** @var EventDispatcherInterface|MockObject */ - protected $dispatcher; /** @var IEventDispatcher|MockObject */ - protected $eventDispatcher; + protected $dispatcher; /** @var LoggerInterface|MockObject */ protected $logger; /** @var ICacheFactory|MockObject */ @@ -55,8 +52,7 @@ class ManagerTest extends TestCase { parent::setUp(); $this->userManager = $this->createMock(Manager::class); - $this->dispatcher = $this->createMock(EventDispatcherInterface::class); - $this->eventDispatcher = $this->createMock(IEventDispatcher::class); + $this->dispatcher = $this->createMock(IEventDispatcher::class); $this->logger = $this->createMock(LoggerInterface::class); $this->cache = $this->createMock(ICacheFactory::class); } @@ -773,7 +769,7 @@ class ManagerTest extends TestCase { $backend->expects($this->once()) ->method('searchInGroup') ->with('testgroup', '', 1, 0) - ->willReturn([new User('user2', null, $this->eventDispatcher)]); + ->willReturn([new User('user2', null, $this->dispatcher)]); $this->userManager->expects($this->never())->method('get'); |