From 07eca542a41f56b977bb68054849a1b5a6ea2f63 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 30 Dec 2021 20:16:48 +0100 Subject: [PATCH] Move DirectMessages/Sent tests --- tests/legacy/ApiTest.php | 53 ---------------- .../Api/Twitter/DirectMessages/SentTest.php | 61 +++++++++++++++++++ 2 files changed, 61 insertions(+), 53 deletions(-) create mode 100644 tests/src/Module/Api/Twitter/DirectMessages/SentTest.php diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php index c4b6c373fe..743af75e0a 100644 --- a/tests/legacy/ApiTest.php +++ b/tests/legacy/ApiTest.php @@ -1215,60 +1215,7 @@ class ApiTest extends FixtureTest //self::assertArrayHasKey('direct_message', $result); } - /** - * Test the api_direct_messages_box() function. - * - * @return void - */ - public function testApiDirectMessagesBoxWithVerbose() - { - /* - $result = api_direct_messages_box('json', 'sentbox', 'true'); - self::assertEquals( - [ - '$result' => [ - 'result' => 'error', - 'message' => 'no mails available' - ] - ], - $result - ); - */ - } - /** - * Test the api_direct_messages_box() function with a RSS result. - * - * @return void - */ - public function testApiDirectMessagesBoxWithRss() - { - //$result = api_direct_messages_box('rss', 'sentbox', 'false'); - //self::assertXml($result, 'direct-messages'); - } - - /** - * Test the api_direct_messages_box() function without an authenticated user. - * - * @return void - */ - public function testApiDirectMessagesBoxWithUnallowedUser() - { - //$this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); - //BasicAuth::setCurrentUserID(); - //api_direct_messages_box('json', 'sentbox', 'false'); - } - - /** - * Test the api_direct_messages_sentbox() function. - * - * @return void - */ - public function testApiDirectMessagesSentbox() - { - //$result = api_direct_messages_sentbox('json'); - //self::assertArrayHasKey('direct_message', $result); - } /** * Test the api_direct_messages_conversation() function. diff --git a/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php b/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php new file mode 100644 index 0000000000..3343716622 --- /dev/null +++ b/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php @@ -0,0 +1,61 @@ + Router::GET], ['extension' => 'json']); + $response = $sent->run([ + 'friendica_verbose' => true, + ]); + + $json = $this->toJson($response); + + self::assertEquals('error', $json->result); + self::assertEquals('no mails available', $json->message); + } + + /** + * Test the api_direct_messages_box() function with a RSS result. + * + * @return void + */ + public function testApiDirectMessagesBoxWithRss() + { + $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()); + + $sent = new Sent($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'rss']); + $response = $sent->run(); + + self::assertXml((string)$response->getBody(), 'direct-messages'); + } + + /** + * Test the api_direct_messages_box() function without an authenticated user. + * + * @return void + */ + public function testApiDirectMessagesBoxWithUnallowedUser() + { + self::markTestIncomplete('Needs BasicAuth as dynamic method for overriding first'); + + //$this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class); + //BasicAuth::setCurrentUserID(); + //api_direct_messages_box('json', 'sentbox', 'false'); + } +}