From 9becbe43e1a8da0ef1eff51176b88928ac56232d Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Sun, 30 Oct 2016 13:37:14 +0100
Subject: [PATCH] Fix tests

---
 lib/NoPermissionException.php                  |  2 +-
 .../unit/Middleware/SharingMiddlewareTest.php  | 18 +++++-------------
 tests/unit/controller/BoardControllerTest.php  |  6 ++++++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/NoPermissionException.php b/lib/NoPermissionException.php
index 4dd7d23f8..bc7abdc36 100644
--- a/lib/NoPermissionException.php
+++ b/lib/NoPermissionException.php
@@ -24,7 +24,7 @@
 namespace OCA\Deck;
 
 
-class NoPermissionException extends \Exception {
+class NoPermissionException extends StatusException {
 
 	public function __construct($message, $controller=null, $method=null) {
 		parent::__construct($message);
diff --git a/tests/unit/Middleware/SharingMiddlewareTest.php b/tests/unit/Middleware/SharingMiddlewareTest.php
index 38b0e88d0..fa6d934c5 100644
--- a/tests/unit/Middleware/SharingMiddlewareTest.php
+++ b/tests/unit/Middleware/SharingMiddlewareTest.php
@@ -29,6 +29,7 @@ use OC\AppFramework\Utility\SimpleContainer;
 use OCA\Deck\NoPermissionException;
 use OCA\Deck\NotFoundException;
 use OCA\Deck\Service\BoardService;
+use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IContainer;
@@ -44,9 +45,7 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $request;
 	private $userSession;
 	private $reflector;
-	private $groupManager;
-	private $aclMapper;
-	private $boardService;
+	private $permissionService;
 
 	public function setUp() {
 		$this->container = new SimpleContainer();
@@ -56,20 +55,14 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->reflector = $this->getMockBuilder(ControllerMethodReflector::class)
 			->disableOriginalConstructor()->getMock();
-		$this->groupManager = $this->getMockBuilder(IGroupManager::class)
-			->disableOriginalConstructor()->getMock();
-		$this->aclMapper = $this->getMockBuilder(AclMapper::class)
-			->disableOriginalConstructor()->getMock();
-		$this->boardService = $this->getMockBuilder(BoardService::class)
+		$this->permissionService = $this->getMockBuilder(PermissionService::class)
 			->disableOriginalConstructor()->getMock();
 		$this->sharingMiddleware = new SharingMiddleware(
 			$this->container,
 			$this->request,
 			$this->userSession,
 			$this->reflector,
-			$this->groupManager,
-			$this->aclMapper,
-			$this->boardService
+			$this->permissionService
 		);
 	}
 
@@ -82,7 +75,7 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
 
 	public function dataAfterException() {
 		return [
-			[new NoPermissionException('No permission'), 401, 'No permission'],
+			[new NoPermissionException('No permission'), 403, 'No permission'],
 			[new NotFoundException('Not found'), 404, 'Not found']
 		];
 	}
@@ -96,7 +89,6 @@ class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			"message" => $message
 		], $status);
 		$this->assertEquals($expected, $result);
-
 	}
 
 }
\ No newline at end of file
diff --git a/tests/unit/controller/BoardControllerTest.php b/tests/unit/controller/BoardControllerTest.php
index dd863c3b3..e0feabd21 100644
--- a/tests/unit/controller/BoardControllerTest.php
+++ b/tests/unit/controller/BoardControllerTest.php
@@ -32,6 +32,7 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
 	private $userManager;
 	private $groupManager;
 	private $boardService;
+	private $permissionService;
 	private $userId = 'user';
 
 	public function setUp() {
@@ -55,6 +56,10 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
 			'\OCA\Deck\Service\BoardService')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->permissionService = $this->getMockBuilder(
+			'\OCA\Deck\Service\PermissionService')
+			->disableOriginalConstructor()
+			->getMock();
 
 		$this->groupManager->method('getUserGroupIds')
 			->willReturn(['admin', 'group1', 'group2']);
@@ -68,6 +73,7 @@ class BoardControllerTest extends \PHPUnit_Framework_TestCase {
 			$this->userManager,
 			$this->groupManager,
 			$this->boardService,
+			$this->permissionService,
 			$this->userId
 		);
 	}