diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-21 16:32:36 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-21 16:32:36 +0100 |
commit | ac84b27965f5a1aec859e389f099fb844e33de46 (patch) | |
tree | c98d7aace90fcb442208349918a3e71cd9a7691a /tests | |
parent | f475d882d0a76908400e9857f7e8a4ae8ad8a752 (diff) |
reorganize folder
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bl/FeedBlTest.php | 80 | ||||
-rw-r--r-- | tests/bl/FolderBlTest.php | 117 | ||||
-rw-r--r-- | tests/db/FeedMapperTest.php | 2 |
3 files changed, 124 insertions, 75 deletions
diff --git a/tests/bl/FeedBlTest.php b/tests/bl/FeedBlTest.php index dca99c682..31c8ff8d4 100644 --- a/tests/bl/FeedBlTest.php +++ b/tests/bl/FeedBlTest.php @@ -28,90 +28,22 @@ namespace OCA\News\Bl; require_once(__DIR__ . "/../classloader.php"); -use \OCA\News\Db\Folder; +use \OCA\News\Db\Feed; -class FolderBlTest extends \OCA\AppFramework\Utility\TestUtility { +class FeedBlTest extends \OCA\AppFramework\Utility\TestUtility { protected $api; - protected $folderMapper; + protected $feedMapper; protected $folderBl; protected function setUp(){ $this->api = $this->getAPIMock(); - $this->folderMapper = $this->getMock( + $this->feedMapper = $this->getMock( '\OCA\News\Db\NewsMapper', array('findAllFromUser', 'insert', 'update', 'find'), array($this->api, 'test')); - $this->folderBl = new FolderBl($this->folderMapper); + $this->folderBl = new FolderBl($this->feedMapper); } - - function testFindAll(){ - $userId = 'jack'; - $return = 'hi'; - $this->folderMapper->expects($this->once()) - ->method('findAllFromUser') - ->with($this->equalTo($userId)) - ->will($this->returnValue($return)); - - $result = $this->folderBl->findAll($userId); - - $this->assertEquals($return, $result); - } - - - public function testCreate(){ - $folder = new Folder(); - $folder->setName('hey'); - $folder->setParentId(5); - - $this->folderMapper->expects($this->once()) - ->method('insert') - ->with($this->equalTo($folder)) - ->will($this->returnValue($folder)); - - $result = $this->folderBl->create('hey', 5); - - $this->assertEquals($folder, $result); - } - - - public function testSetOpened(){ - $folder = new Folder(); - - $this->folderMapper->expects($this->once()) - ->method('find') - ->with($this->equalTo(3)) - ->will($this->returnValue($folder)); - - $this->folderMapper->expects($this->once()) - ->method('update') - ->with($this->equalTo($folder)); - - $this->folderBl->setOpened(3, false, ''); - - $this->assertFalse($folder->getOpened()); - - } - - - public function testRename(){ - $folder = new Folder(); - $folder->setName('jooohn'); - - $this->folderMapper->expects($this->once()) - ->method('find') - ->with($this->equalTo(3)) - ->will($this->returnValue($folder)); - - $this->folderMapper->expects($this->once()) - ->method('update') - ->with($this->equalTo($folder)); - - $this->folderBl->rename(3, 'bogus', ''); - - $this->assertEquals('bogus', $folder->getName()); - } - -} +}
\ No newline at end of file diff --git a/tests/bl/FolderBlTest.php b/tests/bl/FolderBlTest.php new file mode 100644 index 000000000..dca99c682 --- /dev/null +++ b/tests/bl/FolderBlTest.php @@ -0,0 +1,117 @@ +<?php + +/** +* ownCloud - News +* +* @author Alessandro Cosentino +* @author Bernhard Posselt +* @copyright 2012 Alessandro Cosentino cosenal@gmail.com +* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCA\News\Bl; + +require_once(__DIR__ . "/../classloader.php"); + + +use \OCA\News\Db\Folder; + + +class FolderBlTest extends \OCA\AppFramework\Utility\TestUtility { + + protected $api; + protected $folderMapper; + protected $folderBl; + + protected function setUp(){ + $this->api = $this->getAPIMock(); + $this->folderMapper = $this->getMock( + '\OCA\News\Db\NewsMapper', + array('findAllFromUser', 'insert', 'update', 'find'), + array($this->api, 'test')); + $this->folderBl = new FolderBl($this->folderMapper); + } + + + function testFindAll(){ + $userId = 'jack'; + $return = 'hi'; + $this->folderMapper->expects($this->once()) + ->method('findAllFromUser') + ->with($this->equalTo($userId)) + ->will($this->returnValue($return)); + + $result = $this->folderBl->findAll($userId); + + $this->assertEquals($return, $result); + } + + + public function testCreate(){ + $folder = new Folder(); + $folder->setName('hey'); + $folder->setParentId(5); + + $this->folderMapper->expects($this->once()) + ->method('insert') + ->with($this->equalTo($folder)) + ->will($this->returnValue($folder)); + + $result = $this->folderBl->create('hey', 5); + + $this->assertEquals($folder, $result); + } + + + public function testSetOpened(){ + $folder = new Folder(); + + $this->folderMapper->expects($this->once()) + ->method('find') + ->with($this->equalTo(3)) + ->will($this->returnValue($folder)); + + $this->folderMapper->expects($this->once()) + ->method('update') + ->with($this->equalTo($folder)); + + $this->folderBl->setOpened(3, false, ''); + + $this->assertFalse($folder->getOpened()); + + } + + + public function testRename(){ + $folder = new Folder(); + $folder->setName('jooohn'); + + $this->folderMapper->expects($this->once()) + ->method('find') + ->with($this->equalTo(3)) + ->will($this->returnValue($folder)); + + $this->folderMapper->expects($this->once()) + ->method('update') + ->with($this->equalTo($folder)); + + $this->folderBl->rename(3, 'bogus', ''); + + $this->assertEquals('bogus', $folder->getName()); + } + +} diff --git a/tests/db/FeedMapperTest.php b/tests/db/FeedMapperTest.php index 8a0c2b733..a070e5dd9 100644 --- a/tests/db/FeedMapperTest.php +++ b/tests/db/FeedMapperTest.php @@ -120,7 +120,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->feeds[0]->getId()), array('id' => $this->feeds[1]->getId()) ); - $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS unread_count ' . + $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*dbprefix*news_feeds` `feeds` ' . 'LEFT OUTER JOIN `*dbprefix*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . |