Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'unittestFeed' of https://github.com/kpieters/zf2 into h…
Browse files Browse the repository at this point in the history 
…otfix/feed-test-coverage
  • Loading branch information
@weierophinney
weierophinney committed Sep 13, 2012
118 parents aee7d01 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 9f28eab + 2e7e2e2 + 7c64770 + 81a21d6 + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + 412585a + b5e6b02 + 9ac81f3 + 25fde7d + 7c25255 commit f7641ec
Show file tree
Hide file tree
Showing 26 changed files with 1,720 additions and 1,363 deletions.
10 changes: 5 additions & 5 deletions src/Writer/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Feed extends AbstractFeed implements Iterator, Countable
protected $entriesKey = 0;

/**
* Creates a new Zend_Feed_Writer_Entry data container for use. This is NOT
* Creates a new Zend\Feed\Writer\Entry data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
Expand Down Expand Up @@ -66,7 +66,7 @@ public function addTombstone(Deleted $deleted)
}

/**
* Creates a new Zend_Feed_Writer_Deleted data container for use. This is NOT
* Creates a new Zend\Feed\Writer\Deleted data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
Expand Down Expand Up @@ -102,10 +102,10 @@ public function addEntry(Entry $entry)
*/
public function removeEntry($index)
{
if (isset($this->entries[$index])) {
unset($this->entries[$index]);
if (!isset($this->entries[$index])) {
throw new Exception\InvalidArgumentException('Undefined index: ' . $index . '. Entry does not exist.');
}
throw new Exception\InvalidArgumentException('Undefined index: ' . $index . '. Entry does not exist.');
unset($this->entries[$index]);
}

/**
Expand Down
3 changes: 0 additions & 3 deletions src/Writer/Renderer/Feed/Rss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ public function __construct (Writer\Feed $container)
*/
public function render()
{
if (!$this->container->getEncoding()) {
$this->container->setEncoding('UTF-8');
}
$this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
$this->dom->substituteEntities = false;
Expand Down
124 changes: 62 additions & 62 deletions test/PubSubHubbub/PublisherTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
class PublisherTest extends \PHPUnit_Framework_TestCase
{
/** @var Publisher */
protected $_publisher = null;
protected $publisher = null;

public function setUp()
{
$client = new HttpClient;
PubSubHubbub::setHttpClient($client);
$this->_publisher = new Publisher;
$this->publisher = new Publisher;
}

public function getClientSuccess()
Expand All @@ -58,206 +58,206 @@ public function getClientFail()

public function testAddsHubServerUrl()
{
$this->_publisher->addHubUrl('http://www.example.com/hub');
$this->assertEquals(array('http://www.example.com/hub'), $this->_publisher->getHubUrls());
$this->publisher->addHubUrl('http://www.example.com/hub');
$this->assertEquals(array('http://www.example.com/hub'), $this->publisher->getHubUrls());
}

public function testAddsHubServerUrlsFromArray()
{
$this->_publisher->addHubUrls(array(
$this->publisher->addHubUrls(array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
));
$this->assertEquals(array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
), $this->_publisher->getHubUrls());
), $this->publisher->getHubUrls());
}

public function testAddsHubServerUrlsFromArrayUsingSetConfig()
{
$this->_publisher->setOptions(array('hubUrls' => array(
$this->publisher->setOptions(array('hubUrls' => array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
)));
$this->assertEquals(array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
), $this->_publisher->getHubUrls());
), $this->publisher->getHubUrls());
}

public function testRemovesHubServerUrl()
{
$this->_publisher->addHubUrls(array(
$this->publisher->addHubUrls(array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
));
$this->_publisher->removeHubUrl('http://www.example.com/hub');
$this->publisher->removeHubUrl('http://www.example.com/hub');
$this->assertEquals(array(
1 => 'http://www.example.com/hub2'
), $this->_publisher->getHubUrls());
), $this->publisher->getHubUrls());
}

public function testRetrievesUniqueHubServerUrlsOnly()
{
$this->_publisher->addHubUrls(array(
$this->publisher->addHubUrls(array(
'http://www.example.com/hub', 'http://www.example.com/hub2',
'http://www.example.com/hub'
));
$this->assertEquals(array(
'http://www.example.com/hub', 'http://www.example.com/hub2'
), $this->_publisher->getHubUrls());
), $this->publisher->getHubUrls());
}

