Improving test data

diff --git a/include/api.php b/include/api.php
index b65cf77f6a1fbfac066f39727991022a07101c18..a96681b83e81ce95da52224036cd41e86e1b36ba 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1819,15 +1819,10 @@ function api_statuses_networkpublic_timeline($type)
        }
 
        $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-//     $statuses = Post::toArray(Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
-       $statuses = Post::toArray(Post::select(Item::DISPLAY_FIELDLIST, $condition, $params));
-if (empty($statuses)) {
-       return ['status' => [], 'statuses2' => $statuses, 'condition' => $condition, 'params' => $params, 'db' => DBA::errorNo(), 'msg' => DBA::errorMessage()];
-}
+       $statuses = Post::toArray(Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
+
        $ret = api_format_items($statuses, $user_info, false, $type);
-if (empty($ret)) {
-       return ['status' => [], 'ret' => $ret, 'statuses' => $statuses, 'condition' => $condition, 'params' => $params, 'db' => DBA::errorNo(), 'msg' => DBA::errorMessage()];
-}
+
        bindComments($ret);
 
        $data = ['status' => $ret];

diff --git a/tests/datasets/api.fixture.php b/tests/datasets/api.fixture.php
index a07232a8c00e3d8a71fb6539b1ed2acd6e6b2b4b..b30da447c30986c5eef47801ba26ac29d267e25a 100644 (file)
--- a/tests/datasets/api.fixture.php
+++ b/tests/datasets/api.fixture.php
@@ -253,6 +253,21 @@ return [
                        'uid'        => 42,
                        'wall'       => 1,
                ],
+               [
+                       'uri-id'     => 1,
+                       'uid'        => 0,
+                       'wall'       => 0,
+               ],
+               [
+                       'uri-id'     => 3,
+                       'uid'        => 0,
+                       'wall'       => 0,
+               ],
+               [
+                       'uri-id'     => 6,
+                       'uid'        => 0,
+                       'wall'       => 0,
+               ],
        ],
        'post-user' => [
                [
@@ -303,6 +318,54 @@ return [
                        'unseen'      => 0,
                        'origin'      => 1,
                ],
+               [
+                       'id'          => 7,
+                       'uri-id'      => 1,
+                       'uid'         => 0,
+                       'contact-id'  => 42,
+                       'unseen'      => 1,
+                       'origin'      => 0,
+               ],
+               [
+                       'id'          => 8,
+                       'uri-id'      => 2,
+                       'uid'         => 0,
+                       'contact-id'  => 42,
+                       'unseen'      => 0,
+                       'origin'      => 0,
+               ],
+               [
+                       'id'          => 9,
+                       'uri-id'      => 3,
+                       'uid'         => 0,
+                       'contact-id'  => 43,
+                       'unseen'      => 0,
+                       'origin'      => 0,
+               ],
+               [
+                       'id'          => 10,
+                       'uri-id'      => 4,
+                       'uid'         => 0,
+                       'contact-id'  => 44,
+                       'unseen'      => 0,
+                       'origin'      => 0,
+               ],
+               [
+                       'id'          => 11,
+                       'uri-id'      => 5,
+                       'uid'         => 0,
+                       'contact-id'  => 42,
+                       'unseen'      => 0,
+                       'origin'      => 0,
+               ],
+               [
+                       'id'          => 12,
+                       'uri-id'      => 6,
+                       'uid'         => 0,
+                       'contact-id'  => 44,
+                       'unseen'      => 0,
+                       'origin'      => 0,
+               ],
 
        ],
        'item'    => [