diff options
author | Tobia De Koninck <tobia@ledfan.be> | 2017-08-14 16:45:38 +0300 |
---|---|---|
committer | Tobia De Koninck <tobia@ledfan.be> | 2018-02-08 16:19:35 +0300 |
commit | 8666aa63ada9f7f06d966d366c8714b5bc6c3475 (patch) | |
tree | 6b5830a62561afdc6fc775f490b5061da1fa70b5 /tests/unit | |
parent | 1b7c93a5adcfec566013ea136c85871e58d76598 (diff) |
Fix tests
Diffstat (limited to 'tests/unit')
-rw-r--r-- | tests/unit/HooksTest.php | 10 | ||||
-rw-r--r-- | tests/unit/RosterPushTest.php | 20 | ||||
-rw-r--r-- | tests/unit/stanzahandlers/IQTest.php | 34 | ||||
-rw-r--r-- | tests/unit/stanzahandlers/MessageTest.php | 19 |
4 files changed, 61 insertions, 22 deletions
diff --git a/tests/unit/HooksTest.php b/tests/unit/HooksTest.php index d8616a8..2724d25 100644 --- a/tests/unit/HooksTest.php +++ b/tests/unit/HooksTest.php @@ -44,6 +44,11 @@ class HooksTest extends TestCase */ private $stanzaMapper; + /** + * @var PHPUnit_Framework_MockObject_MockObject | \OCP\IGroupManager + */ + private $groupManager; + public function setUp() { $this->userManager = $this->getMockBuilder('OCP\IUserManager')->setMethods(['listen', 'registerBackend', 'getBackends', 'removeBackend', 'clearBackends', 'get', 'userExists', 'checkPassword', 'search', 'searchDisplayName', 'createUser', 'createUserFromBackend', 'countUsers', 'callForAllUsers', 'countDisabledUsers', 'countSeenUsers', 'callForSeenUsers', 'getByEmail'])->getMock(); @@ -57,12 +62,15 @@ class HooksTest extends TestCase $this->stanzaMapper = $this->getMockBuilder('OCA\OJSXC\Db\StanzaMapper')->disableOriginalConstructor()->getMock(); + $this->groupManager = $this->getMockBuilder('OCP\IGroupManager')->disableOriginalConstructor()->setMethods(['listen', 'isBackendUsed', 'addBackend', 'clearBackends', 'get', 'groupExists', 'createGroup', 'search', 'getUserGroups', 'getUserGroupIds', 'displayNamesInGroup', 'isAdmin', 'isInGroup'])->getMock(); + $this->hooks = new Hooks( $this->userManager, $this->userSession, $this->rosterPush, $this->presenceMapper, - $this->stanzaMapper + $this->stanzaMapper, + $this->groupManager ); } diff --git a/tests/unit/RosterPushTest.php b/tests/unit/RosterPushTest.php index 4c45914..fafd14d 100644 --- a/tests/unit/RosterPushTest.php +++ b/tests/unit/RosterPushTest.php @@ -37,6 +37,11 @@ class RosterPushTest extends TestCase */ private $db; + /** + * @var \PHPUnit_Framework_MockObject_MockObject | IUserProvider + */ + private $userProvider; + public function setUp() { $this->userManager = $this->getMockBuilder('OCP\IUserManager') @@ -51,12 +56,15 @@ class RosterPushTest extends TestCase $this->db = $this->getMockBuilder('OCP\IDbConnection') ->disableOriginalConstructor()->getMock(); + $this->userProvider = $this->getMockBuilder('OCA\OJSXC\IUserProvider')->disableOriginalConstructor()->getMock(); + $this->rosterPush = new RosterPush( $this->userManager, $this->userSession, 'localhost', $this->iqRosterPushMapper, - $this->db + $this->db, + $this->userProvider ); } @@ -65,7 +73,7 @@ class RosterPushTest extends TestCase /** @var \PHPUnit_Framework_MockObject_MockObject | RosterPush $rosterPush */ $rosterPush = $this->getMockBuilder('OCA\OJSXC\RosterPush') - ->setConstructorArgs([$this->userManager, $this->userSession, 'host', $this->iqRosterPushMapper, $this->db]) + ->setConstructorArgs([$this->userManager, $this->userSession, 'host', $this->iqRosterPushMapper, $this->db, $this->userProvider]) ->setMethods(['createOrUpdateRosterItem', 'removeRosterItem'])->getMock(); $user1 = $this->getMockBuilder('OCP\IUser')->getMock(); @@ -140,7 +148,7 @@ class RosterPushTest extends TestCase /** @var \PHPUnit_Framework_MockObject_MockObject | RosterPush $rosterPush */ $rosterPush = $this->getMockBuilder('OCA\OJSXC\RosterPush') - ->setConstructorArgs([$this->userManager, $this->userSession, 'host', $this->iqRosterPushMapper, $this->db]) + ->setConstructorArgs([$this->userManager, $this->userSession, 'host', $this->iqRosterPushMapper, $this->db, $this->userProvider]) ->setMethods(['createOrUpdateRosterItem', 'removeRosterItem'])->getMock(); $user1 = $this->getMockBuilder('OCP\IUser')->getMock(); @@ -218,7 +226,7 @@ class RosterPushTest extends TestCase public function testCreateOrUpdateRosterItem() { $user1 = $this->getMockBuilder('OCP\IUser')->getMock(); - $user1->expects($this->exactly(5)) + $user1->expects($this->exactly(6)) ->method('getUID') ->willReturn('user1'); $user2 = $this->getMockBuilder('OCP\IUser')->getMock(); @@ -230,8 +238,8 @@ class RosterPushTest extends TestCase ->method('getUID') ->willReturn('user3'); - $this->userManager->expects($this->once()) - ->method('search') + $this->userProvider->expects($this->once()) + ->method('getAllUsersForUserByUID') ->willReturn([$user1, $user2, $user3]); $stanza1 = new IQRosterPush(); diff --git a/tests/unit/stanzahandlers/IQTest.php b/tests/unit/stanzahandlers/IQTest.php index f093177..62a7a9a 100644 --- a/tests/unit/stanzahandlers/IQTest.php +++ b/tests/unit/stanzahandlers/IQTest.php @@ -3,8 +3,11 @@ namespace OCA\OJSXC\StanzaHandlers; use OCA\OJSXC\Db\IQRoster; +use OCA\OJSXC\IUserProvider; +use OCA\OJSXC\User; use OCP\IConfig; use PHPUnit\Framework\TestCase; +use OCP\IUserManager; use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_TestCase; @@ -17,7 +20,7 @@ class IQTest extends TestCase private $iq; /** - * @var PHPUnit_Framework_MockObject_MockObject + * @var PHPUnit_Framework_MockObject_MockObject | IUserManager */ private $userManager; @@ -36,37 +39,45 @@ class IQTest extends TestCase */ private $config; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject | IUserProvider + */ + private $userProvider; + public function setUp() { $this->host = 'localhost'; $this->userId = 'john'; $this->userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock(); $this->config = $this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(); - $this->iq = new IQ($this->userId, $this->host, $this->userManager, $this->config); + $this->userProvider = $this->getMockBuilder('OCA\OJSXC\IUserProvider')->disableOriginalConstructor()->getMock(); + $this->iq = new IQ($this->userId, $this->host, $this->userManager, $this->config, $this->userProvider); } public function iqRosterProvider() { - $user1 = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock(); + $user1 = $this->getMockBuilder(User::class)->disableOriginalConstructor()->getMock(); $user1->expects($this->any()) ->method('getUID') ->will($this->returnValue('john')); $user1->expects($this->any()) - ->method('getDisplayName') + ->method('getFullName') ->will($this->returnValue('John')); - $user1->expects($this->any()) - ->method('isEnabled') - ->will($this->returnValue(true)); +// $user1->expects($this->any()) +// ->method('isEnabled') +// ->will($this->returnValue(true)); +// TOOD - $user2 = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock(); + $user2 = $this->getMockBuilder(User::class)->disableOriginalConstructor()->getMock(); $user2->expects($this->any()) ->method('getUID') ->will($this->returnValue('richard')); $user2->expects($this->any()) - ->method('getDisplayName') + ->method(getFullName) // TODO ->will($this->returnValue('Richard')); $user2->expects($this->any()) @@ -167,9 +178,8 @@ class IQTest extends TestCase ->with('debug') ->will($this->returnValue(false)); - $this->userManager->expects($searchCount) - ->method('search') - ->with('') + $this->userProvider->expects($searchCount) + ->method('getAllUsers') ->will($this->returnValue($users)); $result = $this->iq->handle($stanza); diff --git a/tests/unit/stanzahandlers/MessageTest.php b/tests/unit/stanzahandlers/MessageTest.php index 36eb31a..681d189 100644 --- a/tests/unit/stanzahandlers/MessageTest.php +++ b/tests/unit/stanzahandlers/MessageTest.php @@ -4,6 +4,8 @@ namespace OCA\OJSXC\StanzaHandlers; use OCA\OJSXC\Db\Message as MessageEntity; use PHPUnit\Framework\TestCase; +use OCA\OJSXC\Db\MessageMapper; +use OCA\OJSXC\IUserProvider; use PHPUnit_Framework_TestCase; use PHPUnit_Framework_MockObject_MockObject; @@ -16,7 +18,7 @@ class MessageTest extends TestCase private $message; /** - * @var PHPUnit_Framework_MockObject_MockObject + * @var PHPUnit_Framework_MockObject_MockObject | MessageMapper */ private $messageMapper; @@ -26,16 +28,22 @@ class MessageTest extends TestCase private $userId; /** - * @var string $host ; + * @var string $host */ private $host; + /** + * @var PHPUnit_Framework_MockObject_MockObject | IUserProvider + */ + private $userProvider; + public function setUp() { $this->host = 'localhost'; $this->userId = 'john'; $this->messageMapper = $this->getMockBuilder('OCA\OJSXC\Db\MessageMapper')->disableOriginalConstructor()->getMock(); - $this->message = new Message($this->userId, $this->host, $this->messageMapper); + $this->userProvider = $this->getMockBuilder('OCA\OJSXC\IUserProvider')->disableOriginalConstructor()->getMock(); + $this->message = new Message($this->userId, $this->host, $this->messageMapper, $this->userProvider); } public function messageProvider() @@ -88,6 +96,11 @@ class MessageTest extends TestCase ->method('insert') ->with($expected); + $this->userProvider->expects($this->once()) + ->method('hasUserByUID') + ->with('derp') + ->willReturn(true); // TODO test return false + $this->message->handle($stanza); } } |