ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Julius Haertl
2016-10-30 13:37:14 +01:00
parent 0db8b5646a
commit 9becbe43e1
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/NoPermissionException.php
View File

@@ -24,7 +24,7 @@
namespace OCA\Deck; namespace OCA\Deck;
class NoPermissionException extends \Exception { class NoPermissionException extends StatusException {
public function __construct($message, $controller=null, $method=null) { public function __construct($message, $controller=null, $method=null) {
parent::__construct($message); parent::__construct($message);

18
tests/unit/Middleware/SharingMiddlewareTest.php
View File

@@ -29,6 +29,7 @@ use OC\AppFramework\Utility\SimpleContainer;
use OCA\Deck\NoPermissionException; use OCA\Deck\NoPermissionException;
use OCA\Deck\NotFoundException; use OCA\Deck\NotFoundException;
use OCA\Deck\Service\BoardService; use OCA\Deck\Service\BoardService;
use OCA\Deck\Service\PermissionService;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\IContainer; use OCP\IContainer;
@@ -44,9 +45,7 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
private $request; private $request;
private $userSession; private $userSession;
private $reflector; private $reflector;
private $groupManager; private $permissionService;
private $aclMapper;
private $boardService;
public function setUp() { public function setUp() {
$this->container = new SimpleContainer(); $this->container = new SimpleContainer();
@@ -56,20 +55,14 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$this->reflector = $this->getMockBuilder(ControllerMethodReflector::class) $this->reflector = $this->getMockBuilder(ControllerMethodReflector::class)
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$this->groupManager = $this->getMockBuilder(IGroupManager::class) $this->permissionService = $this->getMockBuilder(PermissionService::class)
->disableOriginalConstructor()->getMock();
$this->aclMapper = $this->getMockBuilder(AclMapper::class)
->disableOriginalConstructor()->getMock();
$this->boardService = $this->getMockBuilder(BoardService::class)
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$this->sharingMiddleware = new SharingMiddleware( $this->sharingMiddleware = new SharingMiddleware(
$this->container, $this->container,
$this->request, $this->request,
$this->userSession, $this->userSession,
$this->reflector, $this->reflector,
$this->groupManager, $this->permissionService
$this->aclMapper,
$this->boardService
); );
} }
@@ -82,7 +75,7 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
public function dataAfterException() { public function dataAfterException() {
return [ return [
[new NoPermissionException('No permission'), 401, 'No permission'], [new NoPermissionException('No permission'), 403, 'No permission'],
[new NotFoundException('Not found'), 404, 'Not found'] [new NotFoundException('Not found'), 404, 'Not found']
]; ];
} }
@@ -96,7 +89,6 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
"message" => $message "message" => $message
], $status); ], $status);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
} }

6
tests/unit/controller/BoardControllerTest.php
View File

@@ -32,6 +32,7 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
private $userManager; private $userManager;
private $groupManager; private $groupManager;
private $boardService; private $boardService;
private $permissionService;
private $userId = 'user'; private $userId = 'user';
public function setUp() { public function setUp() {
@@ -55,6 +56,10 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
'\OCA\Deck\Service\BoardService') '\OCA\Deck\Service\BoardService')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$this->permissionService = $this->getMockBuilder(
'\OCA\Deck\Service\PermissionService')
->disableOriginalConstructor()
->getMock();
$this->groupManager->method('getUserGroupIds') $this->groupManager->method('getUserGroupIds')
->willReturn(['admin', 'group1', 'group2']); ->willReturn(['admin', 'group1', 'group2']);
@@ -68,6 +73,7 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
$this->userManager, $this->userManager,
$this->groupManager, $this->groupManager,
$this->boardService, $this->boardService,
$this->permissionService,
$this->userId $this->userId
); );
} }