Merge pull request #10498 from MrPetovan/bug/10477-frio-csp-error-event-edit

[friendica.git] / tests / legacy / ApiTest.php

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 4a1839f8c2fdd8fbf6672b02b44a8b3dfc3cfaf2..0f09756e4a29e965909041a9f098aad2b049897e 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -157,8 +157,8 @@ class ApiTest extends FixtureTest
         */
        private function assertStatus(array $status = [])
        {
-               self::assertInternalType('string', $status['text'] ?? '');
-               self::assertInternalType('int', $status['id'] ?? '');
+               self::assertIsString($status['text'] ?? '');
+               self::assertIsInt($status['id'] ?? '');
                // We could probably do more checks here.
        }
 
@@ -171,9 +171,9 @@ class ApiTest extends FixtureTest
         */
        private function assertList(array $list = [])
        {
-               self::assertInternalType('string', $list['name']);
-               self::assertInternalType('int', $list['id']);
-               self::assertInternalType('string', $list['id_str']);
+               self::assertIsString($list['name']);
+               self::assertIsInt($list['id']);
+               self::assertIsString('string', $list['id_str']);
                self::assertContains($list['mode'], ['public', 'private']);
                // We could probably do more checks here.
        }
@@ -762,7 +762,7 @@ class ApiTest extends FixtureTest
        public function testApiRssExtraWithoutUserInfo()
        {
                $result = api_rss_extra($this->app, [], null);
-               self::assertInternalType('array', $result['$user']);
+               self::assertIsArray($result['$user']);
                self::assertArrayHasKey('alternate', $result['$rss']);
                self::assertArrayHasKey('self', $result['$rss']);
                self::assertArrayHasKey('base', $result['$rss']);
@@ -2192,9 +2192,9 @@ class ApiTest extends FixtureTest
        public function testApiFormatMessages()
        {
                $result = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 2, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title' . "\n" . 'item_body', $result['text']);
                self::assertEquals(1, $result['id']);
@@ -2213,9 +2213,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getText'] = 'html';
                $result          = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title', $result['title']);
                self::assertEquals('<strong>item_body</strong>', $result['text']);
@@ -2230,9 +2230,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getText'] = 'plain';
                $result          = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title', $result['title']);
                self::assertEquals('item_body', $result['text']);
@@ -2247,9 +2247,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getUserObjects'] = 'false';
                $result                 = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertTrue(!isset($result['sender']));
                self::assertTrue(!isset($result['recipient']));
@@ -2309,13 +2309,13 @@ class ApiTest extends FixtureTest
                        [
                                'network' => 'feed',
                                'title'   => 'item_title',
-                               'uri-id'  => 1,
+                               'uri-id'  => -1,
                                'body'    => '',
                                'plink'   => 'item_plink'
                        ]
                );
-               self::assertEquals("item_title\n\nParent status", $result['text']);
-               self::assertEquals('<h4>item_title</h4><br>Parent statusitem_plink', $result['html']);
+               self::assertEquals("item_title", $result['text']);
+               self::assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
        }
 
        /**
@@ -2344,7 +2344,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachments()
        {
                $body = 'body';
-               self::assertEmpty(api_get_attachments($body));
+               self::assertEmpty(api_get_attachments($body, 0));
        }
 
        /**
@@ -2355,7 +2355,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachmentsWithImage()
        {
                $body = '[img]http://via.placeholder.com/1x1.png[/img]';
-               self::assertInternalType('array', api_get_attachments($body));
+               self::assertIsArray(api_get_attachments($body, 0));
        }
 
        /**
@@ -2367,7 +2367,7 @@ class ApiTest extends FixtureTest
        {
                $_SERVER['HTTP_USER_AGENT'] = 'AndStatus';
                $body                       = '[img]http://via.placeholder.com/1x1.png[/img]';
-               self::assertInternalType('array', api_get_attachments($body));
+               self::assertIsArray(api_get_attachments($body, 0));
        }
 
        /**
@@ -2378,7 +2378,7 @@ class ApiTest extends FixtureTest
        public function testApiGetEntitities()
        {
                $text = 'text';
-               self::assertInternalType('array', api_get_entitities($text, 'bbcode'));
+               self::assertIsArray(api_get_entitities($text, 'bbcode', 0));
        }
 
        /**
@@ -2390,11 +2390,11 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['include_entities'] = 'true';
                $text                         = 'text';
-               $result                       = api_get_entitities($text, 'bbcode');
-               self::assertInternalType('array', $result['hashtags']);
-               self::assertInternalType('array', $result['symbols']);
-               self::assertInternalType('array', $result['urls']);
-               self::assertInternalType('array', $result['user_mentions']);
+               $result                       = api_get_entitities($text, 'bbcode', 0);
+               self::assertIsArray($result['hashtags']);
+               self::assertIsArray($result['symbols']);
+               self::assertIsArray($result['urls']);
+               self::assertIsArray($result['user_mentions']);
        }
 
        /**
@@ -2532,7 +2532,7 @@ class ApiTest extends FixtureTest
                $result = api_account_rate_limit_status('json');
                self::assertEquals(150, $result['hash']['remaining_hits']);
                self::assertEquals(150, $result['hash']['hourly_limit']);
-               self::assertInternalType('int', $result['hash']['reset_time_in_seconds']);
+               self::assertIsInt($result['hash']['reset_time_in_seconds']);
        }
 
        /**
@@ -3518,43 +3518,6 @@ class ApiTest extends FixtureTest
                $this->markTestIncomplete();
        }
 
-       /**
-        * Test the api_friendica_remoteauth() function.
-        *
-        * @return void
-        */
-       public function testApiFriendicaRemoteauth()
-       {
-               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               api_friendica_remoteauth();
-       }
-
-       /**
-        * Test the api_friendica_remoteauth() function with an URL.
-        *
-        * @return void
-        */
-       public function testApiFriendicaRemoteauthWithUrl()
-       {
-               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               $_GET['url']   = 'url';
-               $_GET['c_url'] = 'url';
-               api_friendica_remoteauth();
-       }
-
-       /**
-        * Test the api_friendica_remoteauth() function with a correct URL.
-        *
-        * @return void
-        */
-       public function testApiFriendicaRemoteauthWithCorrectUrl()
-       {
-               $this->markTestIncomplete("We can't use an assertion here because of App->redirect().");
-               $_GET['url']   = 'url';
-               $_GET['c_url'] = $this->selfUser['nurl'];
-               api_friendica_remoteauth();
-       }
-
        /**
         * Test the api_share_as_retweet() function.
         *