X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Flegacy%2FApiTest.php;h=12475fd16c3d5a6eecdf1171bf03e764e04d82bf;hb=66db55f0cdb7340602154f2fa411daab6aae9459;hp=c94571d85771ea60ed49d654bcf546c7a3b8ed1e;hpb=11bc9682948471ec9a225f8c8f70b1604a90092f;p=friendica.git diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php index c94571d857..12475fd16c 100644 --- a/tests/legacy/ApiTest.php +++ b/tests/legacy/ApiTest.php @@ -6,12 +6,17 @@ namespace Friendica\Test\legacy; use Friendica\App; -use Friendica\Core\Config\IConfig; -use Friendica\Core\PConfig\IPConfig; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Protocol; use Friendica\DI; +use Friendica\Module\Api\ApiResponse; +use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; +use Friendica\Security\BasicAuth; use Friendica\Test\FixtureTest; +use Friendica\Util\Arrays; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; use Monolog\Handler\TestHandler; @@ -44,7 +49,7 @@ class ApiTest extends FixtureTest /** @var App */ protected $app; - /** @var IConfig */ + /** @var IManageConfigValues */ protected $config; /** @@ -58,8 +63,8 @@ class ApiTest extends FixtureTest parent::setUp(); - /** @var IConfig $config */ - $this->config = $this->dice->create(IConfig::class); + /** @var IManageConfigValues $config */ + $this->config = $this->dice->create(IManageConfigValues::class); $this->config->set('system', 'url', 'http://localhost'); $this->config->set('system', 'hostname', 'localhost'); @@ -76,8 +81,7 @@ class ApiTest extends FixtureTest /** @var App app */ $this->app = DI::app(); - $this->app->argc = 1; - $this->app->argv = ['']; + DI::args()->setArgc(1); // User data that the test database is populated with $this->selfUser = [ @@ -298,7 +302,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_login() function without any login. + * Test the BasicAuth::getCurrentUserID() function without any login. * * @runInSeparateProcess * @preserveGlobalState disabled @@ -307,11 +311,11 @@ class ApiTest extends FixtureTest public function testApiLoginWithoutLogin() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - api_login($this->app); + BasicAuth::getCurrentUserID(true); } /** - * Test the api_login() function with a bad login. + * Test the BasicAuth::getCurrentUserID() function with a bad login. * * @runInSeparateProcess * @preserveGlobalState disabled @@ -321,11 +325,11 @@ class ApiTest extends FixtureTest { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); $_SERVER['PHP_AUTH_USER'] = 'user@server'; - api_login($this->app); + BasicAuth::getCurrentUserID(true); } /** - * Test the api_login() function with oAuth. + * Test the BasicAuth::getCurrentUserID() function with oAuth. * * @return void */ @@ -335,7 +339,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_login() function with authentication provided by an addon. + * Test the BasicAuth::getCurrentUserID() function with authentication provided by an addon. * * @return void */ @@ -345,7 +349,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_login() function with a correct login. + * Test the BasicAuth::getCurrentUserID() function with a correct login. * * @runInSeparateProcess * @preserveGlobalState disabled @@ -355,11 +359,11 @@ class ApiTest extends FixtureTest { $_SERVER['PHP_AUTH_USER'] = 'Test user'; $_SERVER['PHP_AUTH_PW'] = 'password'; - api_login($this->app); + BasicAuth::getCurrentUserID(true); } /** - * Test the api_login() function with a remote user. + * Test the BasicAuth::getCurrentUserID() function with a remote user. * * @runInSeparateProcess * @preserveGlobalState disabled @@ -368,7 +372,7 @@ class ApiTest extends FixtureTest { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); $_SERVER['REDIRECT_REMOTE_USER'] = '123456dXNlcjpwYXNzd29yZA=='; - api_login($this->app); + BasicAuth::getCurrentUserID(true); } /** @@ -466,46 +470,6 @@ class ApiTest extends FixtureTest ); } - /** - * Test the api_call() function without any result. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiCallWithNoResult() - { - global $API; - $API['api_path'] = [ - 'method' => 'method', - 'func' => function () { - return false; - } - ]; - $_SERVER['REQUEST_METHOD'] = 'method'; - $_SERVER['QUERY_STRING'] = 'pagename=api_path'; - - $args = DI::args()->determine($_SERVER, $_GET); - - self::assertEquals( - '{"status":{"error":"Internal Server Error","code":"500 Internal Server Error","request":"api_path"}}', - api_call($this->app, $args) - ); - } - - /** - * Test the api_call() function with an unimplemented API. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiCallWithUninplementedApi() - { - self::assertEquals( - '{"status":{"error":"Not Found","code":"404 Not Found","request":""}}', - api_call($this->app) - ); - } - /** * Test the api_call() function with a JSON result. * @@ -612,129 +576,6 @@ class ApiTest extends FixtureTest ); } - /** - * Test the api_call() function with an unallowed method. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiCallWithWrongMethod() - { - global $API; - $API['api_path'] = ['method' => 'method']; - - $_SERVER['QUERY_STRING'] = 'pagename=api_path'; - - $args = DI::args()->determine($_SERVER, $_GET); - - self::assertEquals( - '{"status":{"error":"Method Not Allowed","code":"405 Method Not Allowed","request":"api_path"}}', - api_call($this->app, $args) - ); - } - - /** - * Test the api_call() function with an unauthorized user. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiCallWithWrongAuth() - { - global $API; - $API['api_path'] = [ - 'method' => 'method', - 'auth' => true - ]; - $_SESSION['authenticated'] = false; - $_SERVER['REQUEST_METHOD'] = 'method'; - $_SERVER['QUERY_STRING'] = 'pagename=api_path'; - - $args = DI::args()->determine($_SERVER, $_GET); - - self::assertEquals( - '{"status":{"error":"This API requires login","code":"401 Unauthorized","request":"api_path"}}', - api_call($this->app, $args) - ); - } - - /** - * Test the api_error() function with a JSON result. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiErrorWithJson() - { - self::assertEquals( - '{"status":{"error":"error_message","code":"200 OK","request":""}}', - api_error('json', new HTTPException\OKException('error_message'), DI::args()) - ); - } - - /** - * Test the api_error() function with an XML result. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiErrorWithXml() - { - self::assertEquals( - '' . "\n" . - '' . "\n" . - ' error_message' . "\n" . - ' 200 OK' . "\n" . - ' ' . "\n" . - '' . "\n", - api_error('xml', new HTTPException\OKException('error_message'), DI::args()) - ); - } - - /** - * Test the api_error() function with an RSS result. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiErrorWithRss() - { - self::assertEquals( - '' . "\n" . - '' . "\n" . - ' error_message' . "\n" . - ' 200 OK' . "\n" . - ' ' . "\n" . - '' . "\n", - api_error('rss', new HTTPException\OKException('error_message'), DI::args()) - ); - } - - /** - * Test the api_error() function with an Atom result. - * - * @runInSeparateProcess - * @preserveGlobalState disabled - */ - public function testApiErrorWithAtom() - { - self::assertEquals( - '' . "\n" . - '' . "\n" . - ' error_message' . "\n" . - ' 200 OK' . "\n" . - ' ' . "\n" . - '' . "\n", - api_error('atom', new HTTPException\OKException('error_message'), DI::args()) - ); - } - /** * Test the api_rss_extra() function. * @@ -799,7 +640,7 @@ class ApiTest extends FixtureTest */ public function testApiGetUser() { - $user = api_get_user($this->app); + $user = api_get_user(); self::assertSelfUser($user); self::assertEquals('708fa0', $user['profile_sidebar_fill_color']); self::assertEquals('6fdbe8', $user['profile_link_color']); @@ -813,9 +654,9 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithFrioSchema() { - $pConfig = $this->dice->create(IPConfig::class); + $pConfig = $this->dice->create(IManagePersonalConfigValues::class); $pConfig->set($this->selfUser['id'], 'frio', 'schema', 'red'); - $user = api_get_user($this->app); + $user = api_get_user(); self::assertSelfUser($user); self::assertEquals('708fa0', $user['profile_sidebar_fill_color']); self::assertEquals('6fdbe8', $user['profile_link_color']); @@ -829,9 +670,9 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithEmptyFrioSchema() { - $pConfig = $this->dice->create(IPConfig::class); + $pConfig = $this->dice->create(IManagePersonalConfigValues::class); $pConfig->set($this->selfUser['id'], 'frio', 'schema', '---'); - $user = api_get_user($this->app); + $user = api_get_user(); self::assertSelfUser($user); self::assertEquals('708fa0', $user['profile_sidebar_fill_color']); self::assertEquals('6fdbe8', $user['profile_link_color']); @@ -845,12 +686,12 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithCustomFrioSchema() { - $pConfig = $this->dice->create(IPConfig::class); + $pConfig = $this->dice->create(IManagePersonalConfigValues::class); $pConfig->set($this->selfUser['id'], 'frio', 'schema', '---'); $pConfig->set($this->selfUser['id'], 'frio', 'nav_bg', '#123456'); $pConfig->set($this->selfUser['id'], 'frio', 'link_color', '#123456'); $pConfig->set($this->selfUser['id'], 'frio', 'background_color', '#123456'); - $user = api_get_user($this->app); + $user = api_get_user(); self::assertSelfUser($user); self::assertEquals('123456', $user['profile_sidebar_fill_color']); self::assertEquals('123456', $user['profile_link_color']); @@ -868,7 +709,7 @@ class ApiTest extends FixtureTest $_SERVER['PHP_AUTH_USER'] = 'Test user'; $_SERVER['PHP_AUTH_PW'] = 'password'; $_SESSION['allow_api'] = false; - self::assertFalse(api_get_user($this->app)); + self::assertFalse(api_get_user()); } /** @@ -879,7 +720,7 @@ class ApiTest extends FixtureTest public function testApiGetUserWithGetId() { $_GET['user_id'] = $this->otherUser['id']; - self::assertOtherUser(api_get_user($this->app)); + self::assertOtherUser(api_get_user()); } /** @@ -891,7 +732,7 @@ class ApiTest extends FixtureTest { $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); $_GET['user_id'] = $this->wrongUserId; - self::assertOtherUser(api_get_user($this->app)); + self::assertOtherUser(api_get_user()); } /** @@ -902,7 +743,7 @@ class ApiTest extends FixtureTest public function testApiGetUserWithGetName() { $_GET['screen_name'] = $this->selfUser['nick']; - self::assertSelfUser(api_get_user($this->app)); + self::assertSelfUser(api_get_user()); } /** @@ -913,7 +754,7 @@ class ApiTest extends FixtureTest public function testApiGetUserWithGetUrl() { $_GET['profileurl'] = $this->selfUser['nurl']; - self::assertSelfUser(api_get_user($this->app)); + self::assertSelfUser(api_get_user()); } /** @@ -925,8 +766,8 @@ class ApiTest extends FixtureTest { global $called_api; $called_api = ['api_path']; - $this->app->argv[1] = $this->otherUser['id'] . '.json'; - self::assertOtherUser(api_get_user($this->app)); + DI::args()->setArgv(['', $this->otherUser['id'] . '.json']); + self::assertOtherUser(api_get_user()); } /** @@ -938,7 +779,7 @@ class ApiTest extends FixtureTest { global $called_api; $called_api = ['api', 'api_path']; - self::assertSelfUser(api_get_user($this->app)); + self::assertSelfUser(api_get_user()); } /** @@ -948,7 +789,7 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithCorrectUser() { - self::assertOtherUser(api_get_user($this->app, $this->otherUser['id'])); + self::assertOtherUser(api_get_user($this->otherUser['id'])); } /** @@ -959,7 +800,7 @@ class ApiTest extends FixtureTest public function testApiGetUserWithWrongUser() { $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - self::assertOtherUser(api_get_user($this->app, $this->wrongUserId)); + self::assertOtherUser(api_get_user($this->wrongUserId)); } /** @@ -969,7 +810,7 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithZeroUser() { - self::assertSelfUser(api_get_user($this->app, 0)); + self::assertSelfUser(api_get_user(0)); } /** @@ -996,7 +837,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_walk_recursive() function. + * Test the Arrays::walkRecursive() function. * * @return void */ @@ -1005,7 +846,7 @@ class ApiTest extends FixtureTest $array = ['item1']; self::assertEquals( $array, - api_walk_recursive( + Arrays::walkRecursive( $array, function () { // Should we test this with a callback that actually does something? @@ -1016,7 +857,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_walk_recursive() function with an array. + * Test the Arrays::walkRecursive() function with an array. * * @return void */ @@ -1025,7 +866,7 @@ class ApiTest extends FixtureTest $array = [['item1'], ['item2']]; self::assertEquals( $array, - api_walk_recursive( + Arrays::walkRecursive( $array, function () { // Should we test this with a callback that actually does something? @@ -1036,7 +877,7 @@ class ApiTest extends FixtureTest } /** - * Test the api_reformat_xml() function. + * Test the BaseApi::reformatXML() function. * * @return void */ @@ -1044,12 +885,12 @@ class ApiTest extends FixtureTest { $item = true; $key = ''; - self::assertTrue(api_reformat_xml($item, $key)); + self::assertTrue(ApiResponse::reformatXML($item, $key)); self::assertEquals('true', $item); } /** - * Test the api_reformat_xml() function with a statusnet_api key. + * Test the BaseApi::reformatXML() function with a statusnet_api key. * * @return void */ @@ -1057,12 +898,12 @@ class ApiTest extends FixtureTest { $item = ''; $key = 'statusnet_api'; - self::assertTrue(api_reformat_xml($item, $key)); + self::assertTrue(ApiResponse::reformatXML($item, $key)); self::assertEquals('statusnet:api', $key); } /** - * Test the api_reformat_xml() function with a friendica_api key. + * Test the BaseApi::reformatXML() function with a friendica_api key. * * @return void */ @@ -1070,12 +911,12 @@ class ApiTest extends FixtureTest { $item = ''; $key = 'friendica_api'; - self::assertTrue(api_reformat_xml($item, $key)); + self::assertTrue(ApiResponse::reformatXML($item, $key)); self::assertEquals('friendica:api', $key); } /** - * Test the api_create_xml() function. + * Test the BaseApi::createXML() function. * * @return void */ @@ -1088,12 +929,12 @@ class ApiTest extends FixtureTest 'xmlns:georss="http://www.georss.org/georss">' . "\n" . ' some_data' . "\n" . '' . "\n", - api_create_xml(['data' => ['some_data']], 'root_element') + DI::apiResponse()->createXML(['data' => ['some_data']], 'root_element') ); } /** - * Test the api_create_xml() function without any XML namespace. + * Test the BaseApi::createXML() function without any XML namespace. * * @return void */ @@ -1104,23 +945,23 @@ class ApiTest extends FixtureTest '' . "\n" . ' some_data' . "\n" . '' . "\n", - api_create_xml(['data' => ['some_data']], 'ok') + DI::apiResponse()->createXML(['data' => ['some_data']], 'ok') ); } /** - * Test the api_format_data() function. + * Test the BaseApi::formatData() function. * * @return void */ public function testApiFormatData() { $data = ['some_data']; - self::assertEquals($data, api_format_data('root_element', 'json', $data)); + self::assertEquals($data, DI::apiResponse()->formatData('root_element', 'json', $data)); } /** - * Test the api_format_data() function with an XML result. + * Test the BaseApi::formatData() function with an XML result. * * @return void */ @@ -1133,7 +974,7 @@ class ApiTest extends FixtureTest 'xmlns:georss="http://www.georss.org/georss">' . "\n" . ' some_data' . "\n" . '' . "\n", - api_format_data('root_element', 'xml', ['data' => ['some_data']]) + DI::apiResponse()->formatData('root_element', 'xml', ['data' => ['some_data']]) ); } @@ -1198,7 +1039,7 @@ class ApiTest extends FixtureTest */ public function testApiStatusesMediap() { - $this->app->argc = 2; + DI::args()->setArgc(2); $_FILES = [ 'media' => [ @@ -1370,7 +1211,7 @@ class ApiTest extends FixtureTest ] ]; $app = DI::app(); - $app->argc = 2; + DI::args()->setArgc(2); $result = api_media_upload(); self::assertEquals('image/png', $result['media']['image']['image_type']); @@ -1793,8 +1634,8 @@ class ApiTest extends FixtureTest */ public function testApiStatusesShowWithId() { - $this->app->argv[3] = 1; - $result = api_statuses_show('json'); + DI::args()->setArgv(['', '', '', 1]); + $result = api_statuses_show('json'); self::assertStatus($result['status']); } @@ -1805,7 +1646,7 @@ class ApiTest extends FixtureTest */ public function testApiStatusesShowWithConversation() { - $this->app->argv[3] = 1; + DI::args()->setArgv(['', '', '', 1]); $_REQUEST['conversation'] = 1; $result = api_statuses_show('json'); self::assertNotEmpty($result['status']); @@ -1845,7 +1686,7 @@ class ApiTest extends FixtureTest */ public function testApiConversationShowWithId() { - $this->app->argv[3] = 1; + DI::args()->setArgv(['', '', '', 1]); $_REQUEST['max_id'] = 10; $_REQUEST['page'] = -2; $result = api_conversation_show('json'); @@ -1898,13 +1739,13 @@ class ApiTest extends FixtureTest */ public function testApiStatusesRepeatWithId() { - $this->app->argv[3] = 1; - $result = api_statuses_repeat('json'); + DI::args()->setArgv(['', '', '', 1]); + $result = api_statuses_repeat('json'); self::assertStatus($result['status']); // Also test with a shared status - $this->app->argv[3] = 5; - $result = api_statuses_repeat('json'); + DI::args()->setArgv(['', '', '', 5]); + $result = api_statuses_repeat('json'); self::assertStatus($result['status']); } @@ -1938,8 +1779,8 @@ class ApiTest extends FixtureTest */ public function testApiStatusesDestroyWithId() { - $this->app->argv[3] = 1; - $result = api_statuses_destroy('json'); + DI::args()->setArgv(['', '', '', 1]); + $result = api_statuses_destroy('json'); self::assertStatus($result['status']); } @@ -1950,7 +1791,7 @@ class ApiTest extends FixtureTest */ public function testApiStatusesMentions() { - $this->app->user = ['nickname' => $this->selfUser['nick']]; + $this->app->setLoggedInUserNickname($this->selfUser['nick']); $_REQUEST['max_id'] = 10; $result = api_statuses_mentions('json'); self::assertEmpty($result['status']); @@ -2057,8 +1898,7 @@ class ApiTest extends FixtureTest public function testApiFavoritesCreateDestroy() { $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $this->app->argv = ['api', '1.1', 'favorites', 'create']; - $this->app->argc = count($this->app->argv); + DI::args()->setArgv(['api', '1.1', 'favorites', 'create']); api_favorites_create_destroy('json'); } @@ -2070,8 +1910,7 @@ class ApiTest extends FixtureTest public function testApiFavoritesCreateDestroyWithInvalidId() { $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $this->app->argv = ['api', '1.1', 'favorites', 'create', '12.json']; - $this->app->argc = count($this->app->argv); + DI::args()->setArgv(['api', '1.1', 'favorites', 'create', '12.json']); api_favorites_create_destroy('json'); } @@ -2083,9 +1922,8 @@ class ApiTest extends FixtureTest public function testApiFavoritesCreateDestroyWithInvalidAction() { $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $this->app->argv = ['api', '1.1', 'favorites', 'change.json']; - $this->app->argc = count($this->app->argv); - $_REQUEST['id'] = 1; + DI::args()->setArgv(['api', '1.1', 'favorites', 'change.json']); + $_REQUEST['id'] = 1; api_favorites_create_destroy('json'); } @@ -2096,10 +1934,9 @@ class ApiTest extends FixtureTest */ public function testApiFavoritesCreateDestroyWithCreateAction() { - $this->app->argv = ['api', '1.1', 'favorites', 'create.json']; - $this->app->argc = count($this->app->argv); - $_REQUEST['id'] = 3; - $result = api_favorites_create_destroy('json'); + DI::args()->setArgv(['api', '1.1', 'favorites', 'create.json']); + $_REQUEST['id'] = 3; + $result = api_favorites_create_destroy('json'); self::assertStatus($result['status']); } @@ -2110,10 +1947,9 @@ class ApiTest extends FixtureTest */ public function testApiFavoritesCreateDestroyWithCreateActionAndRss() { - $this->app->argv = ['api', '1.1', 'favorites', 'create.rss']; - $this->app->argc = count($this->app->argv); - $_REQUEST['id'] = 3; - $result = api_favorites_create_destroy('rss'); + DI::args()->setArgv(['api', '1.1', 'favorites', 'create.rss']); + $_REQUEST['id'] = 3; + $result = api_favorites_create_destroy('rss'); self::assertXml($result, 'status'); } @@ -2124,10 +1960,9 @@ class ApiTest extends FixtureTest */ public function testApiFavoritesCreateDestroyWithDestroyAction() { - $this->app->argv = ['api', '1.1', 'favorites', 'destroy.json']; - $this->app->argc = count($this->app->argv); - $_REQUEST['id'] = 3; - $result = api_favorites_create_destroy('json'); + DI::args()->setArgv(['api', '1.1', 'favorites', 'destroy.json']); + $_REQUEST['id'] = 3; + $result = api_favorites_create_destroy('json'); self::assertStatus($result['status']); } @@ -2139,8 +1974,7 @@ class ApiTest extends FixtureTest public function testApiFavoritesCreateDestroyWithoutAuthenticatedUser() { $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class); - $this->app->argv = ['api', '1.1', 'favorites', 'create.json']; - $this->app->argc = count($this->app->argv); + DI::args()->setArgv(['api', '1.1', 'favorites', 'create.json']); $_SESSION['authenticated'] = false; api_favorites_create_destroy('json'); } @@ -2192,9 +2026,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 +2047,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('item_body', $result['text']); @@ -2230,9 +2064,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 +2081,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'])); @@ -2269,28 +2103,28 @@ class ApiTest extends FixtureTest 'uri-id' => 1, // We need a long string to test that it is correctly cut 'body' => 'perspiciatis impedit voluptatem quis molestiae ea qui ' . - 'reiciendis dolorum aut ducimus sunt consequatur inventore dolor ' . - 'officiis pariatur doloremque nemo culpa aut quidem qui dolore ' . - 'laudantium atque commodi alias voluptatem non possimus aperiam ' . - 'ipsum rerum consequuntur aut amet fugit quia aliquid praesentium ' . - 'repellendus quibusdam et et inventore mollitia rerum sit autem ' . - 'pariatur maiores ipsum accusantium perferendis vel sit possimus ' . - 'veritatis nihil distinctio qui eum repellat officia illum quos ' . - 'impedit quam iste esse unde qui suscipit aut facilis ut inventore ' . - 'omnis exercitationem quo magnam consequatur maxime aut illum ' . - 'soluta quaerat natus unde aspernatur et sed beatae nihil ullam ' . - 'temporibus corporis ratione blanditiis perspiciatis impedit ' . - 'voluptatem quis molestiae ea qui reiciendis dolorum aut ducimus ' . - 'sunt consequatur inventore dolor officiis pariatur doloremque ' . - 'nemo culpa aut quidem qui dolore laudantium atque commodi alias ' . - 'voluptatem non possimus aperiam ipsum rerum consequuntur aut ' . - 'amet fugit quia aliquid praesentium repellendus quibusdam et et ' . - 'inventore mollitia rerum sit autem pariatur maiores ipsum accusantium ' . - 'perferendis vel sit possimus veritatis nihil distinctio qui eum ' . - 'repellat officia illum quos impedit quam iste esse unde qui ' . - 'suscipit aut facilis ut inventore omnis exercitationem quo magnam ' . - 'consequatur maxime aut illum soluta quaerat natus unde aspernatur ' . - 'et sed beatae nihil ullam temporibus corporis ratione blanditiis', + 'reiciendis dolorum aut ducimus sunt consequatur inventore dolor ' . + 'officiis pariatur doloremque nemo culpa aut quidem qui dolore ' . + 'laudantium atque commodi alias voluptatem non possimus aperiam ' . + 'ipsum rerum consequuntur aut amet fugit quia aliquid praesentium ' . + 'repellendus quibusdam et et inventore mollitia rerum sit autem ' . + 'pariatur maiores ipsum accusantium perferendis vel sit possimus ' . + 'veritatis nihil distinctio qui eum repellat officia illum quos ' . + 'impedit quam iste esse unde qui suscipit aut facilis ut inventore ' . + 'omnis exercitationem quo magnam consequatur maxime aut illum ' . + 'soluta quaerat natus unde aspernatur et sed beatae nihil ullam ' . + 'temporibus corporis ratione blanditiis perspiciatis impedit ' . + 'voluptatem quis molestiae ea qui reiciendis dolorum aut ducimus ' . + 'sunt consequatur inventore dolor officiis pariatur doloremque ' . + 'nemo culpa aut quidem qui dolore laudantium atque commodi alias ' . + 'voluptatem non possimus aperiam ipsum rerum consequuntur aut ' . + 'amet fugit quia aliquid praesentium repellendus quibusdam et et ' . + 'inventore mollitia rerum sit autem pariatur maiores ipsum accusantium ' . + 'perferendis vel sit possimus veritatis nihil distinctio qui eum ' . + 'repellat officia illum quos impedit quam iste esse unde qui ' . + 'suscipit aut facilis ut inventore omnis exercitationem quo magnam ' . + 'consequatur maxime aut illum soluta quaerat natus unde aspernatur ' . + 'et sed beatae nihil ullam temporibus corporis ratione blanditiis', 'plink' => 'item_plink' ] ); @@ -2344,7 +2178,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 +2189,7 @@ class ApiTest extends FixtureTest public function testApiGetAttachmentsWithImage() { $body = '[img]http://via.placeholder.com/1x1.png[/img]'; - self::assertIsArray(api_get_attachments($body)); + self::assertIsArray(api_get_attachments($body, 0)); } /** @@ -2367,7 +2201,7 @@ class ApiTest extends FixtureTest { $_SERVER['HTTP_USER_AGENT'] = 'AndStatus'; $body = '[img]http://via.placeholder.com/1x1.png[/img]'; - self::assertIsArray(api_get_attachments($body)); + self::assertIsArray(api_get_attachments($body, 0)); } /** @@ -2378,7 +2212,7 @@ class ApiTest extends FixtureTest public function testApiGetEntitities() { $text = 'text'; - self::assertIsArray(api_get_entitities($text, 'bbcode')); + self::assertIsArray(api_get_entitities($text, 'bbcode', 0)); } /** @@ -2390,7 +2224,7 @@ class ApiTest extends FixtureTest { $_REQUEST['include_entities'] = 'true'; $text = 'text'; - $result = api_get_entitities($text, 'bbcode'); + $result = api_get_entitities($text, 'bbcode', 0); self::assertIsArray($result['hashtags']); self::assertIsArray($result['symbols']); self::assertIsArray($result['urls']); @@ -2522,52 +2356,6 @@ class ApiTest extends FixtureTest } } - /** - * Test the api_format_items() function. - * - * @return void - */ - public function testApiAccountRateLimitStatus() - { - $result = api_account_rate_limit_status('json'); - self::assertEquals(150, $result['hash']['remaining_hits']); - self::assertEquals(150, $result['hash']['hourly_limit']); - self::assertIsInt($result['hash']['reset_time_in_seconds']); - } - - /** - * Test the api_format_items() function with an XML result. - * - * @return void - */ - public function testApiAccountRateLimitStatusWithXml() - { - $result = api_account_rate_limit_status('xml'); - self::assertXml($result, 'hash'); - } - - /** - * Test the api_help_test() function. - * - * @return void - */ - public function testApiHelpTest() - { - $result = api_help_test('json'); - self::assertEquals(['ok' => 'ok'], $result); - } - - /** - * Test the api_help_test() function with an XML result. - * - * @return void - */ - public function testApiHelpTestWithXml() - { - $result = api_help_test('xml'); - self::assertXml($result, 'ok'); - } - /** * Test the api_lists_list() function. * @@ -2806,6 +2594,7 @@ class ApiTest extends FixtureTest */ public function testApiStatusnetConfig() { + /* $result = api_statusnet_config('json'); self::assertEquals('localhost', $result['config']['site']['server']); self::assertEquals('default', $result['config']['site']['theme']); @@ -2817,17 +2606,7 @@ class ApiTest extends FixtureTest self::assertEquals('false', $result['config']['site']['private']); self::assertEquals('false', $result['config']['site']['ssl']); self::assertEquals(30, $result['config']['site']['shorturllength']); - } - - /** - * Test the api_statusnet_version() function. - * - * @return void - */ - public function testApiStatusnetVersion() - { - $result = api_statusnet_version('json'); - self::assertEquals('0.9.7', $result['version']); + */ } /** @@ -2873,7 +2652,7 @@ class ApiTest extends FixtureTest */ public function testApiDirectMessagesNewWithScreenName() { - $this->app->user = ['nickname' => $this->selfUser['nick']]; + $this->app->setLoggedInUserNickname($this->selfUser['nick']); $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $result = api_direct_messages_new('json'); @@ -2889,7 +2668,7 @@ class ApiTest extends FixtureTest */ public function testApiDirectMessagesNewWithTitle() { - $this->app->user = ['nickname' => $this->selfUser['nick']]; + $this->app->setLoggedInUserNickname($this->selfUser['nick']); $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $_REQUEST['title'] = 'message_title'; @@ -2907,7 +2686,7 @@ class ApiTest extends FixtureTest */ public function testApiDirectMessagesNewWithRss() { - $this->app->user = ['nickname' => $this->selfUser['nick']]; + $this->app->setLoggedInUserNickname($this->selfUser['nick']); $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $result = api_direct_messages_new('rss'); @@ -3154,97 +2933,6 @@ class ApiTest extends FixtureTest $this->markTestIncomplete('exit() kills phpunit as well'); } - /** - * Test the api_fr_photoalbum_delete() function. - * - * @return void - */ - public function testApiFrPhotoalbumDelete() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - api_fr_photoalbum_delete('json'); - } - - /** - * Test the api_fr_photoalbum_delete() function with an album name. - * - * @return void - */ - public function testApiFrPhotoalbumDeleteWithAlbum() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $_REQUEST['album'] = 'album_name'; - api_fr_photoalbum_delete('json'); - } - - /** - * Test the api_fr_photoalbum_delete() function with an album name. - * - * @return void - */ - public function testApiFrPhotoalbumDeleteWithValidAlbum() - { - $this->markTestIncomplete('We need to add a dataset for this.'); - } - - /** - * Test the api_fr_photoalbum_delete() function. - * - * @return void - */ - public function testApiFrPhotoalbumUpdate() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - api_fr_photoalbum_update('json'); - } - - /** - * Test the api_fr_photoalbum_delete() function with an album name. - * - * @return void - */ - public function testApiFrPhotoalbumUpdateWithAlbum() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $_REQUEST['album'] = 'album_name'; - api_fr_photoalbum_update('json'); - } - - /** - * Test the api_fr_photoalbum_delete() function with an album name. - * - * @return void - */ - public function testApiFrPhotoalbumUpdateWithAlbumAndNewAlbum() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $_REQUEST['album'] = 'album_name'; - $_REQUEST['album_new'] = 'album_name'; - api_fr_photoalbum_update('json'); - } - - /** - * Test the api_fr_photoalbum_update() function without an authenticated user. - * - * @return void - */ - public function testApiFrPhotoalbumUpdateWithoutAuthenticatedUser() - { - $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class); - $_SESSION['authenticated'] = false; - api_fr_photoalbum_update('json'); - } - - /** - * Test the api_fr_photoalbum_delete() function with an album name. - * - * @return void - */ - public function testApiFrPhotoalbumUpdateWithValidAlbum() - { - $this->markTestIncomplete('We need to add a dataset for this.'); - } - /** * Test the api_fr_photos_list() function. * @@ -3321,51 +3009,6 @@ class ApiTest extends FixtureTest $this->markTestIncomplete(); } - /** - * Test the api_fr_photo_delete() function. - * - * @return void - */ - public function testApiFrPhotoDelete() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - api_fr_photo_delete('json'); - } - - /** - * Test the api_fr_photo_delete() function without an authenticated user. - * - * @return void - */ - public function testApiFrPhotoDeleteWithoutAuthenticatedUser() - { - $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class); - $_SESSION['authenticated'] = false; - api_fr_photo_delete('json'); - } - - /** - * Test the api_fr_photo_delete() function with a photo ID. - * - * @return void - */ - public function testApiFrPhotoDeleteWithPhotoId() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - $_REQUEST['photo_id'] = 1; - api_fr_photo_delete('json'); - } - - /** - * Test the api_fr_photo_delete() function with a correct photo ID. - * - * @return void - */ - public function testApiFrPhotoDeleteWithCorrectPhotoId() - { - $this->markTestIncomplete('We need to create a dataset for this.'); - } - /** * Test the api_fr_photo_detail() function. * @@ -3518,55 +3161,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. - * - * @return void - */ - public function testApiShareAsRetweet() - { - $item = ['body' => '', 'author-id' => 1, 'owner-id' => 1]; - $result = api_share_as_retweet($item); - self::assertFalse($result); - } - /** * Test the api_share_as_retweet() function with a valid item. * @@ -3726,76 +3320,6 @@ class ApiTest extends FixtureTest $this->markTestIncomplete(); } - /** - * Test the api_friendica_notification() function. - * - * @return void - */ - public function testApiFriendicaNotification() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - api_friendica_notification('json'); - } - - /** - * Test the api_friendica_notification() function without an authenticated user. - * - * @return void - */ - public function testApiFriendicaNotificationWithoutAuthenticatedUser() - { - $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class); - $_SESSION['authenticated'] = false; - api_friendica_notification('json'); - } - - /** - * Test the api_friendica_notification() function with empty result - * - * @return void - */ - public function testApiFriendicaNotificationWithEmptyResult() - { - $this->app->argv = ['api', 'friendica', 'notification']; - $this->app->argc = count($this->app->argv); - $_SESSION['uid'] = 41; - $result = api_friendica_notification('json'); - self::assertEquals(['note' => false], $result); - } - - /** - * Test the api_friendica_notification() function with an XML result. - * - * @return void - */ - public function testApiFriendicaNotificationWithXmlResult() - { - $this->app->argv = ['api', 'friendica', 'notification']; - $this->app->argc = count($this->app->argv); - $result = api_friendica_notification('xml'); - $dateRel = Temporal::getRelativeDate('2020-01-01 12:12:02'); - $assertXml=<< - - - -XML; - self::assertXmlStringEqualsXmlString($assertXml, $result); - } - - /** - * Test the api_friendica_notification() function with an JSON result. - * - * @return void - */ - public function testApiFriendicaNotificationWithJsonResult() - { - $this->app->argv = ['api', 'friendica', 'notification']; - $this->app->argc = count($this->app->argv); - $result = json_encode(api_friendica_notification('json')); - self::assertJson($result); - } - /** * Test the api_friendica_notification_seen() function. * @@ -3825,18 +3349,4 @@ XML; { $this->markTestIncomplete(); } - - /** - * Test the api_saved_searches_list() function. - * - * @return void - */ - public function testApiSavedSearchesList() - { - $result = api_saved_searches_list('json'); - self::assertEquals(1, $result['terms'][0]['id']); - self::assertEquals(1, $result['terms'][0]['id_str']); - self::assertEquals('Saved search', $result['terms'][0]['name']); - self::assertEquals('Saved search', $result['terms'][0]['query']); - } }