diff options
author | Paul Tirk <paultirk@paultirk.com> | 2021-02-08 17:31:19 +0100 |
---|---|---|
committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-08 10:23:11 +0200 |
commit | 05b7ed79945a35f752be9152c60792d67db4be6c (patch) | |
tree | 651820adae955a49edc9e6c1ec105354f10c7ea1 /tests/Unit/Controller | |
parent | 80351429730e368a82eab450769c93ab5dd83c0d (diff) |
remove unused service exceptions & allow equally named folders
Signed-off-by: Paul Tirk <paultirk@paultirk.com>
Diffstat (limited to 'tests/Unit/Controller')
-rw-r--r-- | tests/Unit/Controller/FolderApiV2ControllerTest.php | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/tests/Unit/Controller/FolderApiV2ControllerTest.php b/tests/Unit/Controller/FolderApiV2ControllerTest.php index 4ed79aa5b..639e29833 100644 --- a/tests/Unit/Controller/FolderApiV2ControllerTest.php +++ b/tests/Unit/Controller/FolderApiV2ControllerTest.php @@ -17,8 +17,6 @@ use OCA\News\Service\ItemServiceV2; use \OCP\AppFramework\Http; use \OCA\News\Service\Exceptions\ServiceNotFoundException; -use \OCA\News\Service\Exceptions\ServiceConflictException; -use \OCA\News\Service\Exceptions\ServiceValidationException; use \OCA\News\Db\Folder; use OCP\IRequest; @@ -96,21 +94,6 @@ class FolderApiV2ControllerTest extends TestCase } - public function testCreateAlreadyExists() - { - $this->folderService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user->getUID()), $this->equalTo(false)); - $this->folderService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceConflictException('exists'))); - - $response = $this->folderAPI->create('hi'); - - $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); - } - - public function testCreateInvalidFolderName() { $msg = 'exists'; @@ -118,9 +101,6 @@ class FolderApiV2ControllerTest extends TestCase $this->folderService->expects($this->once()) ->method('purgeDeleted') ->with($this->equalTo($this->user->getUID()), $this->equalTo(false)); - $this->folderService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceValidationException($msg))); $response = $this->folderAPI->create('hi'); @@ -209,42 +189,15 @@ class FolderApiV2ControllerTest extends TestCase } - public function testUpdateExists() - { - $folderId = 23; - $folderName = 'test'; - - $this->folderService->expects($this->once()) - ->method('rename') - ->will( - $this->throwException( - new ServiceConflictException($this->msg) - ) - ); - - $response = $this->folderAPI->update($folderId, $folderName); - - $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); - } - - public function testUpdateInvalidFolderName() { $folderId = 23; $folderName = ''; - $this->folderService->expects($this->once()) - ->method('rename') - ->will( - $this->throwException( - new ServiceValidationException($this->msg) - ) - ); - $response = $this->folderAPI->update($folderId, $folderName); $data = $response->getData(); $this->assertEquals($this->msg, $data['error']['message']); - $this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus()); + $this->assertEquals(Http::STATUS_BAD_REQUEST, $response->getStatus()); } } |