summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/unit/businesslayer/FeedBusinessLayerTest.php1
-rw-r--r--tests/unit/utility/FeedFetcherTest.php6
-rw-r--r--tests/unit/utility/OPMLExporterTest.php48
-rw-r--r--utility/feedfetcher.php2
4 files changed, 52 insertions, 5 deletions
diff --git a/tests/unit/businesslayer/FeedBusinessLayerTest.php b/tests/unit/businesslayer/FeedBusinessLayerTest.php
index 18c30e277..2ceb82872 100644
--- a/tests/unit/businesslayer/FeedBusinessLayerTest.php
+++ b/tests/unit/businesslayer/FeedBusinessLayerTest.php
@@ -70,7 +70,6 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
$timeFactory);
$this->user = 'jack';
$response = 'hi';
-
}
diff --git a/tests/unit/utility/FeedFetcherTest.php b/tests/unit/utility/FeedFetcherTest.php
index e4fea6b25..30881ae0d 100644
--- a/tests/unit/utility/FeedFetcherTest.php
+++ b/tests/unit/utility/FeedFetcherTest.php
@@ -97,11 +97,11 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
$this->url = 'tests';
$this->permalink = 'http://permalink';
- $this->title = 'my title';
+ $this->title = 'my title<';
$this->guid = 'hey guid here';
$this->body = 'let the bodies hit the floor';
$this->pub = 23111;
- $this->author = 'boogieman&lte;';
+ $this->author = '<boogieman';
$this->enclosureLink = 'http://enclosure.you';
$this->feedTitle = '&lte;its a title';
@@ -172,7 +172,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
$item->setStatus(0);
$item->setUnread();
$item->setUrl($this->permalink);
- $item->setTitle($this->title);
+ $item->setTitle(html_entity_decode($this->title));
$item->setGuid($this->guid);
$item->setGuidHash(md5($this->guid));
$item->setBody($this->body);
diff --git a/tests/unit/utility/OPMLExporterTest.php b/tests/unit/utility/OPMLExporterTest.php
new file mode 100644
index 000000000..fe75695b7
--- /dev/null
+++ b/tests/unit/utility/OPMLExporterTest.php
@@ -0,0 +1,48 @@
+<?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\Db\Folder;
+use \OCA\News\Db\Feed;
+
+require_once(__DIR__ . "/../../classloader.php");
+
+
+class OPMLExporterTest extends \OCA\AppFramework\Utility\TestUtility {
+
+ private $exporter;
+
+ protected function setUp() {
+ $this->exporter = new OPMLExporter();
+ }
+
+
+ public function testBuildEmpty(){
+ $result = $this->exporter->build(array(), array());
+
+ }
+
+} \ No newline at end of file
diff --git a/utility/feedfetcher.php b/utility/feedfetcher.php
index b6b0161da..f72a14439 100644
--- a/utility/feedfetcher.php
+++ b/utility/feedfetcher.php
@@ -120,7 +120,7 @@ class FeedFetcher implements IFeedFetcher {
$author = $simplePieItem->get_author();
if ($author !== null) {
- $item->setAuthor($author->get_name());
+ $item->setAuthor(html_entity_decode($author->get_name()));
}
// TODO: make it work for video files also