From 9507e6a3ee7303a74f9c36b8d87cd0101c26d313 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 2 Aug 2013 15:31:55 +0200 Subject: make cron updater optional, created updater class for better updating handling, created a route for the api to clean up old stuff --- tests/unit/external/NewsAPITest.php | 18 ++++++++- tests/unit/utility/UpdaterTest.php | 77 +++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 tests/unit/utility/UpdaterTest.php (limited to 'tests') diff --git a/tests/unit/external/NewsAPITest.php b/tests/unit/external/NewsAPITest.php index e1fd2e50a..b5cd808e3 100644 --- a/tests/unit/external/NewsAPITest.php +++ b/tests/unit/external/NewsAPITest.php @@ -36,6 +36,7 @@ class NewsAPITest extends ControllerTestUtility { private $api; private $request; private $newsAPI; + private $updater; protected function setUp() { $this->api = $this->getMockBuilder( @@ -46,7 +47,11 @@ class NewsAPITest extends ControllerTestUtility { '\OCA\AppFramework\Http\Request') ->disableOriginalConstructor() ->getMock(); - $this->newsAPI = new NewsAPI($this->api, $this->request); + $this->updater = $this->getMockBuilder( + '\OCA\News\Utility\Updater') + ->disableOriginalConstructor() + ->getMock(); + $this->newsAPI = new NewsAPI($this->api, $this->request, $this->updater); } @@ -60,6 +65,10 @@ class NewsAPITest extends ControllerTestUtility { $this->assertDefaultAnnotations('version'); } + public function testCleanUpAnnotations(){ + $this->assertDefaultAnnotations('cleanUp'); + } + public function testGetVersion(){ $this->api->expects($this->once()) ->method('getAppValue') @@ -74,4 +83,11 @@ class NewsAPITest extends ControllerTestUtility { } + public function testCleanUp(){ + $this->updater->expects($this->once()) + ->method('cleanUp'); + $this->newsAPI->cleanUp(); + } + + } diff --git a/tests/unit/utility/UpdaterTest.php b/tests/unit/utility/UpdaterTest.php new file mode 100644 index 000000000..a5191e9f2 --- /dev/null +++ b/tests/unit/utility/UpdaterTest.php @@ -0,0 +1,77 @@ +. +* +*/ + +namespace OCA\News\Utility; + +use \OCA\News\BusinessLayer\FolderBusinessLayer; +use \OCA\News\BusinessLayer\FeedBusinessLayer; +use \OCA\News\BusinessLayer\ItemBusinessLayer; + + +require_once(__DIR__ . "/../../classloader.php"); + + +class UpdaterTest extends \PHPUnit_Framework_TestCase { + + private $folderBusinessLayer; + private $feedBusinessLayer; + private $itemBusinessLayer; + private $updater; + + protected function setUp() { + $this->folderBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\FolderBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->feedBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\FeedBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->itemBusinessLayer = $this->getMockBuilder( + '\OCA\News\BusinessLayer\ItemBusinessLayer') + ->disableOriginalConstructor() + ->getMock(); + $this->updater = new Updater($this->folderBusinessLayer, + $this->feedBusinessLayer, + $this->itemBusinessLayer); + } + + public function testCleanUp() { + $this->folderBusinessLayer->expects($this->once()) + ->method('purgeDeleted'); + $this->feedBusinessLayer->expects($this->once()) + ->method('purgeDeleted'); + $this->itemBusinessLayer->expects($this->once()) + ->method('autoPurgeOld'); + $this->updater->cleanUp(); + } + + + public function testUpdate() { + $this->feedBusinessLayer->expects($this->once()) + ->method('updateAll'); + $this->updater->update(); + } +} \ No newline at end of file -- cgit v1.2.3