Add timestamps for all entities in milisecond unix time format

3 files changed, 6 insertions, 7 deletions

diff --git a/tests/unit/service/FeedServiceTest.php b/tests/unit/service/FeedServiceTest.php
index efd7e5f33..ef16b9e78 100644
--- a/tests/unit/service/FeedServiceTest.php
+++ b/tests/unit/service/FeedServiceTest.php
@@ -47,7 +47,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $this->loggerParams = ['hi'];
         $this->time = 222;
         $this->autoPurgeMinimumInterval = 10;
-        $timeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+        $timeFactory = $this->getMockBuilder('\OCA\News\Utility\Time')
             ->disableOriginalConstructor()
             ->getMock();
         $timeFactory->expects($this->any())
@@ -760,7 +760,6 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $item->setEnclosureLink('lin');
         $item->setUnread();
         $item->setUnstarred();
-        $item->setLastModified($this->time);
         $item->generateSearchIndex();
 
         $json = $item->toExport(['feed3' => $feed]);
@@ -817,7 +816,6 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase {
         $item->setEnclosureLink('lin');
         $item->setUnread();
         $item->setUnstarred();
-        $item->setLastModified($this->time);
         $item->generateSearchIndex();
 
         $json = $item->toExport(['feed3' => $feed]);
diff --git a/tests/unit/service/FolderServiceTest.php b/tests/unit/service/FolderServiceTest.php
index 275bc8992..319a896d6 100644
--- a/tests/unit/service/FolderServiceTest.php
+++ b/tests/unit/service/FolderServiceTest.php
@@ -30,7 +30,7 @@ class FolderServiceTest extends \PHPUnit_Framework_TestCase {
             ->disableOriginalConstructor()
             ->getMock();
         $this->time = 222;
-        $timeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+        $timeFactory = $this->getMockBuilder('\OCA\News\Utility\Time')
             ->disableOriginalConstructor()
             ->getMock();
         $timeFactory->expects($this->any())
diff --git a/tests/unit/service/ItemServiceTest.php b/tests/unit/service/ItemServiceTest.php
index e9bf47490..e562757f4 100644
--- a/tests/unit/service/ItemServiceTest.php
+++ b/tests/unit/service/ItemServiceTest.php
@@ -34,12 +34,15 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
 
     protected function setUp(){
         $this->time = 222;
-        $this->timeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+        $this->timeFactory = $this->getMockBuilder('\OCA\News\Utility\Time')
             ->disableOriginalConstructor()
             ->getMock();
         $this->timeFactory->expects($this->any())
             ->method('getTime')
             ->will($this->returnValue($this->time));
+        $this->timeFactory->expects($this->any())
+            ->method('getMicroTime')
+            ->will($this->returnValue($this->time));
         $this->mapper = $this->getMockBuilder('\OCA\News\Db\ItemMapper')
             ->disableOriginalConstructor()
             ->getMock();
@@ -219,7 +222,6 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
         $expectedItem->setStatus(128);
         $expectedItem->setStarred();
         $expectedItem->setId($itemId);
-        $expectedItem->setLastModified($this->time);
 
         $this->mapper->expects($this->once())
             ->method('findByGuidHash')
@@ -253,7 +255,6 @@ class ItemServiceTest extends \PHPUnit_Framework_TestCase {
         $expectedItem->setStatus(128);
         $expectedItem->setUnstarred();
         $expectedItem->setId($itemId);
-        $expectedItem->setLastModified($this->time);
 
         $this->mapper->expects($this->once())
             ->method('findByGuidHash')