From 2698214c4122d4f5f63f26f7a204035fe0d4f211 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Sun, 17 Mar 2019 08:23:37 +0100 Subject: fix/allow CDATA encoding (#428) --- tests/Unit/Fetcher/FeedFetcherTest.php | 32 +++++---- tests/Unit/Utility/ProxyConfigParserTest.php | 103 --------------------------- 2 files changed, 17 insertions(+), 118 deletions(-) delete mode 100644 tests/Unit/Utility/ProxyConfigParserTest.php (limited to 'tests') diff --git a/tests/Unit/Fetcher/FeedFetcherTest.php b/tests/Unit/Fetcher/FeedFetcherTest.php index 8f031d365..0ae453c9c 100644 --- a/tests/Unit/Fetcher/FeedFetcherTest.php +++ b/tests/Unit/Fetcher/FeedFetcherTest.php @@ -113,6 +113,7 @@ class FeedFetcherTest extends TestCase private $pub; private $updated; private $body; + private $parsed_body; /** * @var Author */ @@ -172,21 +173,22 @@ class FeedFetcherTest extends TestCase $timeFactory, $this->logger ); - $this->url = 'http://tests'; - - $this->permalink = 'http://permalink'; - $this->title = 'my&lt;' title'; - $this->guid = 'hey guid here'; - $this->guid_hash = 'df9a5f84e44bfe38cf44f6070d5b0250'; - $this->body = 'let the bodies hit the floor test'; - $this->pub = 23111; - $this->updated = 23444; - $this->author = new Author(); + $this->url = 'http://tests/'; + + $this->permalink = 'http://permalink'; + $this->title = 'my&lt;' title'; + $this->guid = 'hey guid here'; + $this->guid_hash = 'df9a5f84e44bfe38cf44f6070d5b0250'; + $this->body = 'test]]>'; + $this->parsed_body = 'let the bodies hit the floor test'; + $this->pub = 23111; + $this->updated = 23444; + $this->author = new Author(); $this->author->setName('<boogieman'); - $this->enclosure = 'http://enclosure.you'; + $this->enclosure = 'http://enclosure.you'; $this->feed_title = '<a>&its a</a> title'; - $this->feed_link = 'http://tests'; + $this->feed_link = 'http://tests/'; $this->feed_image = '/an/image'; $this->web_favicon = 'http://anon.google.com'; $this->modified = $this->getMockBuilder('\DateTime')->getMock(); @@ -231,9 +233,9 @@ class FeedFetcherTest extends TestCase public function testFetchAccount() { - $this->__setUpReader('http://account%40email.com:F9sEU%2ARt%25%3AKFK8HMHT%26@tests'); + $this->__setUpReader('http://account%40email.com:F9sEU%2ARt%25%3AKFK8HMHT%26@tests/'); $item = $this->_createItem(); - $feed = $this->_createFeed('de-DE', false, 'http://account%40email.com:F9sEU%2ARt%25%3AKFK8HMHT%26@tests'); + $feed = $this->_createFeed('de-DE', false, 'http://account%40email.com:F9sEU%2ARt%25%3AKFK8HMHT%26@tests/'); $this->_mockIterator($this->feed_mock, [$this->item_mock]); $result = $this->fetcher->fetch($this->url, false, null, 'account@email.com', 'F9sEU*Rt%:KFK8HMHT&'); @@ -477,7 +479,7 @@ class FeedFetcherTest extends TestCase $item->setTitle('my<\' title'); $item->setGuid($this->guid); $item->setGuidHash($this->guid_hash); - $item->setBody($this->body); + $item->setBody($this->parsed_body); $item->setRtl(false); $item->setLastModified(3); $item->setPubDate(3); diff --git a/tests/Unit/Utility/ProxyConfigParserTest.php b/tests/Unit/Utility/ProxyConfigParserTest.php deleted file mode 100644 index 1433558e7..000000000 --- a/tests/Unit/Utility/ProxyConfigParserTest.php +++ /dev/null @@ -1,103 +0,0 @@ - - * @author Bernhard Posselt - * @copyright 2012 Alessandro Cosentino - * @copyright 2012-2014 Bernhard Posselt - */ - -namespace OCA\News\Tests\Unit\Utility; - - -use OCA\News\Utility\ProxyConfigParser; -use OCP\IConfig; -use PHPUnit\Framework\TestCase; - -class ProxyConfigParserTest extends TestCase -{ - - private $config; - private $feedService; - private $itemService; - private $parser; - - protected function setUp() - { - $this->config = $this->getMockBuilder(IConfig::class) - ->disableOriginalConstructor() - ->getMock(); - $this->parser = new ProxyConfigParser($this->config); - } - - private function setExpectedProxy($proxy=null, $userpasswd=null) - { - $this->config->expects($this->at(0)) - ->method('getSystemValue') - ->with($this->equalTo('proxy')) - ->will($this->returnValue($proxy)); - $this->config->expects($this->at(1)) - ->method('getSystemValue') - ->with($this->equalTo('proxyuserpwd')) - ->will($this->returnValue($userpasswd)); - } - - public function testParsesNoProxy() - { - $expected = [ - 'host' => null, - 'port' => null, - 'user' => null, - 'password' => null - ]; - $this->setExpectedProxy(); - $result = $this->parser->parse(); - $this->assertEquals($expected, $result); - } - - - public function testParsesHost() - { - $expected = [ - 'host' => 'http://google.com/mytest', - 'port' => null, - 'user' => null, - 'password' => null - ]; - $this->setExpectedProxy('http://google.com/mytest'); - $result = $this->parser->parse(); - $this->assertEquals($expected, $result); - } - - - public function testParsesHostAndPort() - { - $expected = [ - 'host' => 'http://google.com/mytest', - 'port' => 89, - 'user' => null, - 'password' => null - ]; - $this->setExpectedProxy('http://google.com:89/mytest'); - $result = $this->parser->parse(); - $this->assertEquals($expected, $result); - } - - - public function testParsesUser() - { - $expected = [ - 'host' => null, - 'port' => null, - 'user' => 'john', - 'password' => 'doe:hey' - ]; - $this->setExpectedProxy(null, 'john:doe:hey'); - $result = $this->parser->parse(); - $this->assertEquals($expected, $result); - } -} \ No newline at end of file -- cgit v1.2.3