diff options
Diffstat (limited to 'tests/lib/User/DatabaseTest.php')
| -rw-r--r-- | tests/lib/User/DatabaseTest.php | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index feba7a6926d..8e52be50c75 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -21,10 +21,14 @@ */ namespace Test\User; + use OC\HintException; use OC\User\User; +use OCP\EventDispatcher\Event; +use OCP\EventDispatcher\IEventDispatcher; +use OCP\Security\Events\ValidatePasswordPolicyEvent; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Component\EventDispatcher\GenericEvent; /** * Class DatabaseTest @@ -34,7 +38,7 @@ use Symfony\Component\EventDispatcher\GenericEvent; class DatabaseTest extends Backend { /** @var array */ private $users; - /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject */ + /** @var IEventDispatcher|MockObject */ private $eventDispatcher; public function getUser() { @@ -46,7 +50,7 @@ class DatabaseTest extends Backend { protected function setUp() { parent::setUp(); - $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class); + $this->eventDispatcher = $this->createMock(IEventDispatcher::class); $this->backend=new \OC\User\Database($this->eventDispatcher); } @@ -65,11 +69,12 @@ class DatabaseTest extends Backend { $user = $this->getUser(); $this->backend->createUser($user, 'pass1'); - $this->eventDispatcher->expects($this->once())->method('dispatch') + $this->eventDispatcher->expects($this->once())->method('dispatchTyped') ->willReturnCallback( - function ($eventName, GenericEvent $event) { - $this->assertSame('OCP\PasswordPolicy::validate', $eventName); - $this->assertSame('newpass', $event->getSubject()); + function (Event $event) { + $this->assertInstanceOf(ValidatePasswordPolicyEvent::class, $event); + /** @var ValidatePasswordPolicyEvent $event */ + $this->assertSame('newpass', $event->getPassword()); } ); @@ -85,11 +90,12 @@ class DatabaseTest extends Backend { $user = $this->getUser(); $this->backend->createUser($user, 'pass1'); - $this->eventDispatcher->expects($this->once())->method('dispatch') + $this->eventDispatcher->expects($this->once())->method('dispatchTyped') ->willReturnCallback( - function ($eventName, GenericEvent $event) { - $this->assertSame('OCP\PasswordPolicy::validate', $eventName); - $this->assertSame('newpass', $event->getSubject()); + function (Event $event) { + $this->assertInstanceOf(ValidatePasswordPolicyEvent::class, $event); + /** @var ValidatePasswordPolicyEvent $event */ + $this->assertSame('newpass', $event->getPassword()); throw new HintException('password change failed', 'password change failed'); } ); @@ -124,8 +130,8 @@ class DatabaseTest extends Backend { $user2 = $this->getUser(); $this->backend->createUser($user2, 'pass1'); - $user1Obj = new User($user1, $this->backend, $this->eventDispatcher); - $user2Obj = new User($user2, $this->backend, $this->eventDispatcher); + $user1Obj = new User($user1, $this->backend, $this->createMock(EventDispatcherInterface::class)); + $user2Obj = new User($user2, $this->backend, $this->createMock(EventDispatcherInterface::class)); $emailAddr1 = "$user1@nextcloud.com"; $emailAddr2 = "$user2@nextcloud.com"; |