summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2016-10-02 18:05:49 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2016-10-02 18:05:49 +0200
commit8d639753606e8e8a4ae14edb8fd2f37fb6b92995 (patch)
tree4b4437fad6ca3bd0c9b3dbeaca4ccf13f622961f /tests
parente4e226c394ccbbfd952ab38d2317d354211ead6d (diff)
revert
Diffstat (limited to 'tests')
-rw-r--r--tests/Unit/Controller/ExportControllerTest.php4
-rw-r--r--tests/Unit/Db/ItemTest.php9
-rw-r--r--tests/Unit/Fetcher/FeedFetcherTest.php12
-rw-r--r--tests/Unit/Service/FeedServiceTest.php4
4 files changed, 6 insertions, 23 deletions
diff --git a/tests/Unit/Controller/ExportControllerTest.php b/tests/Unit/Controller/ExportControllerTest.php
index 42fb2ac85..89dcb0198 100644
--- a/tests/Unit/Controller/ExportControllerTest.php
+++ b/tests/Unit/Controller/ExportControllerTest.php
@@ -119,10 +119,10 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase {
);
$this->assertEquals('[{"guid":null,"url":null,"title":null,' .
- '"author":null,"pubDate":null,"updatedDate":null,"body":null,"enclosureMime":null,' .
+ '"author":null,"pubDate":null,"body":null,"enclosureMime":null,' .
'"enclosureLink":null,"unread":false,"starred":false,' .
'"feedLink":"http:\/\/goo","rtl":null},{"guid":null,"url":null,' .
- '"title":null,"author":null,"pubDate":null,"updatedDate":null,"body":null,' .
+ '"title":null,"author":null,"pubDate":null,"body":null,' .
'"enclosureMime":null,"enclosureLink":null,"unread":false,' .
'"starred":false,"feedLink":"http:\/\/gee","rtl":null}]',
$return->render());
diff --git a/tests/Unit/Db/ItemTest.php b/tests/Unit/Db/ItemTest.php
index f26cf6ff9..bdc0793a2 100644
--- a/tests/Unit/Db/ItemTest.php
+++ b/tests/Unit/Db/ItemTest.php
@@ -61,7 +61,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
$item->setTitle('title');
$item->setAuthor('author');
$item->setPubDate(123);
- $item->setUpdatedDate(234);
$item->setBody('body');
$item->setEnclosureMime('audio/ogg');
$item->setEnclosureLink('enclink');
@@ -82,7 +81,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
'title' => 'title',
'author' => 'author',
'pubDate' => 123,
- 'updatedDate' => 234,
'body' => 'body',
'enclosureMime' => 'audio/ogg',
'enclosureLink' => 'enclink',
@@ -106,7 +104,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
$item->setTitle('title');
$item->setAuthor('author');
$item->setPubDate(123);
- $item->setUpdatedDate(234);
$item->setBody('<body><div>this is a test</body>');
$item->setEnclosureMime('audio/ogg');
$item->setEnclosureLink('enclink');
@@ -126,7 +123,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
'title' => 'title',
'author' => 'author',
'pubDate' => 123,
- 'updatedDate' => 234,
'body' => '<body><div>this is a test</body>',
'enclosureMime' => 'audio/ogg',
'enclosureLink' => 'enclink',
@@ -149,7 +145,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
$item->setTitle('title');
$item->setAuthor('author');
$item->setPubDate(123);
- $item->setUpdatedDate(234);
$item->setBody('body');
$item->setEnclosureMime('audio/ogg');
$item->setEnclosureLink('enclink');
@@ -170,7 +165,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
'title' => 'title',
'author' => 'author',
'pubDate' => 123,
- 'updatedDate' => 234,
'body' => 'body',
'enclosureMime' => 'audio/ogg',
'enclosureLink' => 'enclink',
@@ -190,7 +184,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
$item->setTitle('title');
$item->setAuthor('author');
$item->setPubDate(123);
- $item->setUpdatedDate(234);
$item->setBody('body');
$item->setEnclosureMime('audio/ogg');
$item->setEnclosureLink('enclink');
@@ -228,7 +221,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
'title' => $item->getTitle(),
'author' => $item->getAuthor(),
'pubDate' => $item->getPubDate(),
- 'updatedDate' => $item->getUpdatedDate(),
'body' => $item->getBody(),
'enclosureMime' => $item->getEnclosureMime(),
'enclosureLink' => $item->getEnclosureLink(),
@@ -252,7 +244,6 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
'title' => $item->getTitle(),
'author' => $item->getAuthor(),
'pubDate' => $item->getPubDate(),
- 'updatedDate' => $item->getUpdatedDate(),
'body' => $item->getBody(),
'enclosureMime' => $item->getEnclosureMime(),
'enclosureLink' => $item->getEnclosureLink(),
diff --git a/tests/Unit/Fetcher/FeedFetcherTest.php b/tests/Unit/Fetcher/FeedFetcherTest.php
index 930cf4c99..5266f0708 100644
--- a/tests/Unit/Fetcher/FeedFetcherTest.php
+++ b/tests/Unit/Fetcher/FeedFetcherTest.php
@@ -38,7 +38,6 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
private $title;
private $guid;
private $pub;
- private $updated;
private $body;
private $author;
private $enclosureLink;
@@ -111,7 +110,6 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$this->body2 = 'let the bodies hit the floor ' .
'<a target="_blank" href="test">test</a>';
$this->pub = 23111;
- $this->updated = 23444;
$this->author = '&lt;boogieman';
$this->enclosureLink = 'http://enclosure.you';
@@ -211,15 +209,11 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$item = new Item();
date_default_timezone_set('America/Los_Angeles');
-
- $pubdate = \Datetime::createFromFormat('U',$this->pub);
- $this->expectItem('getPublishedDate', $pubdate);
+ $date = new \DateTime();
+ $date->setTimestamp($this->pub);
+ $this->expectItem('getDate', $date);
$item->setPubDate($this->pub);
- $update = \Datetime::createFromFormat('U',$this->updated);
- $this->expectItem('getUpdatedDate', $update);
- $item->setUpdatedDate($this->updated);
-
$item->setStatus(0);
$item->setUnread();
$item->setUrl($this->permalink);
diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php
index 68d25df9e..99cd9b11b 100644
--- a/tests/Unit/Service/FeedServiceTest.php
+++ b/tests/Unit/Service/FeedServiceTest.php
@@ -384,7 +384,6 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
$item->setGuidHash(md5('hi'));
$item->setFeedId(3);
$item->setPubDate(2);
- $item->setUpdatedDate(2);
$item->setTitle('hey');
$item->setAuthor('aut');
$item->setBody('new');
@@ -397,7 +396,6 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
$item->setGuidHash(md5('hi'));
$item->setFeedId(3);
$item->setPubDate(1);
- $item->setUpdatedDate(1);
$item->setTitle('ho');
$item->setAuthor('auto');
$item->setBody('old');
@@ -405,7 +403,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
return $item;
}
- public function testUpdateUpdatesWhenUpdateddateIsNewer() {
+ public function testUpdateUpdatesWhenPubdateIsNewer() {
$feed = $this->createUpdateFeed();
$item = $this->createUpdateItem();
$item2 = $this->createUpdateItem2();
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 06:08:49 +0000