public function testThrowsExceptionOnSettingEmptyHubServerUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addHubUrl('');
$this->publisher->addHubUrl('');
}


public function testThrowsExceptionOnSettingNonStringHubServerUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addHubUrl(123);
$this->publisher->addHubUrl(123);
}


public function testThrowsExceptionOnSettingInvalidHubServerUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addHubUrl('http://');
$this->publisher->addHubUrl('http://');
}

public function testAddsUpdatedTopicUrl()
{
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->assertEquals(array('http://www.example.com/topic'), $this->_publisher->getUpdatedTopicUrls());
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->assertEquals(array('http://www.example.com/topic'), $this->publisher->getUpdatedTopicUrls());
}

public function testAddsUpdatedTopicUrlsFromArray()
{
$this->_publisher->addUpdatedTopicUrls(array(
$this->publisher->addUpdatedTopicUrls(array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
));
$this->assertEquals(array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
), $this->_publisher->getUpdatedTopicUrls());
), $this->publisher->getUpdatedTopicUrls());
}

public function testAddsUpdatedTopicUrlsFromArrayUsingSetConfig()
{
$this->_publisher->setOptions(array('updatedTopicUrls' => array(
$this->publisher->setOptions(array('updatedTopicUrls' => array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
)));
$this->assertEquals(array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
), $this->_publisher->getUpdatedTopicUrls());
), $this->publisher->getUpdatedTopicUrls());
}

public function testRemovesUpdatedTopicUrl()
{
$this->_publisher->addUpdatedTopicUrls(array(
$this->publisher->addUpdatedTopicUrls(array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
));
$this->_publisher->removeUpdatedTopicUrl('http://www.example.com/topic');
$this->publisher->removeUpdatedTopicUrl('http://www.example.com/topic');
$this->assertEquals(array(
1 => 'http://www.example.com/topic2'
), $this->_publisher->getUpdatedTopicUrls());
), $this->publisher->getUpdatedTopicUrls());
}

public function testRetrievesUniqueUpdatedTopicUrlsOnly()
{
$this->_publisher->addUpdatedTopicUrls(array(
$this->publisher->addUpdatedTopicUrls(array(
'http://www.example.com/topic', 'http://www.example.com/topic2',
'http://www.example.com/topic'
));
$this->assertEquals(array(
'http://www.example.com/topic', 'http://www.example.com/topic2'
), $this->_publisher->getUpdatedTopicUrls());
), $this->publisher->getUpdatedTopicUrls());
}

public function testThrowsExceptionOnSettingEmptyUpdatedTopicUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addUpdatedTopicUrl('');
$this->publisher->addUpdatedTopicUrl('');
}


public function testThrowsExceptionOnSettingNonStringUpdatedTopicUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addUpdatedTopicUrl(123);
$this->publisher->addUpdatedTopicUrl(123);
}


public function testThrowsExceptionOnSettingInvalidUpdatedTopicUrl()
{
$this->setExpectedException('Zend\Feed\PubSubHubbub\Exception\ExceptionInterface');
$this->_publisher->addUpdatedTopicUrl('http://');
$this->publisher->addUpdatedTopicUrl('http://');
}

public function testAddsParameter()
{
$this->_publisher->setParameter('foo', 'bar');
$this->assertEquals(array('foo'=> 'bar'), $this->_publisher->getParameters());
$this->publisher->setParameter('foo', 'bar');
$this->assertEquals(array('foo'=> 'bar'), $this->publisher->getParameters());
}

public function testAddsParametersFromArray()
{
$this->_publisher->setParameters(array(
$this->publisher->setParameters(array(
'foo' => 'bar', 'boo' => 'baz'
));
$this->assertEquals(array(
'foo' => 'bar', 'boo' => 'baz'
), $this->_publisher->getParameters());
), $this->publisher->getParameters());
}

public function testAddsParametersFromArrayInSingleMethod()
{
$this->_publisher->setParameter(array(
$this->publisher->setParameter(array(
'foo' => 'bar', 'boo' => 'baz'
));
$this->assertEquals(array(
'foo' => 'bar', 'boo' => 'baz'
), $this->_publisher->getParameters());
), $this->publisher->getParameters());
}

