X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Flegacy%2FApiTest.php;h=c8f0ae914245a6bc07b2da70a1489d2147df9364;hb=c412a1dfc530a10201928eef3777cb42bbb5ab43;hp=a46d346b9a45463cf9c6d16cf714aa65ce8e29e2;hpb=7d1a603ee5e028ab03a56f1512560cffc4aa1028;p=friendica.git diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php index a46d346b9a..c8f0ae9142 100644 --- a/tests/legacy/ApiTest.php +++ b/tests/legacy/ApiTest.php @@ -10,6 +10,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Protocol; use Friendica\DI; +use Friendica\Model\Post; use Friendica\Module\Api\ApiResponse; use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; @@ -146,7 +147,6 @@ class ApiTest extends FixtureTest { self::assertEquals($this->otherUser['id'], $user['id']); self::assertEquals($this->otherUser['id'], $user['id_str']); - self::assertEquals(0, $user['self']); self::assertEquals($this->otherUser['name'], $user['name']); self::assertEquals($this->otherUser['nick'], $user['screen_name']); self::assertFalse($user['verified']); @@ -243,7 +243,7 @@ class ApiTest extends FixtureTest */ public function testApiSource() { - self::assertEquals('api', api_source()); + self::assertEquals('api', BasicAuth::getCurrentApplicationToken()['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', BasicAuth::getCurrentApplicationToken()['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', BasicAuth::getCurrentApplicationToken()['name']); } /** @@ -275,7 +275,7 @@ class ApiTest extends FixtureTest */ public function testApiDate() { - self::assertEquals('Wed Oct 10 00:00:00 +0000 1990', api_date('1990-10-10')); + self::assertEquals('Wed Oct 10 00:00:00 +0000 1990', DateTimeFormat::utc('1990-10-10', DateTimeFormat::API)); } /** @@ -378,37 +378,6 @@ class ApiTest extends FixtureTest BasicAuth::getCurrentUserID(true); } - /** - * Test the api_check_method() function. - * - * @return void - */ - public function testApiCheckMethod() - { - self::assertFalse(api_check_method('method')); - } - - /** - * Test the api_check_method() function with a correct method. - * - * @return void - */ - public function testApiCheckMethodWithCorrectMethod() - { - $_SERVER['REQUEST_METHOD'] = 'method'; - self::assertTrue(api_check_method('method')); - } - - /** - * Test the api_check_method() function with a wildcard. - * - * @return void - */ - public function testApiCheckMethodWithWildcard() - { - self::assertTrue(api_check_method('*')); - } - /** * Test the api_call() function. * @@ -586,6 +555,7 @@ class ApiTest extends FixtureTest */ public function testApiRssExtra() { + /* $user_info = ['url' => 'user_url', 'lang' => 'en']; $result = api_rss_extra([], $user_info); self::assertEquals($user_info, $result['$user']); @@ -596,6 +566,7 @@ class ApiTest extends FixtureTest self::assertArrayHasKey('atom_updated', $result['$rss']); self::assertArrayHasKey('language', $result['$rss']); self::assertArrayHasKey('logo', $result['$rss']); + */ } /** @@ -605,6 +576,7 @@ class ApiTest extends FixtureTest */ public function testApiRssExtraWithoutUserInfo() { + /* $result = api_rss_extra([], null); self::assertIsArray($result['$user']); self::assertArrayHasKey('alternate', $result['$rss']); @@ -614,26 +586,7 @@ class ApiTest extends FixtureTest self::assertArrayHasKey('atom_updated', $result['$rss']); self::assertArrayHasKey('language', $result['$rss']); self::assertArrayHasKey('logo', $result['$rss']); - } - - /** - * Test the api_unique_id_to_nurl() function. - * - * @return void - */ - public function testApiUniqueIdToNurl() - { - self::assertFalse(api_unique_id_to_nurl($this->wrongUserId)); - } - - /** - * Test the api_unique_id_to_nurl() function with a correct ID. - * - * @return void - */ - public function testApiUniqueIdToNurlWithCorrectId() - { - self::assertEquals($this->otherUser['nurl'], api_unique_id_to_nurl($this->otherUser['id'])); + */ } /** @@ -725,7 +678,6 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithGetId() { - // $_GET['user_id'] = $this->otherUser['id']; // self::assertOtherUser(api_get_user()); } @@ -737,7 +689,6 @@ class ApiTest extends FixtureTest public function testApiGetUserWithWrongGetId() { // $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - // $_GET['user_id'] = $this->wrongUserId; // self::assertOtherUser(api_get_user()); } @@ -748,7 +699,6 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithGetName() { - // $_GET['screen_name'] = $this->selfUser['nick']; // self::assertSelfUser(api_get_user()); } @@ -759,7 +709,6 @@ class ApiTest extends FixtureTest */ public function testApiGetUserWithGetUrl() { - // $_GET['profileurl'] = $this->selfUser['nurl']; // self::assertSelfUser(api_get_user()); } @@ -788,60 +737,6 @@ class ApiTest extends FixtureTest // self::assertSelfUser(api_get_user()); } - /** - * Test the api_get_user() function with a valid user. - * - * @return void - */ - public function testApiGetUserWithCorrectUser() - { - self::assertOtherUser(api_get_user($this->otherUser['id'])); - } - - /** - * Test the api_get_user() function with a wrong user ID. - * - * @return void - */ - public function testApiGetUserWithWrongUser() - { - $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class); - self::assertOtherUser(api_get_user($this->wrongUserId)); - } - - /** - * Test the api_get_user() function with a 0 user ID. - * - * @return void - */ - public function testApiGetUserWithZeroUser() - { - self::assertSelfUser(api_get_user(0)); - } - - /** - * Test the api_item_get_user() function. - * - * @return void - */ - public function testApiItemGetUser() - { - $users = api_item_get_user($this->app, []); - self::assertSelfUser($users[0]); - } - - /** - * Test the api_item_get_user() function with a different item parent. - * - * @return void - */ - public function testApiItemGetUserWithDifferentParent() - { - $users = api_item_get_user($this->app, ['thr-parent' => 'item_parent', 'uri' => 'item_uri']); - self::assertSelfUser($users[0]); - self::assertEquals($users[0], $users[1]); - } - /** * Test the Arrays::walkRecursive() function. * @@ -1235,8 +1130,8 @@ class ApiTest extends FixtureTest */ public function testApiStatusShowWithJson() { - $result = api_status_show('json', 1); - self::assertStatus($result['status']); + // $result = api_status_show('json', 1); + // self::assertStatus($result['status']); } /** @@ -1244,8 +1139,8 @@ class ApiTest extends FixtureTest */ public function testApiStatusShowWithXml() { - $result = api_status_show('xml', 1); - self::assertXml($result, 'statuses'); + // $result = api_status_show('xml', 1); + // self::assertXml($result, 'statuses'); } /** @@ -1253,9 +1148,8 @@ class ApiTest extends FixtureTest */ public function testApiGetLastStatus() { - $item = api_get_last_status($this->selfUser['id'], $this->selfUser['id']); - - self::assertNotNull($item); + // $item = api_get_last_status($this->selfUser['id'], $this->selfUser['id']); + // self::assertNotNull($item); } /** @@ -1271,7 +1165,6 @@ class ApiTest extends FixtureTest self::assertEquals('DFRN', $result['user']['location']); self::assertEquals($this->selfUser['name'], $result['user']['name']); self::assertEquals($this->selfUser['nick'], $result['user']['screen_name']); - self::assertEquals('dfrn', $result['user']['network']); self::assertTrue($result['user']['verified']); } @@ -1429,7 +1322,6 @@ class ApiTest extends FixtureTest public function testApiSearchWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_search('json'); } @@ -1485,7 +1377,6 @@ class ApiTest extends FixtureTest public function testApiStatusesHomeTimelineWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_home_timeline('json'); } @@ -1556,7 +1447,6 @@ class ApiTest extends FixtureTest public function testApiStatusesPublicTimelineWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_public_timeline('json'); } @@ -1610,7 +1500,6 @@ class ApiTest extends FixtureTest public function testApiStatusesNetworkpublicTimelineWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_networkpublic_timeline('json'); } @@ -1673,7 +1562,6 @@ class ApiTest extends FixtureTest public function testApiStatusesShowWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_show('json'); } @@ -1714,7 +1602,6 @@ class ApiTest extends FixtureTest public function testApiConversationShowWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_conversation_show('json'); } @@ -1830,7 +1717,6 @@ class ApiTest extends FixtureTest public function testApiStatusesMentionsWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_mentions('json'); } @@ -1853,10 +1739,12 @@ class ApiTest extends FixtureTest */ public function testApiStatusesUserTimeline() { + $_REQUEST['user_id'] = 42; $_REQUEST['max_id'] = 10; $_REQUEST['exclude_replies'] = true; - $_REQUEST['conversation_id'] = 1; - $result = api_statuses_user_timeline('json'); + $_REQUEST['conversation_id'] = 7; + + $result = api_statuses_user_timeline('json'); self::assertNotEmpty($result['status']); foreach ($result['status'] as $status) { self::assertStatus($status); @@ -1870,8 +1758,10 @@ class ApiTest extends FixtureTest */ public function testApiStatusesUserTimelineWithNegativePage() { - $_REQUEST['page'] = -2; - $result = api_statuses_user_timeline('json'); + $_REQUEST['user_id'] = 42; + $_REQUEST['page'] = -2; + + $result = api_statuses_user_timeline('json'); self::assertNotEmpty($result['status']); foreach ($result['status'] as $status) { self::assertStatus($status); @@ -1897,7 +1787,6 @@ class ApiTest extends FixtureTest public function testApiStatusesUserTimelineWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_statuses_user_timeline('json'); } @@ -2026,7 +1915,6 @@ class ApiTest extends FixtureTest public function testApiFavoritesWithUnallowedUser() { $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - $_GET['screen_name'] = $this->selfUser['nick']; BasicAuth::setCurrentUserID(); api_favorites('json'); } @@ -2109,6 +1997,7 @@ class ApiTest extends FixtureTest */ public function testApiConvertItem() { + /* $result = api_convert_item( [ 'network' => 'feed', @@ -2143,6 +2032,7 @@ class ApiTest extends FixtureTest ); self::assertStringStartsWith('item_title', $result['text']); self::assertStringStartsWith('