mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust delete logic and ann unit tests 

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Thomas Müller 2016-09-22 11:24:33 +02:00 committed by Lukas Reschke
parent 18c07f0692
commit 97a47f49a1
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/dav/lib/HookManager.php
View File

@ -40,12 +40,6 @@ class HookManager {
/** @var IUser[] */ /** @var IUser[] */
private $usersToDelete; private $usersToDelete;
/** @var array */
private $calendarsToDelete;
/** @var array */
private $addressBooksToDelete;
/** @var CalDavBackend */ /** @var CalDavBackend */
private $calDav; private $calDav;
@ -91,12 +85,7 @@ class HookManager {
} }
public function preDeleteUser($params) { public function preDeleteUser($params) {
$user = $this->userManager->get($params['uid']); $this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']);
$this->usersToDelete[$params['uid']] = $user;
$this->calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $user->getUID());
$this->addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $user->getUID());
} }
public function postDeleteUser($params) { public function postDeleteUser($params) {
@ -104,17 +93,17 @@ class HookManager {
if (isset($this->usersToDelete[$uid])){ if (isset($this->usersToDelete[$uid])){
$this->syncService->deleteUser($this->usersToDelete[$uid]); $this->syncService->deleteUser($this->usersToDelete[$uid]);
} }
if (!is_null($this->calendarsToDelete)) {
foreach ($this->calendarsToDelete as $calendar) { $calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $uid);
foreach ($calendarsToDelete as $calendar) {
$this->calDav->deleteCalendar($calendar['id']); $this->calDav->deleteCalendar($calendar['id']);
} }
}
if (!is_null($this->addressBooksToDelete)) { $addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $uid);
foreach ($this->addressBooksToDelete as $addressBook) { foreach ($addressBooksToDelete as $addressBook) {
$this->cardDav->deleteAddressBook($addressBook['id']); $this->cardDav->deleteAddressBook($addressBook['id']);
} }
} }
}
public function changeUser($params) { public function changeUser($params) {
$user = $params['user']; $user = $params['user'];

72
apps/dav/tests/unit/DAV/HookManagerTest.php
View File

@ -28,29 +28,30 @@ use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\CardDAV\SyncService; use OCA\DAV\CardDAV\SyncService;
use OCA\DAV\HookManager; use OCA\DAV\HookManager;
use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
use Test\TestCase; use Test\TestCase;
class HookManagerTest extends TestCase { class HookManagerTest extends TestCase {
public function test() { public function test() {
$user = $this->getMockBuilder('\OCP\IUser') $user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$user->expects($this->once())->method('getUID')->willReturn('newUser'); $user->expects($this->once())->method('getUID')->willReturn('newUser');
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */
$userManager = $this->getMockBuilder('\OCP\IUserManager') $userManager = $this->getMockBuilder(IUserManager::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$userManager->expects($this->once())->method('get')->willReturn($user); $userManager->expects($this->once())->method('get')->willReturn($user);
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */
$syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') $syncService = $this->getMockBuilder(SyncService::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */
$cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') $cal = $this->getMockBuilder(CalDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
@ -59,7 +60,7 @@ class HookManagerTest extends TestCase {
'personal', ['{DAV:}displayname' => 'Personal']); 'personal', ['{DAV:}displayname' => 'Personal']);
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */
$card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') $card = $this->getMockBuilder(CardDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
@ -72,31 +73,31 @@ class HookManagerTest extends TestCase {
} }
public function testWithExisting() { public function testWithExisting() {
$user = $this->getMockBuilder('\OCP\IUser') $user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$user->expects($this->once())->method('getUID')->willReturn('newUser'); $user->expects($this->once())->method('getUID')->willReturn('newUser');
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */
$userManager = $this->getMockBuilder('\OCP\IUserManager') $userManager = $this->getMockBuilder(IUserManager::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$userManager->expects($this->once())->method('get')->willReturn($user); $userManager->expects($this->once())->method('get')->willReturn($user);
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */
$syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') $syncService = $this->getMockBuilder(SyncService::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */
$cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') $cal = $this->getMockBuilder(CalDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1);
$cal->expects($this->never())->method('createCalendar'); $cal->expects($this->never())->method('createCalendar');
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */
$card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') $card = $this->getMockBuilder(CardDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(1); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(1);
@ -107,24 +108,24 @@ class HookManagerTest extends TestCase {
} }
public function testWithBirthdayCalendar() { public function testWithBirthdayCalendar() {
$user = $this->getMockBuilder('\OCP\IUser') $user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$user->expects($this->once())->method('getUID')->willReturn('newUser'); $user->expects($this->once())->method('getUID')->willReturn('newUser');
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */
$userManager = $this->getMockBuilder('\OCP\IUserManager') $userManager = $this->getMockBuilder(IUserManager::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$userManager->expects($this->once())->method('get')->willReturn($user); $userManager->expects($this->once())->method('get')->willReturn($user);
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */
$syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') $syncService = $this->getMockBuilder(SyncService::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */
$cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') $cal = $this->getMockBuilder(CalDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
@ -133,7 +134,7 @@ class HookManagerTest extends TestCase {
'personal', ['{DAV:}displayname' => 'Personal']); 'personal', ['{DAV:}displayname' => 'Personal']);
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */
$card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') $card = $this->getMockBuilder(CardDavBackend::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
@ -144,4 +145,45 @@ class HookManagerTest extends TestCase {
$hm = new HookManager($userManager, $syncService, $cal, $card); $hm = new HookManager($userManager, $syncService, $cal, $card);
$hm->postLogin(['uid' => 'newUser']); $hm->postLogin(['uid' => 'newUser']);
} }
public function testDeleteCalendar() {
$user = $this->getMockBuilder(IUser::class)
->disableOriginalConstructor()
->getMock();
/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */
$userManager = $this->getMockBuilder(IUserManager::class)
->disableOriginalConstructor()
->getMock();
$userManager->expects($this->once())->method('get')->willReturn($user);
/** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */
$syncService = $this->getMockBuilder(SyncService::class)
->disableOriginalConstructor()
->getMock();
$syncService->expects($this->once())
->method('deleteUser');
/** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */
$cal = $this->getMockBuilder(CalDavBackend::class)
->disableOriginalConstructor()
->getMock();
$cal->expects($this->once())->method('getCalendarsForUser')->willReturn([
['id' => 'personal']
]);
$cal->expects($this->once())->method('deleteCalendar');
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */
$card = $this->getMockBuilder(CardDavBackend::class)
->disableOriginalConstructor()
->getMock();
$card->expects($this->once())->method('getAddressBooksForUser')->willReturn([
['id' => 'personal']
]);
$card->expects($this->once())->method('deleteAddressBook');
$hm = new HookManager($userManager, $syncService, $cal, $card, $this->l10n);
$hm->preDeleteUser(['uid' => 'newUser']);
$hm->postDeleteUser(['uid' => 'newUser']);
}
} }