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

fix unit tests 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2018-07-13 10:51:22 +02:00 committed by John Molakvoæ (skjnldsv)
parent 2250dbec21
commit b81962e3e8
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
2 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/sharebymail/tests/ShareByMailProviderTest.php
View File

@ -342,15 +342,17 @@ class ShareByMailProviderTest extends TestCase {
$uidOwner = 'user2';
$permissions = 1;
$token = 'token';
$note = 'personal note';
$instance = $this->getInstance();
$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
$id = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note);
$this->share->expects($this->once())->method('getPermissions')->willReturn($permissions + 1);
$this->share->expects($this->once())->method('getShareOwner')->willReturn($uidOwner);
$this->share->expects($this->once())->method('getSharedBy')->willReturn($sharedBy);
$this->share->expects($this->any())->method('getNote')->willReturn($note);
$this->share->expects($this->atLeastOnce())->method('getId')->willReturn($id);
$this->assertSame($this->share,
@ -372,6 +374,7 @@ class ShareByMailProviderTest extends TestCase {
$this->assertSame($uidOwner, $result[0]['uid_owner']);
$this->assertSame($permissions + 1, (int)$result[0]['permissions']);
$this->assertSame($token, $result[0]['token']);
$this->assertSame($note, $result[0]['note']);
}
public function testDelete() {
@ -478,7 +481,7 @@ class ShareByMailProviderTest extends TestCase {
$instance = $this->getInstance(['createShareObject']);
$idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, \OCP\Share::SHARE_TYPE_LINK);
$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, '', \OCP\Share::SHARE_TYPE_LINK);
$this->assertTrue($idMail !== $idPublic);
@ -490,9 +493,9 @@ class ShareByMailProviderTest extends TestCase {
}
);
$this->assertInstanceOf('OCP\Share\IShare',
$instance->getShareByToken('token')
);
$result = $instance->getShareByToken('token');
$this->assertInstanceOf('OCP\Share\IShare', $result);
}
/**
@ -511,7 +514,7 @@ class ShareByMailProviderTest extends TestCase {
$instance = $this->getInstance(['createShareObject']);
$idMail = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token);
$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, "token2", \OCP\Share::SHARE_TYPE_LINK);
$idPublic = $this->createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, "token2", '', \OCP\Share::SHARE_TYPE_LINK);
$this->assertTrue($idMail !== $idPublic);
@ -631,7 +634,7 @@ class ShareByMailProviderTest extends TestCase {
$this->invokePrivate($instance, 'getRawShare', [$id+1]);
}
private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $shareType = \OCP\Share::SHARE_TYPE_EMAIL) {
private function createDummyShare($itemType, $itemSource, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $note='', $shareType = \OCP\Share::SHARE_TYPE_EMAIL) {
$qb = $this->connection->getQueryBuilder();
$qb->insert('share')
->setValue('share_type', $qb->createNamedParameter($shareType))
@ -643,6 +646,7 @@ class ShareByMailProviderTest extends TestCase {
->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
->setValue('permissions', $qb->createNamedParameter($permissions))
->setValue('token', $qb->createNamedParameter($token))
->setValue('note', $qb->createNamedParameter($note))
->setValue('stime', $qb->createNamedParameter(time()));
/*

52
tests/lib/Share20/DefaultShareProviderTest.php
View File

@ -22,15 +22,19 @@
namespace Test\Share20;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Defaults;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\IDBConnection;
use OCP\IGroup;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IGroupManager;
use OCP\Files\IRootFolder;
use OC\Share20\DefaultShareProvider;
use OCP\Mail\IMailer;
use OCP\Share\IShare;
/**
@ -56,11 +60,27 @@ class DefaultShareProviderTest extends \Test\TestCase {
/** @var DefaultShareProvider */
protected $provider;
/** @var \PHPUnit_Framework_MockObject_MockObject|IMailer */
protected $mailer;
/** @var \PHPUnit_Framework_MockObject_MockObject|IL10N */
protected $l10n;
/** @var \PHPUnit_Framework_MockObject_MockObject|Defaults */
protected $defaults;
/** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */
protected $urlGenerator;
public function setUp() {
$this->dbConn = \OC::$server->getDatabaseConnection();
$this->userManager = $this->createMock(IUserManager::class);
$this->groupManager = $this->createMock(IGroupManager::class);
$this->rootFolder = $this->createMock(IRootFolder::class);
$this->mailer = $this->createMock(IMailer::class);
$this->l10n = $this->createMock(IL10N::class);
$this->defaults = $this->getMockBuilder(Defaults::class)->disableOriginalConstructor()->getMock();
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->userManager->expects($this->any())->method('userExists')->willReturn(true);
@ -71,7 +91,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->dbConn,
$this->userManager,
$this->groupManager,
$this->rootFolder
$this->rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
);
}
@ -403,6 +427,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->userManager,
$this->groupManager,
$this->rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
])
->setMethods(['getShareById'])
->getMock();
@ -493,6 +521,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->userManager,
$this->groupManager,
$this->rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
])
->setMethods(['getShareById'])
->getMock();
@ -2368,7 +2400,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->dbConn,
$userManager,
$groupManager,
$rootFolder
$rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
);
$password = md5(time());
@ -2461,7 +2497,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->dbConn,
$userManager,
$groupManager,
$rootFolder
$rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
);
$u1 = $userManager->createUser('testShare1', 'test');
@ -2552,7 +2592,11 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->dbConn,
$userManager,
$groupManager,
$rootFolder
$rootFolder,
$this->mailer,
$this->defaults,
$this->l10n,
$this->urlGenerator
);
$u1 = $userManager->createUser('testShare1', 'test');