diff options
| author | Tobia De Koninck <tobia@ledfan.be> | 2017-10-01 17:06:48 +0300 |
|---|---|---|
| committer | Tobia De Koninck <tobia@ledfan.be> | 2018-02-10 12:35:42 +0300 |
| commit | 7b6c08b83b89d68d8fa3b2f45cb837a7161cd2d6 (patch) | |
| tree | a3cbf4ea0211981302b571122cbd6932ea0c71dd /tests/integration | |
| parent | 16bf40c5c0fa8fae553c16664c1d67202b7db315 (diff) | |
Fix setupContactsStoreAPI
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/db/PresenceMapperTest.php | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/integration/db/PresenceMapperTest.php b/tests/integration/db/PresenceMapperTest.php index 955bd34..5ecf4fb 100644 --- a/tests/integration/db/PresenceMapperTest.php +++ b/tests/integration/db/PresenceMapperTest.php @@ -57,20 +57,20 @@ class PresenceMapperTest extends MapperTestUtility public function setupContactsStoreAPI() { - if (Application::contactsStoreApiSupporetd()) { + foreach (\OC::$server->getUserManager()->search('') as $user) { + $user->delete(); + } - foreach (\OC::$server->getUserManager()->search('') as $user) { - $user->delete(); - } + $users[] = \OC::$server->getUserManager()->createUser('admin', 'admin'); + $users[] = \OC::$server->getUserManager()->createUser('derp', 'derp'); + $users[] = \OC::$server->getUserManager()->createUser('derpina', 'derpina'); + $users[] = \OC::$server->getUserManager()->createUser('herp', 'herp'); + $users[] = \OC::$server->getUserManager()->createUser('foo', 'foo'); - $users[] = \OC::$server->getUserManager()->createUser('admin', 'admin'); - $users[] = \OC::$server->getUserManager()->createUser('derp', 'derp'); - $users[] = \OC::$server->getUserManager()->createUser('derpina', 'derpina'); - $users[] = \OC::$server->getUserManager()->createUser('herp', 'herp'); - $users[] = \OC::$server->getUserManager()->createUser('foo', 'foo'); + $currentUser = \OC::$server->getUserManager()->createUser('autotest', 'autotest'); + \OC::$server->getUserSession()->setUser($currentUser); - $currentUser = \OC::$server->getUserManager()->createUser('autotest', 'autotest'); - \OC::$server->getUserSession()->setUser($currentUser); + if (Application::contactsStoreApiSupporetd()) { /** @var \OCA\DAV\CardDAV\SyncService $syncService */ $syncService = \OC::$server->query('CardDAVSyncService'); $syncService->getLocalSystemAddressBook(); @@ -83,11 +83,9 @@ class PresenceMapperTest extends MapperTestUtility $cm = \OC::$server->getContactsManager(); $davApp = new DavApp(); $davApp->setupSystemContactsProvider($cm); - - \OC_User::setIncognitoMode(false); - - \OC::$server->getDatabaseConnection()->executeQuery("DELETE FROM *PREFIX*ojsxc_stanzas"); } + \OC_User::setIncognitoMode(false); + \OC::$server->getDatabaseConnection()->executeQuery("DELETE FROM *PREFIX*ojsxc_stanzas"); } /** @@ -432,6 +430,7 @@ class PresenceMapperTest extends MapperTestUtility */ public function testUpdatePresence($inputs, $expInput, $expConnectedUsers, $expNewContent, $expNewContentCount, $expStanzasToSend) { + $this->setupContactsStoreAPI(); global $time; $time = 1000; foreach ($inputs as $input) { |