diff options
Diffstat (limited to 'tests/unit/external/ItemAPITest.php')
| -rw-r--r-- | tests/unit/external/ItemAPITest.php | 58 |
1 files changed, 27 insertions, 31 deletions
diff --git a/tests/unit/external/ItemAPITest.php b/tests/unit/external/ItemAPITest.php index cc66d562d..f20e38b25 100644 --- a/tests/unit/external/ItemAPITest.php +++ b/tests/unit/external/ItemAPITest.php @@ -27,6 +27,7 @@ namespace OCA\News\External; use \OCA\AppFramework\Http\Request; use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\AppFramework\Utility\ControllerTestUtility; use \OCA\News\BusinessLayer\BusinessLayerException; @@ -228,9 +229,8 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->read(); - $this->assertNull($response->getData()); - $this->assertNull($response->getMessage()); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEmpty($response->getData()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -253,9 +253,9 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->read(); - $this->assertNull($response->getData()); - $this->assertEquals($this->msg, $response->getMessage()); - $this->assertEquals(NewsAPIResult::NOT_FOUND_ERROR, $response->getStatusCode()); + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); } @@ -282,9 +282,8 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->unread(); - $this->assertNull($response->getData()); - $this->assertNull($response->getMessage()); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEmpty($response->getData()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -307,9 +306,9 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->unread(); - $this->assertNull($response->getData()); - $this->assertEquals($this->msg, $response->getMessage()); - $this->assertEquals(NewsAPIResult::NOT_FOUND_ERROR, $response->getStatusCode()); + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); } @@ -338,9 +337,8 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->star(); - $this->assertNull($response->getData()); - $this->assertNull($response->getMessage()); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $data = $response->getData(); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -364,9 +362,9 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->star(); - $this->assertNull($response->getData()); - $this->assertEquals($this->msg, $response->getMessage()); - $this->assertEquals(NewsAPIResult::NOT_FOUND_ERROR, $response->getStatusCode()); + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); } @@ -395,9 +393,8 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->unstar(); - $this->assertNull($response->getData()); - $this->assertNull($response->getMessage()); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEmpty($response->getData()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -421,9 +418,9 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->unstar(); - $this->assertNull($response->getData()); - $this->assertEquals($this->msg, $response->getMessage()); - $this->assertEquals(NewsAPIResult::NOT_FOUND_ERROR, $response->getStatusCode()); + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); } @@ -450,9 +447,8 @@ class ItemAPITest extends ControllerTestUtility { $response = $this->itemAPI->readAll(); - $this->assertNull($response->getData()); - $this->assertNull($response->getMessage()); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEmpty($response->getData()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -481,7 +477,7 @@ class ItemAPITest extends ControllerTestUtility { $this->equalTo(true), $this->equalTo($this->user)); $response = $this->itemAPI->readMultiple(); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -534,7 +530,7 @@ class ItemAPITest extends ControllerTestUtility { $this->equalTo(false), $this->equalTo($this->user)); $response = $this->itemAPI->unreadMultiple(); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -573,7 +569,7 @@ class ItemAPITest extends ControllerTestUtility { $this->equalTo(true), $this->equalTo($this->user)); $response = $this->itemAPI->starMultiple(); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } @@ -647,7 +643,7 @@ class ItemAPITest extends ControllerTestUtility { $this->equalTo(false), $this->equalTo($this->user)); $response = $this->itemAPI->unstarMultiple(); - $this->assertEquals(NewsAPIResult::OK, $response->getStatusCode()); + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); } |