Partially fixing source detection

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

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index aae120dfb378ec1237a9b001738982244e9ddca1..9d682f4155926216ef9dfe51e085b8c18067499c 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -243,7 +243,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiSource()
        {
-               self::assertEquals('api', api_source());
+               self::assertEquals('api', BaseApi::getCurrentApplication()['name']);
        }
 
        /**
@@ -254,7 +254,7 @@ class ApiTest extends FixtureTest
        public function testApiSourceWithTwidere()
        {
                $_SERVER['HTTP_USER_AGENT'] = 'Twidere';
-               self::assertEquals('Twidere', api_source());
+               self::assertEquals('Twidere', BaseApi::getCurrentApplication()['name']);
        }
 
        /**
@@ -264,8 +264,8 @@ class ApiTest extends FixtureTest
         */
        public function testApiSourceWithGet()
        {
-               $_GET['source'] = 'source_name';
-               self::assertEquals('source_name', api_source());
+               $_REQUEST['source'] = 'source_name';
+               self::assertEquals('source_name', BaseApi::getCurrentApplication()['name']);
        }
 
        /**
@@ -2162,8 +2162,8 @@ class ApiTest extends FixtureTest
         */
        public function testApiFormatItemsActivities()
        {
-               $item   = ['uid' => 0, 'uri' => ''];
-               $result = api_format_items_activities($item);
+               $item   = ['uid' => 0, 'uri-id' => 1];
+               $result = DI::friendicaActivities()->createFromUriId($item['uri-id'], $item['uid']);
                self::assertArrayHasKey('like', $result);
                self::assertArrayHasKey('dislike', $result);
                self::assertArrayHasKey('attendyes', $result);
@@ -2178,8 +2178,8 @@ class ApiTest extends FixtureTest
         */
        public function testApiFormatItemsActivitiesWithXml()
        {
-               $item   = ['uid' => 0, 'uri' => ''];
-               $result = api_format_items_activities($item, 'xml');
+               $item   = ['uid' => 0, 'uri-id' => 1];
+               $result = DI::friendicaActivities()->createFromUriId($item['uri-id'], $item['uid'], 'xml');
                self::assertArrayHasKey('friendica:like', $result);
                self::assertArrayHasKey('friendica:dislike', $result);
                self::assertArrayHasKey('friendica:attendyes', $result);