diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-14 17:32:49 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-14 17:32:49 +0200 |
commit | 160a0dfebaeb21cc75d7166dfbac6d0ef1a51460 (patch) | |
tree | 28e2555c97462d60356ef933d5c71c5326649747 /tests/unit/controller | |
parent | acc2df1251a1c1b9ec5ede13bdf46d516dc64b0d (diff) |
convert array() to []
Diffstat (limited to 'tests/unit/controller')
-rw-r--r-- | tests/unit/controller/EntityApiSerializerTest.php | 14 | ||||
-rw-r--r-- | tests/unit/controller/ExportControllerTest.php | 10 | ||||
-rw-r--r-- | tests/unit/controller/FeedApiControllerTest.php | 36 | ||||
-rw-r--r-- | tests/unit/controller/FeedControllerTest.php | 101 | ||||
-rw-r--r-- | tests/unit/controller/FolderApiControllerTest.php | 8 | ||||
-rw-r--r-- | tests/unit/controller/FolderControllerTest.php | 23 | ||||
-rw-r--r-- | tests/unit/controller/ItemApiControllerTest.php | 54 | ||||
-rw-r--r-- | tests/unit/controller/ItemControllerTest.php | 30 | ||||
-rw-r--r-- | tests/unit/controller/JSONHttpErrorTest.php | 2 | ||||
-rw-r--r-- | tests/unit/controller/PageControllerTest.php | 4 |
10 files changed, 120 insertions, 162 deletions
diff --git a/tests/unit/controller/EntityApiSerializerTest.php b/tests/unit/controller/EntityApiSerializerTest.php index 5541cc3be..68675824b 100644 --- a/tests/unit/controller/EntityApiSerializerTest.php +++ b/tests/unit/controller/EntityApiSerializerTest.php @@ -44,7 +44,7 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { $serializer = new EntityApiSerializer('items'); - $result = $serializer->serialize(array($item, $item2)); + $result = $serializer->serialize([$item, $item2]); $this->assertTrue($result['items'][0]['unread']); $this->assertFalse($result['items'][1]['unread']); @@ -70,10 +70,10 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { $serializer = new EntityApiSerializer('items'); - $in = array( - 'items' => array($item, $item2), + $in = [ + 'items' => [$item, $item2], 'test' => 1 - ); + ]; $result = $serializer->serialize($in); @@ -86,10 +86,10 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { public function noEntityNoChange() { $serializer = new EntityApiSerializer('items'); - $in = array( - 'items' => array('hi', '2'), + $in = [ + 'items' => ['hi', '2'], 'test' => 1 - ); + ]; $result = $serializer->serialize($in); diff --git a/tests/unit/controller/ExportControllerTest.php b/tests/unit/controller/ExportControllerTest.php index f41977241..fd3aece97 100644 --- a/tests/unit/controller/ExportControllerTest.php +++ b/tests/unit/controller/ExportControllerTest.php @@ -72,11 +72,11 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase { $this->feedBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) - ->will($this->returnValue(array())); + ->will($this->returnValue([])); $this->folderBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) - ->will($this->returnValue(array())); + ->will($this->returnValue([])); $return = $this->controller->opml(); $this->assertTrue($return instanceof TextDownloadResponse); @@ -96,11 +96,9 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase { $feed2 = new Feed(); $feed2->setId(5); $feed2->setLink('http://gee'); - $feeds = array($feed1, $feed2); + $feeds = [$feed1, $feed2]; - $articles = array( - $item1, $item2 - ); + $articles = [$item1, $item2]; $this->feedBusinessLayer->expects($this->once()) ->method('findAll') diff --git a/tests/unit/controller/FeedApiControllerTest.php b/tests/unit/controller/FeedApiControllerTest.php index 79c21af28..6e18d89da 100644 --- a/tests/unit/controller/FeedApiControllerTest.php +++ b/tests/unit/controller/FeedApiControllerTest.php @@ -39,7 +39,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { protected function setUp() { $this->user = 'tom'; - $this->loggerParams = array('hi'); + $this->loggerParams = ['hi']; $this->logger = $this->getMockBuilder( '\OCP\ILogger') ->disableOriginalConstructor() @@ -76,9 +76,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { public function testIndex() { - $feeds = array( - new Feed() - ); + $feeds = [new Feed()]; $starredCount = 3; $newestItemId = 2; @@ -97,18 +95,16 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { $response = $this->feedAPI->index(); - $this->assertEquals(array( + $this->assertEquals([ 'feeds' => $feeds, 'starredCount' => $starredCount, 'newestItemId' => $newestItemId - ), $response); + ], $response); } public function testIndexNoNewestItemId() { - $feeds = array( - new Feed() - ); + $feeds = [new Feed()]; $starredCount = 3; $this->itemBusinessLayer->expects($this->once()) @@ -126,10 +122,10 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { $response = $this->feedAPI->index(); - $this->assertEquals(array( + $this->assertEquals([ 'feeds' => $feeds, 'starredCount' => $starredCount, - ), $response); + ], $response); } @@ -158,9 +154,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { public function testCreate() { - $feeds = array( - new Feed() - ); + $feeds = [new Feed()]; $this->feedBusinessLayer->expects($this->once()) ->method('purgeDeleted') @@ -178,17 +172,15 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { $response = $this->feedAPI->create('url', 3); - $this->assertEquals(array( + $this->assertEquals([ 'feeds' => $feeds, 'newestItemId' => 3 - ), $response); + ], $response); } public function testCreateNoItems() { - $feeds = array( - new Feed() - ); + $feeds = [new Feed()]; $this->feedBusinessLayer->expects($this->once()) ->method('purgeDeleted') @@ -206,9 +198,9 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { $response = $this->feedAPI->create('ho', 3); - $this->assertEquals(array( + $this->assertEquals([ 'feeds' => $feeds - ), $response); + ], $response); } @@ -299,7 +291,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { $feed->setUrl(3); $feed->setId(1); $feed->setUserId('john'); - $feeds = array($feed); + $feeds = [$feed]; $this->feedBusinessLayer->expects($this->once()) ->method('findAllFromAllUsers') ->will($this->returnValue($feeds)); diff --git a/tests/unit/controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php index ba9d86a8a..b59175468 100644 --- a/tests/unit/controller/FeedControllerTest.php +++ b/tests/unit/controller/FeedControllerTest.php @@ -32,6 +32,7 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { private $folderBusinessLayer; private $itemBusinessLayer; private $settings; + private $exampleResult; /** @@ -63,16 +64,22 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { $this->itemBusinessLayer, $this->settings, $this->user); + $this->exampleResult = [ + 'activeFeed' => [ + 'id' => 0, + 'type' => FeedType::SUBSCRIPTIONS + ] + ]; } public function testIndex(){ - $result = array( - 'feeds' => array( - array('a feed'), - ), + $result = [ + 'feeds' => [ + ['a feed'], + ], 'starred' => 13 - ); + ]; $this->feedBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) @@ -93,13 +100,13 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testIndexHighestItemIdExists(){ - $result = array( - 'feeds' => array( - array('a feed'), - ), + $result = [ + 'feeds' => [ + ['a feed'], + ], 'starred' => 13, 'newestItemId' => 5 - ); + ]; $this->feedBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) @@ -139,12 +146,12 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testActive(){ $id = 3; $type = FeedType::STARRED; - $result = array( - 'activeFeed' => array( + $result = [ + 'activeFeed' => [ 'id' => $id, 'type' => $type - ) - ); + ] + ]; $this->activeInitMocks($id, $type); @@ -158,12 +165,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { $id = 3; $type = FeedType::FEED; $ex = new BusinessLayerException('hiu'); - $result = array( - 'activeFeed' => array( - 'id' => 0, - 'type' => FeedType::SUBSCRIPTIONS - ) - ); + $result = $this->exampleResult; + $this->feedBusinessLayer->expects($this->once()) ->method('find') ->with($this->equalTo($id), $this->equalTo($this->user)) @@ -181,12 +184,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { $id = 3; $type = FeedType::FOLDER; $ex = new BusinessLayerException('hiu'); - $result = array( - 'activeFeed' => array( - 'id' => 0, - 'type' => FeedType::SUBSCRIPTIONS - ) - ); + $result = $this->exampleResult; + $this->folderBusinessLayer->expects($this->once()) ->method('find') ->with($this->equalTo($id), $this->equalTo($this->user)) @@ -203,12 +202,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testActiveActiveIsNull(){ $id = 3; $type = null; - $result = array( - 'activeFeed' => array( - 'id' => 0, - 'type' => FeedType::SUBSCRIPTIONS - ) - ); + $result = $this->exampleResult; + $this->activeInitMocks($id, $type); @@ -219,10 +214,10 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testCreate(){ - $result = array( - 'feeds' => array(new Feed()), + $result = [ + 'feeds' => [new Feed()], 'newestItemId' => 3 - ); + ]; $this->itemBusinessLayer->expects($this->once()) ->method('getNewestItemId') @@ -244,9 +239,7 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testCreateNoItems(){ - $result = array( - 'feeds' => array(new Feed()) - ); + $result = ['feeds' => [new Feed()]]; $this->feedBusinessLayer->expects($this->once()) ->method('purgeDeleted') @@ -333,14 +326,14 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { $feed = new Feed(); $feed->setId(3); $feed->setUnreadCount(44); - $result = array( - 'feeds' => array( - array( + $result = [ + 'feeds' => [ + [ 'id' => $feed->getId(), 'unreadCount' => $feed->getUnreadCount() - ) - ) - ); + ] + ] + ]; $this->feedBusinessLayer->expects($this->once()) ->method('update') @@ -427,9 +420,9 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { public function testImport() { $feed = new Feed(); - $expected = array( - 'feeds' => array($feed) - ); + $expected = [ + 'feeds' => [$feed] + ]; $this->feedBusinessLayer->expects($this->once()) ->method('importArticles') @@ -452,19 +445,19 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase { $response = $this->controller->import('json'); - $this->assertEquals(array(), $response); + $this->assertEquals([], $response); } public function testReadFeed(){ - $expected = array( - 'feeds' => array( - array( + $expected = [ + 'feeds' => [ + [ 'id' => 4, 'unreadCount' => 0 - ) - ) - ); + ] + ] + ]; $this->itemBusinessLayer->expects($this->once()) ->method('readFeed') diff --git a/tests/unit/controller/FolderApiControllerTest.php b/tests/unit/controller/FolderApiControllerTest.php index cf23984ce..d3171e397 100644 --- a/tests/unit/controller/FolderApiControllerTest.php +++ b/tests/unit/controller/FolderApiControllerTest.php @@ -64,9 +64,7 @@ class FolderApiControllerTest extends \PHPUnit_Framework_TestCase { public function testIndex() { - $folders = array( - new Folder() - ); + $folders = [new Folder()]; $this->folderBusinessLayer->expects($this->once()) ->method('findAll') @@ -83,9 +81,7 @@ class FolderApiControllerTest extends \PHPUnit_Framework_TestCase { $folderName = 'test'; $folder = new Folder(); $folder->setName($folderName); - $folders = array( - $folder - ); + $folders = [$folder]; $this->folderBusinessLayer->expects($this->once()) ->method('purgeDeleted') diff --git a/tests/unit/controller/FolderControllerTest.php b/tests/unit/controller/FolderControllerTest.php index 332b48bbe..af63aa959 100644 --- a/tests/unit/controller/FolderControllerTest.php +++ b/tests/unit/controller/FolderControllerTest.php @@ -65,18 +65,13 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase { public function testIndex(){ - $return = array( - new Folder(), - new Folder(), - ); + $return = [new Folder(), new Folder()]; $this->folderBusinessLayer->expects($this->once()) ->method('findAll') ->will($this->returnValue($return)); $response = $this->controller->index(); - $expected = array( - 'folders' => $return - ); + $expected = ['folders' => $return]; $this->assertEquals($expected, $response); } @@ -132,9 +127,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase { public function testCreate(){ - $result = array( - 'folders' => array(new Folder()) - ); + $result = ['folders' => [new Folder()]]; $this->folderBusinessLayer->expects($this->once()) ->method('purgeDeleted') @@ -212,9 +205,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase { public function testRename(){ - $result = array( - 'folders' => array(new Folder()) - ); + $result = ['folders' => [new Folder()]]; $this->folderBusinessLayer->expects($this->once()) ->method('rename') @@ -277,9 +268,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase { public function testRead(){ $feed = new Feed(); - $expected = array( - 'feeds' => array($feed) - ); + $expected = ['feeds' => [$feed]]; $this->itemBusinessLayer->expects($this->once()) ->method('readFolder') @@ -289,7 +278,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase { $this->feedBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) - ->will($this->returnValue(array($feed))); + ->will($this->returnValue([$feed])); $response = $this->controller->read(4, 5); $this->assertEquals($expected, $response); diff --git a/tests/unit/controller/ItemApiControllerTest.php b/tests/unit/controller/ItemApiControllerTest.php index 848e00ec3..f78db838b 100644 --- a/tests/unit/controller/ItemApiControllerTest.php +++ b/tests/unit/controller/ItemApiControllerTest.php @@ -52,9 +52,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { public function testIndex() { - $items = array( - new Item() - ); + $items = [new Item()]; $this->itemBusinessLayer->expects($this->once()) ->method('findAll') @@ -75,9 +73,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { public function testIndexDefaultBatchSize() { - $items = array( - new Item() - ); + $items = [new Item()]; $this->itemBusinessLayer->expects($this->once()) ->method('findAll') @@ -98,9 +94,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { public function testUpdated() { - $items = array( - new Item() - ); + $items = [new Item()]; $this->itemBusinessLayer->expects($this->once()) ->method('findAllNew') @@ -248,7 +242,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { ->with($this->equalTo(4), $this->equalTo(true), $this->equalTo($this->user)); - $this->itemAPI->readMultiple(array(2, 4)); + $this->itemAPI->readMultiple([2, 4]); } @@ -261,7 +255,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { ->with($this->equalTo(4), $this->equalTo(true), $this->equalTo($this->user)); - $this->itemAPI->readMultiple(array(2, 4)); + $this->itemAPI->readMultiple([2, 4]); } @@ -276,21 +270,21 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { ->with($this->equalTo(4), $this->equalTo(false), $this->equalTo($this->user)); - $this->itemAPI->unreadMultiple(array(2, 4)); + $this->itemAPI->unreadMultiple([2, 4]); } public function testStarMultiple() { - $ids = array( - array( + $ids = [ + [ 'feedId' => 2, 'guidHash' => 'a' - ), - array( + ], + [ 'feedId' => 4, 'guidHash' => 'b' - ) - ); + ] + ]; $this->itemBusinessLayer->expects($this->at(0)) ->method('star') @@ -309,16 +303,16 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { public function testStarMultipleDoesntCareAboutException() { - $ids = array( - array( + $ids = [ + [ 'feedId' => 2, 'guidHash' => 'a' - ), - array( + ], + [ 'feedId' => 4, 'guidHash' => 'b' - ) - ); + ] + ]; $this->itemBusinessLayer->expects($this->at(0)) ->method('star') @@ -334,16 +328,16 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase { public function testUnstarMultiple() { - $ids = array( - array( + $ids = [ + [ 'feedId' => 2, 'guidHash' => 'a' - ), - array( + ], + [ 'feedId' => 4, 'guidHash' => 'b' - ) - ); + ] + ]; $this->itemBusinessLayer->expects($this->at(0)) ->method('star') diff --git a/tests/unit/controller/ItemControllerTest.php b/tests/unit/controller/ItemControllerTest.php index 7017d52e4..b4f87a0e9 100644 --- a/tests/unit/controller/ItemControllerTest.php +++ b/tests/unit/controller/ItemControllerTest.php @@ -172,9 +172,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { public function testReadAll(){ $feed = new Feed(); - $expected = array( - 'feeds' => array($feed) - ); + $expected = ['feeds' => [$feed]]; $this->itemBusinessLayer->expects($this->once()) ->method('readAll') @@ -183,7 +181,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { $this->feedBusinessLayer->expects($this->once()) ->method('findAll') ->with($this->equalTo($this->user)) - ->will($this->returnValue(array($feed))); + ->will($this->returnValue([$feed])); $response = $this->controller->readAll(5); $this->assertEquals($expected, $response); @@ -213,13 +211,13 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { public function testIndex(){ - $feeds = array(new Feed()); - $result = array( - 'items' => array(new Item()), + $feeds = [new Feed()]; + $result = [ + 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, 'starred' => 3111 - ); + ]; $this->itemsApiExpects(2, FeedType::FEED); @@ -255,9 +253,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { public function testItemsOffsetNotZero(){ - $result = array( - 'items' => array(new Item()) - ); + $result = ['items' => [new Item()]]; $this->itemsApiExpects(2, FeedType::FEED); @@ -288,18 +284,18 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { ->will($this->throwException(new BusinessLayerException(''))); $response = $this->controller->index(FeedType::FEED, 2, 3); - $this->assertEquals(array(), $response); + $this->assertEquals([], $response); } public function testNewItems(){ - $feeds = array(new Feed()); - $result = array( - 'items' => array(new Item()), + $feeds = [new Feed()]; + $result = [ + 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, 'starred' => 3111 - ); + ]; $this->settings->expects($this->once()) ->method('getUserValue') @@ -352,7 +348,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase { ->will($this->throwException(new BusinessLayerException(''))); $response = $this->controller->newItems(FeedType::FEED, 2, 3); - $this->assertEquals(array(), $response); + $this->assertEquals([], $response); } diff --git a/tests/unit/controller/JSONHttpErrorTest.php b/tests/unit/controller/JSONHttpErrorTest.php index 135095e1f..dfcbd202e 100644 --- a/tests/unit/controller/JSONHttpErrorTest.php +++ b/tests/unit/controller/JSONHttpErrorTest.php @@ -23,7 +23,7 @@ class JSONHttpErrorTest extends \PHPUnit_Framework_TestCase { $ex = new \Exception('hi'); $result = JSONHttpError::error($ex, 3); - $this->assertEquals(array('message' => 'hi'), $result->getData()); + $this->assertEquals(['message' => 'hi'], $result->getData()); $this->assertEquals(3, $result->getStatus()); } diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index ef3384431..d4c53e468 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -57,11 +57,11 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase { public function testSettings() { - $result = array( + $result = [ 'showAll' => true, 'compact' => true, 'language' => 'de' - ); + ]; $this->l10n->expects($this->once()) ->method('getLanguageCode') |