Fix tests
This commit is contained in:
parent
fb52b1af67
commit
56d37e27bc
|
@ -24,6 +24,8 @@
|
||||||
namespace OCA\Files_Sharing\Tests\API;
|
namespace OCA\Files_Sharing\Tests\API;
|
||||||
|
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
use OCP\AppFramework\OCS\OCSNotFoundException;
|
||||||
|
use OCP\Files\Folder;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCA\Files_Sharing\API\Share20OCS;
|
use OCA\Files_Sharing\API\Share20OCS;
|
||||||
use OCP\Files\NotFoundException;
|
use OCP\Files\NotFoundException;
|
||||||
|
@ -108,8 +110,11 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Share20OCS|\PHPUnit_Framework_MockObject_MockObject
|
||||||
|
*/
|
||||||
private function mockFormatShare() {
|
private function mockFormatShare() {
|
||||||
return $this->getMockBuilder('OCA\Files_Sharing\API\Share20OCS')
|
return $this->getMockBuilder(Share20OCS::class)
|
||||||
->setConstructorArgs([
|
->setConstructorArgs([
|
||||||
$this->appName,
|
$this->appName,
|
||||||
$this->request,
|
$this->request,
|
||||||
|
@ -1572,9 +1577,7 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
public function testUpdateShareCannotIncreasePermissions() {
|
public function testUpdateShareCannotIncreasePermissions() {
|
||||||
$ocs = $this->mockFormatShare();
|
$ocs = $this->mockFormatShare();
|
||||||
|
|
||||||
$date = new \DateTime('2000-01-01');
|
$folder = $this->createMock(Folder::class);
|
||||||
|
|
||||||
$folder = $this->getMock('\OCP\Files\Folder');
|
|
||||||
|
|
||||||
$share = \OC::$server->getShareManager()->newShare();
|
$share = \OC::$server->getShareManager()->newShare();
|
||||||
$share
|
$share
|
||||||
|
@ -1615,19 +1618,18 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
|
|
||||||
$this->shareManager->expects($this->never())->method('updateShare');
|
$this->shareManager->expects($this->never())->method('updateShare');
|
||||||
|
|
||||||
$expected = new \OC_OCS_Result(null, 404, 'Cannot increase permissions');
|
try {
|
||||||
$result = $ocs->updateShare(42);
|
$ocs->updateShare(42, 31);
|
||||||
|
$this->fail();
|
||||||
$this->assertEquals($expected->getMeta(), $result->getMeta());
|
} catch (OCSNotFoundException $e) {
|
||||||
$this->assertEquals($expected->getData(), $result->getData());
|
$this->assertEquals('Cannot increase permissions', $e->getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testUpdateShareCanIncreasePermissionsIfOwner() {
|
public function testUpdateShareCanIncreasePermissionsIfOwner() {
|
||||||
$ocs = $this->mockFormatShare();
|
$ocs = $this->mockFormatShare();
|
||||||
|
|
||||||
$date = new \DateTime('2000-01-01');
|
$folder = $this->createMock(Folder::class);
|
||||||
|
|
||||||
$folder = $this->getMock('\OCP\Files\Folder');
|
|
||||||
|
|
||||||
$share = \OC::$server->getShareManager()->newShare();
|
$share = \OC::$server->getShareManager()->newShare();
|
||||||
$share
|
$share
|
||||||
|
@ -1651,12 +1653,6 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ)
|
->setPermissions(\OCP\Constants::PERMISSION_READ)
|
||||||
->setNode($folder);
|
->setNode($folder);
|
||||||
|
|
||||||
$this->request
|
|
||||||
->method('getParam')
|
|
||||||
->will($this->returnValueMap([
|
|
||||||
['permissions', null, '31'],
|
|
||||||
]));
|
|
||||||
|
|
||||||
$this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share);
|
$this->shareManager->method('getShareById')->with('ocinternal:42')->willReturn($share);
|
||||||
|
|
||||||
$this->shareManager->expects($this->any(0))
|
$this->shareManager->expects($this->any(0))
|
||||||
|
@ -1671,12 +1667,10 @@ class Share20OCSTest extends \Test\TestCase {
|
||||||
->with($share)
|
->with($share)
|
||||||
->willReturn($share);
|
->willReturn($share);
|
||||||
|
|
||||||
$expected = new \OC_OCS_Result();
|
$result = $ocs->updateShare(42, 31);
|
||||||
$result = $ocs->updateShare(42);
|
$this->assertInstanceOf(DataResponse::class, $result);
|
||||||
|
|
||||||
$this->assertEquals($expected->getMeta(), $result->getMeta());
|
|
||||||
$this->assertEquals($expected->getData(), $result->getData());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dataFormatShare() {
|
public function dataFormatShare() {
|
||||||
$file = $this->getMockBuilder('\OCP\Files\File')->getMock();
|
$file = $this->getMockBuilder('\OCP\Files\File')->getMock();
|
||||||
$folder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
|
$folder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
|
||||||
|
|
Loading…
Reference in New Issue