Unit: Fix unittests (#278)

* Unit: Fix unittests

Issue #171

* Tests: Move test namespace to the expected nextcloud namespace

5 files changed, 23 insertions, 9 deletions

diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php
index 6df02e51c..08e25db8c 100644
--- a/tests/Unit/Service/FeedServiceTest.php
+++ b/tests/Unit/Service/FeedServiceTest.php
@@ -12,8 +12,9 @@
  */
 
 
-namespace OCA\News\Service;
+namespace OCA\News\Tests\Unit\Service;
 
+use OCA\News\Service\FeedService;
 use OCP\AppFramework\Db\DoesNotExistException;
 
 use OCA\News\Db\Feed;
diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
index 65563b644..68dcda3f1 100644
--- a/tests/Unit/Service/FolderServiceTest.php
+++ b/tests/Unit/Service/FolderServiceTest.php
@@ -11,9 +11,10 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Service;
+namespace OCA\News\Tests\Unit\Service;
 
 use \OCA\News\Db\Folder;
+use OCA\News\Service\FolderService;
 
 
 class FolderServiceTest extends \PHPUnit_Framework_TestCase {
@@ -80,6 +81,11 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
             ->with($this->equalTo($folder))
             ->will($this->returnValue($folder));
 
+        $this->folderMapper->expects($this->once())
+            ->method('findByName')
+            ->with('hey', 'john')
+            ->will($this->returnValue([]));
+
         $result = $this->folderService->create('hey', 'john', 5);
 
         $this->assertEquals($folder, $result);
@@ -103,7 +109,9 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
         $this->folderService->create($folderName, 'john', 3);
     }
 
-
+    /**
+     * @expectedException \OCA\News\Service\ServiceValidationException
+     */
     public function testCreateThrowsExWhenFolderNameEmpty(){
         $folderName = '';
 
@@ -112,9 +120,6 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
             ->with($this->equalTo($folderName))
             ->will($this->returnValue([]));
 
-        $this->setExpectedException(
-            '\OCA\News\Service\ServiceValidationException'
-        );
         $this->folderService->create($folderName, 'john', 3);
     }
 
@@ -151,6 +156,11 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
             ->method('update')
             ->with($this->equalTo($folder));
 
+        $this->folderMapper->expects($this->once())
+                           ->method('findByName')
+                           ->with('bogus', '')
+                           ->will($this->returnValue([]));
+
         $this->folderService->rename(3, 'bogus', '');
 
         $this->assertEquals('bogus', $folder->getName());
diff --git a/tests/Unit/Service/ItemServiceTest.php b/tests/Unit/Service/ItemServiceTest.php
index 4beebbb63..8ec1a5c45 100644
--- a/tests/Unit/Service/ItemServiceTest.php
+++ b/tests/Unit/Service/ItemServiceTest.php
@@ -11,8 +11,9 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Service;
+namespace OCA\News\Tests\Unit\Service;
 
+use OCA\News\Service\ItemService;
 use \OCP\AppFramework\Db\DoesNotExistException;
 
 use \OCA\News\Db\Item;
diff --git a/tests/Unit/Service/ServiceTest.php b/tests/Unit/Service/ServiceTest.php
index 780f606df..46242434b 100644
--- a/tests/Unit/Service/ServiceTest.php
+++ b/tests/Unit/Service/ServiceTest.php
@@ -11,8 +11,9 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Service;
+namespace OCA\News\Tests\Unit\Service;
 
+use OCA\News\Service\Service;
 use \OCP\AppFramework\Db\DoesNotExistException;
 use \OCP\AppFramework\Db\MultipleObjectsReturnedException;
 
diff --git a/tests/Unit/Service/StatusServiceTest.php b/tests/Unit/Service/StatusServiceTest.php
index 095bf6247..ca1029504 100644
--- a/tests/Unit/Service/StatusServiceTest.php
+++ b/tests/Unit/Service/StatusServiceTest.php
@@ -11,9 +11,10 @@
  * @copyright Bernhard Posselt 2012, 2014
  */
 
-namespace OCA\News\Service;
+namespace OCA\News\Tests\Unit\Service;
 
 use \OCA\News\Db\FeedType;
+use OCA\News\Service\StatusService;
 
 
 class StatusServiceTest extends \PHPUnit_Framework_TestCase {