summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-10-21 11:11:20 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-10-21 11:11:20 +0200
commita52df5cad2f9853514988b1bb43b07e812bb9316 (patch)
tree89dd47c8be24de558bbce3b37cb6d8a59002cac9 /tests
parent29000e2d6f49ed9b08b15a9f474dfb5b4145d800 (diff)
move config class into config folder
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/articleenhancer/XPathArticleEnhancerTest.php2
-rw-r--r--tests/unit/config/ConfigTest.php (renamed from tests/unit/utility/ConfigTest.php)2
-rw-r--r--tests/unit/fetcher/FeedFetcherTest.php2
-rw-r--r--tests/unit/service/FeedServiceTest.php2
-rw-r--r--tests/unit/service/FolderServiceTest.php8
-rw-r--r--tests/unit/service/ItemServiceTest.php2
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
index 8a99e9d5a..082a2030c 100644
--- a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
+++ b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php
@@ -37,7 +37,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase {
$this->proxyPort = 3;
$this->proxyAuth = 'hi';
$this->config = $this->getMockBuilder(
- '\OCA\News\Utility\Config')
+ '\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
$this->config->expects($this->any())
diff --git a/tests/unit/utility/ConfigTest.php b/tests/unit/config/ConfigTest.php
index a8f7be1be..b03eeb325 100644
--- a/tests/unit/utility/ConfigTest.php
+++ b/tests/unit/config/ConfigTest.php
@@ -11,7 +11,7 @@
* @copyright Bernhard Posselt 2012, 2014
*/
-namespace OCA\News\Utility;
+namespace OCA\News\Config;
class ConfigTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php
index 893fb7b2a..948e25e9b 100644
--- a/tests/unit/fetcher/FeedFetcherTest.php
+++ b/tests/unit/fetcher/FeedFetcherTest.php
@@ -102,7 +102,7 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$this->proxyAuth = 'hi';
$this->fetchTimeout = 40;
$this->config = $this->getMockBuilder(
- '\OCA\News\Utility\Config')
+ '\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
$this->config->expects($this->any())
diff --git a/tests/unit/service/FeedServiceTest.php b/tests/unit/service/FeedServiceTest.php
index a4e722109..cc8d3018e 100644
--- a/tests/unit/service/FeedServiceTest.php
+++ b/tests/unit/service/FeedServiceTest.php
@@ -69,7 +69,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
->getMock();
$this->purifier = $this->getMock('purifier', ['purify']);
$config = $this->getMockBuilder(
- '\OCA\News\Utility\Config')
+ '\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
$config->expects($this->any())
diff --git a/tests/unit/service/FolderServiceTest.php b/tests/unit/service/FolderServiceTest.php
index 144705b26..bbc89c99d 100644
--- a/tests/unit/service/FolderServiceTest.php
+++ b/tests/unit/service/FolderServiceTest.php
@@ -40,7 +40,7 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
->getMock();
$this->autoPurgeMinimumInterval = 10;
$config = $this->getMockBuilder(
- '\OCA\News\Utility\Config')
+ '\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
$config->expects($this->any())
@@ -147,14 +147,14 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
$this->folderService->rename(3, 'bogus', '');
- $this->assertEquals('bogus', $folder->getName());
+ $this->assertEquals('bogus', $folder->getName());
}
public function testRenameThrowsExWhenFolderNameExists(){
$folderName = 'hihi';
$rows = [['id' => 1]];
-
+
$this->l10n->expects($this->once())
->method('t');
$this->folderMapper->expects($this->once())
@@ -169,7 +169,7 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
public function testRenameThrowsExWhenFolderNameEmpty(){
$folderName = '';
-
+
$this->folderMapper->expects($this->once())
->method('findByName')
->with($this->equalTo($folderName))
diff --git a/tests/unit/service/ItemServiceTest.php b/tests/unit/service/ItemServiceTest.php
index 2f5f31cba..03d644eb9 100644
--- a/tests/unit/service/ItemServiceTest.php
+++ b/tests/unit/service/ItemServiceTest.php
@@ -49,7 +49,7 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
->will($this->returnValue($this->status));
$this->threshold = 2;
$config = $this->getMockBuilder(
- '\OCA\News\Utility\Config')
+ '\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
$config->expects($this->any())