fix various things

5 files changed, 19 insertions, 12 deletions

diff --git a/tests/integration/fixtures/data/default.php b/tests/integration/fixtures/data/default.php
index b314d9496..5fc0565f3 100644
--- a/tests/integration/fixtures/data/default.php
+++ b/tests/integration/fixtures/data/default.php
@@ -19,12 +19,12 @@ return [
                     'url' => 'http://google.de',
                     'items' => [
                         ['title' => 'a title1'],
-                        ['title' => 'a title2', 'status' => 4],
-                        ['title' => 'a title3', 'status' => 6],
-                        ['title' => 'del1', 'status' => 0],
-                        ['title' => 'del2', 'status' => 0],
-                        ['title' => 'del3', 'status' => 0],
-                        ['title' => 'del4', 'status' => 0]
+                        ['title' => 'a title2', 'starred' => true],
+                        ['title' => 'a title3', 'starred' => true],
+                        ['title' => 'del1', 'read' => true],
+                        ['title' => 'del2', 'read' => true],
+                        ['title' => 'del3', 'read' => true],
+                        ['title' => 'del4', 'read' => true]
                     ]
                 ],
                 [
@@ -67,7 +67,7 @@ return [
             'title' => 'fourth feed',
             'url' => 'http://blog.fefe.de',
             'items' => [
-                ['title' => 'no folder', 'status' => 0]
+                ['title' => 'no folder', 'read' => true]
             ]
         ]
     ]
diff --git a/tests/integration/fixtures/FeedFixture.php b/tests/integration/fixtures/feedfixture.php
index 7b2d68c80..8c87a8efd 100644
--- a/tests/integration/fixtures/FeedFixture.php
+++ b/tests/integration/fixtures/feedfixture.php
@@ -48,4 +48,4 @@ class FeedFixture extends Feed {
         $this->fillDefaults($defaults);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/integration/fixtures/Fixture.php b/tests/integration/fixtures/fixture.php
index 2e546c4a5..52015ebc2 100644
--- a/tests/integration/fixtures/Fixture.php
+++ b/tests/integration/fixtures/fixture.php
@@ -13,7 +13,7 @@
 namespace OCA\News\Tests\Integration\Fixtures;
 
 
-trait Entity {
+trait Fixture {
 
     public function fillDefaults(array $defaults=[]) {
         foreach ($defaults as $key => $value) {
diff --git a/tests/integration/fixtures/FolderFixture.php b/tests/integration/fixtures/folderfixture.php
index 872ee33b8..872ee33b8 100644
--- a/tests/integration/fixtures/FolderFixture.php
+++ b/tests/integration/fixtures/folderfixture.php
diff --git a/tests/integration/fixtures/ItemFixture.php b/tests/integration/fixtures/itemfixture.php
index 412f1c990..ac9191c4d 100644
--- a/tests/integration/fixtures/ItemFixture.php
+++ b/tests/integration/fixtures/itemfixture.php
@@ -35,9 +35,16 @@ class ItemFixture extends Item {
             'rtl' => false,
         ], $defaults);
         $this->fillDefaults($defaults);
+
+        if (!array_key_exists('guid', $defaults)) {
+            $this->setGuid($this->getTitle());
+        }
+
+        if (!array_key_exists('guidHash', $defaults)) {
+            $this->setGuidHash($this->getGuid());
+        }
+
         $this->generateSearchIndex();
-        $this->setGuid($this->getTitle());
-        $this->setGuidHash($this->getGuid());
     }
 
-}
\ No newline at end of file
+}