make cron updater optional, created updater class for better updating handling, created a route for the api to clean up old stuff

2 files changed, 94 insertions, 1 deletions

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 @@
+<?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\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