DB: Remove unused fields

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

6 files changed, 82 insertions, 23 deletions

diff --git a/tests/Unit/Db/FeedTest.php b/tests/Unit/Db/FeedTest.php
index 1812b7164..59d36437b 100644
--- a/tests/Unit/Db/FeedTest.php
+++ b/tests/Unit/Db/FeedTest.php
@@ -25,7 +25,6 @@ class FeedTest extends TestCase
         $feed = new Feed();
         $feed->setId(3);
         $feed->setHttpLastModified(44);
-        $feed->setHttpEtag(45);
         $feed->setUrl('http://google.com/some/weird/path');
         $feed->setTitle('title');
         $feed->setFaviconLink('favicon');
@@ -129,4 +128,54 @@ class FeedTest extends TestCase
     }
 
 
+    public function testSetAdded()
+    {
+        $feed = new Feed();
+        $feed->setAdded(15);
+        $this->assertEquals(15, $feed->getAdded());
+    }
+    public function testSetDeletedAt()
+    {
+        $feed = new Feed();
+        $feed->setDeletedAt(15);
+        $this->assertEquals(15, $feed->getDeletedAt());
+    }
+    public function testSetFaviconLink()
+    {
+        $feed = new Feed();
+        $feed->setFaviconLink('https://url');
+        $this->assertEquals('https://url', $feed->getFaviconLink());
+    }
+    public function testSetLastModified()
+    {
+        $feed = new Feed();
+        $feed->setLastModified('15');
+        $this->assertEquals('15', $feed->getLastModified());
+    }
+    public function testSetLastUpdateError()
+    {
+        $feed = new Feed();
+        $feed->setLastUpdateError('NO');
+        $this->assertEquals('NO', $feed->getLastUpdateError());
+    }
+    public function testSetUpdateErrorCount()
+    {
+        $feed = new Feed();
+        $feed->setUpdateErrorCount('5');
+        $this->assertEquals('5', $feed->getUpdateErrorCount());
+    }
+    public function testSetOrdering()
+    {
+        $feed = new Feed();
+        $feed->setOrdering(1);
+        $this->assertEquals(1, $feed->getOrdering());
+    }
+    public function testSetPinned()
+    {
+        $feed = new Feed();
+        $feed->setPinned(true);
+        $this->assertEquals(true, $feed->getPinned());
+    }
+
+
 }
diff --git a/tests/Unit/Db/FolderTest.php b/tests/Unit/Db/FolderTest.php
index 8be6c793f..39ee347b3 100644
--- a/tests/Unit/Db/FolderTest.php
+++ b/tests/Unit/Db/FolderTest.php
@@ -59,4 +59,28 @@ class FolderTest extends TestCase
             ], $folder->jsonSerialize()
         );
     }
+    public function testSetDeletedAt()
+    {
+        $folder = new Folder();
+        $folder->setDeletedAt(15);
+        $this->assertEquals(15, $folder->getDeletedAt());
+    }
+    public function testSetLastModified()
+    {
+        $folder = new Folder();
+        $folder->setLastModified('15');
+        $this->assertEquals('15', $folder->getLastModified());
+    }
+    public function testSetParentId()
+    {
+        $folder = new Folder();
+        $folder->setParentId(15);
+        $this->assertEquals(15, $folder->getParentId());
+    }
+    public function testSetUserId()
+    {
+        $folder = new Folder();
+        $folder->setUserId('15');
+        $this->assertEquals('15', $folder->getUserId());
+    }
 }
\ No newline at end of file
diff --git a/tests/Unit/Db/ItemTest.php b/tests/Unit/Db/ItemTest.php
index c9a353ea7..e871c6157 100644
--- a/tests/Unit/Db/ItemTest.php
+++ b/tests/Unit/Db/ItemTest.php
@@ -29,7 +29,6 @@ class ItemTest extends TestCase
     protected function setUp(): void
     {
         $this->item = new Item();
-        $this->item->setStatus(0);
     }
 
 
@@ -75,7 +74,6 @@ class ItemTest extends TestCase
         $item->setTitle('title');
         $item->setAuthor('author');
         $item->setPubDate(123);
-        $item->setUpdatedDate(234);
         $item->setBody('body');
         $item->setEnclosureMime('audio/ogg');
         $item->setEnclosureLink('enclink');
@@ -83,7 +81,6 @@ class ItemTest extends TestCase
         $item->setMediaDescription('The best video ever');
         $item->setRtl(true);
         $item->setFeedId(1);
-        $item->setStatus(0);
         $item->setUnread(true);
         $item->setStarred(true);
         $item->setLastModified('1111111111234567');
@@ -99,7 +96,7 @@ class ItemTest extends TestCase
             'title' => 'title',
             'author' => 'author',
             'pubDate' => 123,
-            'updatedDate' => 234,
+            'updatedDate' => null,
             'body' => 'body',
             'enclosureMime' => 'audio/ogg',
             'enclosureLink' => 'enclink',
@@ -112,7 +109,8 @@ class ItemTest extends TestCase
             'rtl' => true,
             'fingerprint' => 'fingerprint',
             'contentHash' => 'contentHash'
-            ], $item->toAPI()
+            ],
+            $item->toAPI()
         );
     }
 
@@ -127,14 +125,12 @@ class ItemTest extends 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');
         $item->setMediaThumbnail('https://i2.ytimg.com/vi/E6B3uvhrcQk/hqdefault.jpg');
         $item->setMediaDescription('The best video ever');
         $item->setFeedId(1);