public function testAddsParametersFromArrayUsingSetConfig()
{
$this->_publisher->setOptions(array('parameters' => array(
$this->publisher->setOptions(array('parameters' => array(
'foo' => 'bar', 'boo' => 'baz'
)));
$this->assertEquals(array(
'foo' => 'bar', 'boo' => 'baz'
), $this->_publisher->getParameters());
), $this->publisher->getParameters());
}

public function testRemovesParameter()
{
$this->_publisher->setParameters(array(
$this->publisher->setParameters(array(
'foo' => 'bar', 'boo' => 'baz'
));
$this->_publisher->removeParameter('boo');
$this->publisher->removeParameter('boo');
$this->assertEquals(array(
'foo' => 'bar'
), $this->_publisher->getParameters());
), $this->publisher->getParameters());
}

public function testRemovesParameterIfSetToNull()
{
$this->_publisher->setParameters(array(
$this->publisher->setParameters(array(
'foo' => 'bar', 'boo' => 'baz'
));
$this->_publisher->setParameter('boo', null);
$this->publisher->setParameter('boo', null);
$this->assertEquals(array(
'foo' => 'bar'
), $this->_publisher->getParameters());
), $this->publisher->getParameters());
}

public function testNotifiesHubWithCorrectParameters()
{
PubSubHubbub::setHttpClient($this->getClientSuccess());
$client = PubSubHubbub::getHttpClient();
$this->_publisher->addHubUrl('http://www.example.com/hub');
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->_publisher->setParameter('foo', 'bar');
$this->_publisher->notifyAll();
$this->publisher->addHubUrl('http://www.example.com/hub');
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->publisher->setParameter('foo', 'bar');
$this->publisher->notifyAll();
$this->assertEquals('hub.mode=publish&hub.url=http%3A%2F%2Fwww.example.com%2Ftopic&foo=bar',
$client->getRequest()->getContent());
}
Expand All @@ -266,10 +266,10 @@ public function testNotifiesHubWithCorrectParametersAndMultipleTopics()
{
PubSubHubbub::setHttpClient($this->getClientSuccess());
$client = PubSubHubbub::getHttpClient();
$this->_publisher->addHubUrl('http://www.example.com/hub');
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic2');
$this->_publisher->notifyAll();
$this->publisher->addHubUrl('http://www.example.com/hub');
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic2');
$this->publisher->notifyAll();
$this->assertEquals('hub.mode=publish&hub.url=http%3A%2F%2Fwww.example.com%2Ftopic&hub.url=http%3A%2F%2Fwww.example.com%2Ftopic2',
$client->getRequest()->getContent());
}
Expand All @@ -278,22 +278,22 @@ public function testNotifiesHubAndReportsSuccess()
{
PubSubHubbub::setHttpClient($this->getClientSuccess());
$client = PubSubHubbub::getHttpClient();
$this->_publisher->addHubUrl('http://www.example.com/hub');
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->_publisher->setParameter('foo', 'bar');
$this->_publisher->notifyAll();
$this->assertTrue($this->_publisher->isSuccess());
$this->publisher->addHubUrl('http://www.example.com/hub');
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->publisher->setParameter('foo', 'bar');
$this->publisher->notifyAll();
$this->assertTrue($this->publisher->isSuccess());
}

public function testNotifiesHubAndReportsFail()
{
PubSubHubbub::setHttpClient($this->getClientFail());
$client = PubSubHubbub::getHttpClient();
$this->_publisher->addHubUrl('http://www.example.com/hub');
$this->_publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->_publisher->setParameter('foo', 'bar');
$this->_publisher->notifyAll();
$this->assertFalse($this->_publisher->isSuccess());
$this->publisher->addHubUrl('http://www.example.com/hub');
$this->publisher->addUpdatedTopicUrl('http://www.example.com/topic');
$this->publisher->setParameter('foo', 'bar');
$this->publisher->notifyAll();
$this->assertFalse($this->publisher->isSuccess());
}
}

Expand Down
Loading

0 comments on commit f7641ec

Please sign in to comment.