4 files changed, 8 insertions, 10 deletions

diff --git a/tests/integration/fixtures/feedfixture.php b/tests/integration/fixtures/feedfixture.php
index 8c87a8efd..5394ebf6b 100644
--- a/tests/integration/fixtures/feedfixture.php
+++ b/tests/integration/fixtures/feedfixture.php
@@ -21,7 +21,7 @@ class FeedFixture extends Feed {
 
     public function __construct(array $defaults=[])  {
         parent::__construct();
-        $defaults = array_combine([
+        $defaults = array_merge([
             'userId' => 'test',
             'urlHash' => 'urlHash',
             'url' => 'http://the.url.com',
@@ -29,7 +29,6 @@ class FeedFixture extends Feed {
             'faviconLink' => 'http://the.faviconLink.com',
             'added' => 9,
             'folderId' => 0,
-            'unreadCount' => 0,
             'link' => 'http://thelink.com',
             'preventUpdate' => false,
             'deletedAt' => 0,
diff --git a/tests/integration/fixtures/fixture.php b/tests/integration/fixtures/fixture.php
index 52015ebc2..a5bceda17 100644
--- a/tests/integration/fixtures/fixture.php
+++ b/tests/integration/fixtures/fixture.php
@@ -15,12 +15,11 @@ namespace OCA\News\Tests\Integration\Fixtures;
 
 trait Fixture {
 
-    public function fillDefaults(array $defaults=[]) {
+    protected function fillDefaults(array $defaults=[]) {
         foreach ($defaults as $key => $value) {
             $method = 'set' . ucfirst($key);
             $this->$method($value);
         }
-        $this->resetUpdatedFields();
     }
 
 }
\ No newline at end of file
diff --git a/tests/integration/fixtures/folderfixture.php b/tests/integration/fixtures/folderfixture.php
index 872ee33b8..2c884c6ed 100644
--- a/tests/integration/fixtures/folderfixture.php
+++ b/tests/integration/fixtures/folderfixture.php
@@ -20,7 +20,7 @@ class FolderFixture extends Folder {
 
     public function __construct(array $defaults=[])  {
         parent::__construct();
-        $defaults = array_combine([
+        $defaults = array_merge([
             'parentId' => 0,
             'name' => 'folder',
             'userId' => 'test',
diff --git a/tests/integration/fixtures/itemfixture.php b/tests/integration/fixtures/itemfixture.php
index ac9191c4d..8914773dc 100644
--- a/tests/integration/fixtures/itemfixture.php
+++ b/tests/integration/fixtures/itemfixture.php
@@ -20,8 +20,7 @@ class ItemFixture extends Item {
 
     public function __construct(array $defaults=[])  {
         parent::__construct();
-        $defaults = array_combine([
-            'guid' => 'guid',
+        $defaults = array_merge([
             'url' => 'http://google.de',
             'title' => 'title',
             'author' => 'author',
@@ -34,17 +33,18 @@ class ItemFixture extends Item {
             'lastModified' => 113,
             'rtl' => false,
         ], $defaults);
-        $this->fillDefaults($defaults);
 
         if (!array_key_exists('guid', $defaults)) {
-            $this->setGuid($this->getTitle());
+            $defaults['guid'] = $defaults['title'];
         }
 
         if (!array_key_exists('guidHash', $defaults)) {
-            $this->setGuidHash($this->getGuid());
+            $defaults['guidHash'] = $defaults['guid'];
         }
 
         $this->generateSearchIndex();
+
+        $this->fillDefaults($defaults);
     }
 
 }