-        $item->setStatus(0);
         $item->setRtl(true);
         $item->setUnread(true);
         $item->setFingerprint('fingerprint');
@@ -150,7 +146,7 @@ class ItemTest extends TestCase
             'title' => 'title',
             'author' => 'author',
             'pubDate' => 123,
-            'updatedDate' => 234,
+            'updatedDate' => null,
             'body' => '<body><div>this is a test</body>',
             'enclosureMime' => 'audio/ogg',
             'enclosureLink' => 'enclink',
@@ -177,7 +173,6 @@ class ItemTest extends TestCase
         $item->setTitle('title');
         $item->setAuthor('author');
         $item->setPubDate(123);
-        $item->setUpdatedDate(234);
         $item->setBody('body');
         $item->setEnclosureMime('audio/ogg');
         $item->setEnclosureLink('enclink');
@@ -185,7 +180,6 @@ class ItemTest extends TestCase
         $item->setMediaDescription('The best video ever');
         $item->setFeedId(1);
         $item->setRtl(true);
-        $item->setStatus(0);
         $item->setUnread(false);
         $item->setStarred(true);
         $item->setLastModified(321);
@@ -201,7 +195,7 @@ class ItemTest extends TestCase
             'title' => 'title',
             'author' => 'author',
             'pubDate' => 123,
-            'updatedDate' => 234,
+            'updatedDate' => null,
             'body' => 'body',
             'enclosureMime' => 'audio/ogg',
             'enclosureLink' => 'enclink',
@@ -225,7 +219,6 @@ class ItemTest extends TestCase
         $item->setTitle('title');
         $item->setAuthor('author');
         $item->setPubDate(123);
-        $item->setUpdatedDate(234);
         $item->setBody('body');
         $item->setEnclosureMime('audio/ogg');
         $item->setEnclosureLink('enclink');
@@ -265,7 +258,7 @@ class ItemTest extends TestCase
             'title' => $item->getTitle(),
             'author' => $item->getAuthor(),
             'pubDate' => $item->getPubDate(),
-            'updatedDate' => $item->getUpdatedDate(),
+            'updatedDate' => null,
             'body' => $item->getBody(),
             'enclosureMime' => $item->getEnclosureMime(),
             'enclosureLink' => $item->getEnclosureLink(),
@@ -292,7 +285,7 @@ class ItemTest extends TestCase
             'title' => $item->getTitle(),
             'author' => $item->getAuthor(),
             'pubDate' => $item->getPubDate(),
-            'updatedDate' => $item->getUpdatedDate(),
+            'updatedDate' => null,
             'body' => $item->getBody(),
             'enclosureMime' => $item->getEnclosureMime(),
             'enclosureLink' => $item->getEnclosureLink(),
diff --git a/tests/Unit/Fetcher/FeedFetcherTest.php b/tests/Unit/Fetcher/FeedFetcherTest.php
index 6a1153b83..acb8e939d 100644
--- a/tests/Unit/Fetcher/FeedFetcherTest.php
+++ b/tests/Unit/Fetcher/FeedFetcherTest.php
@@ -597,8 +597,7 @@ class FeedFetcherTest extends TestCase
              ->setRtl(false)
              ->setLastModified(3)
              ->setPubDate(3)
-             ->setAuthor(html_entity_decode($this->author->getName()))
-             ->setStatus(0);
+             ->setAuthor(html_entity_decode($this->author->getName()));
 
         if ($enclosureType === 'audio/ogg' || $enclosureType === 'video/ogg') {
             $media = $this->getMockbuilder(MediaInterface::class)->getMock();
diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php
index 2d45cea70..f869a3ef7 100644
--- a/tests/Unit/Service/FeedServiceTest.php
+++ b/tests/Unit/Service/FeedServiceTest.php
@@ -710,7 +710,6 @@ class FeedServiceTest extends TestCase
         $feed = Feed::fromRow(
             [
                 'id' => 3,
-                'http_etag' => 'a',
                 'http_last_modified' => 1,
                 'full_text_enabled' => false
             ]
@@ -722,7 +721,6 @@ class FeedServiceTest extends TestCase
             ->willReturnOnConsecutiveCalls($this->returnValue($feed));
 
         $feed2->setFullTextEnabled(false);
-        $feed2->setHttpEtag('a');
         $feed2->setHttpLastModified('1');
         $feed2->resetUpdatedFields();
 
diff --git a/tests/Unit/Service/ItemServiceTest.php b/tests/Unit/Service/ItemServiceTest.php
index 1ab9a7b25..96d22235a 100644
--- a/tests/Unit/Service/ItemServiceTest.php
+++ b/tests/Unit/Service/ItemServiceTest.php
@@ -308,12 +308,10 @@ class ItemServiceTest extends TestCase
         $guidHash = md5('hihi');
 
         $item = new Item();
-        $item->setStatus(128);
         $item->setId($itemId);
         $item->setStarred(true);
 
         $expectedItem = new Item();
-        $expectedItem->setStatus(128);
         $expectedItem->setStarred(true); //workaround to set starred as updated field
         $expectedItem->setStarred(false);
         $expectedItem->setId($itemId);
@@ -336,12 +334,10 @@ class ItemServiceTest extends TestCase
     {
         $itemId = 3;
         $item = new Item();
-        $item->setStatus(128);
         $item->setId($itemId);
         $item->setUnread(true);
 
         $expectedItem = new Item();
-        $expectedItem->setStatus(128);
         $expectedItem->setUnread(false);
         $expectedItem->setId($itemId);
         $expectedItem->setLastModified($this->time);