/** @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 = [
*/
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.
}
*/
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.
}
private function assertXml($result = '', $root_element = '')
{
self::assertStringStartsWith('<?xml version="1.0"?>', $result);
- self::assertContains('<' . $root_element, $result);
+ self::assertStringContainsString('<' . $root_element, $result);
// We could probably do more checks here.
}
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']);
{
global $called_api;
$called_api = ['api_path'];
- $this->app->argv[1] = $this->otherUser['id'] . '.json';
+ DI::args()->setArgv(['', $this->otherUser['id'] . '.json']);
self::assertOtherUser(api_get_user($this->app));
}
*/
public function testApiStatusesMediap()
{
- $this->app->argc = 2;
+ DI::args()->setArgc(2);
$_FILES = [
'media' => [
]
];
$app = DI::app();
- $app->argc = 2;
+ DI::args()->setArgc(2);
$result = api_media_upload();
self::assertEquals('image/png', $result['media']['image']['image_type']);
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], '', true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], '', true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], '', true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('#friendica', $status['text'], '', true);
+ self::assertStringContainsStringIgnoringCase('#friendica', $status['text'], '', true);
}
}
*/
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']);
}
*/
public function testApiStatusesShowWithConversation()
{
- $this->app->argv[3] = 1;
+ DI::args()->setArgv(['', '', '', 1]);
$_REQUEST['conversation'] = 1;
$result = api_statuses_show('json');
self::assertNotEmpty($result['status']);
*/
public function testApiConversationShowWithId()
{
- $this->app->argv[3] = 1;
+ DI::args()->setArgv(['', '', '', 1]);
$_REQUEST['max_id'] = 10;
$_REQUEST['page'] = -2;
$result = api_conversation_show('json');
*/
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']);
}
*/
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']);
}
*/
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']);
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');
}
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');
}
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');
}
*/
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']);
}
*/
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');
}
*/
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']);
}
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');
}
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']);
{
$_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']);
{
$_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']);
{
$_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']));
[
'network' => 'feed',
'title' => 'item_title',
+ '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 ' .
[
'network' => 'feed',
'title' => 'item_title',
+ 'uri-id' => -1,
'body' => '',
'plink' => 'item_plink'
]
);
- self::assertEquals('item_title', $result['text']);
+ self::assertEquals("item_title", $result['text']);
self::assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
}
{
$result = api_convert_item(
[
- 'title' => 'item_title',
- 'body' => 'item_title item_body'
+ 'title' => 'item_title',
+ 'body' => 'item_title item_body',
+ 'uri-id' => 1,
]
);
self::assertEquals('item_title item_body', $result['text']);
public function testApiGetAttachments()
{
$body = 'body';
- self::assertEmpty(api_get_attachments($body));
+ self::assertEmpty(api_get_attachments($body, 0));
}
/**
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));
}
/**
{
$_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));
}
/**
public function testApiGetEntitities()
{
$text = 'text';
- self::assertInternalType('array', api_get_entitities($text, 'bbcode'));
+ self::assertIsArray(api_get_entitities($text, 'bbcode', 0));
}
/**
{
$_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']);
}
/**
$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']);
}
/**
*/
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');
- self::assertContains('message_text', $result['direct_message']['text']);
+ self::assertStringContainsString('message_text', $result['direct_message']['text']);
self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
self::assertEquals(1, $result['direct_message']['friendica_seen']);
}
*/
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';
$result = api_direct_messages_new('json');
- self::assertContains('message_text', $result['direct_message']['text']);
- self::assertContains('message_title', $result['direct_message']['text']);
+ self::assertStringContainsString('message_text', $result['direct_message']['text']);
+ self::assertStringContainsString('message_title', $result['direct_message']['text']);
self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
self::assertEquals(1, $result['direct_message']['friendica_seen']);
}
*/
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');
$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.
*
*/
public function testApiFriendicaNotificationWithEmptyResult()
{
- $this->app->argv = ['api', 'friendica', 'notification'];
- $this->app->argc = count($this->app->argv);
+ DI::args()->setArgv(['api', 'friendica', 'notification']);
$_SESSION['uid'] = 41;
$result = api_friendica_notification('json');
self::assertEquals(['note' => false], $result);
*/
public function testApiFriendicaNotificationWithXmlResult()
{
- $this->app->argv = ['api', 'friendica', 'notification'];
- $this->app->argc = count($this->app->argv);
- $result = api_friendica_notification('xml');
+ DI::args()->setArgv(['api', 'friendica', 'notification']);
+ $result = api_friendica_notification('xml');
$dateRel = Temporal::getRelativeDate('2020-01-01 12:12:02');
$assertXml=<<<XML
<?xml version="1.0"?>
*/
public function testApiFriendicaNotificationWithJsonResult()
{
- $this->app->argv = ['api', 'friendica', 'notification'];
- $this->app->argc = count($this->app->argv);
- $result = json_encode(api_friendica_notification('json'));
+ DI::args()->setArgv(['api', 'friendica', 'notification']);
+ $result = json_encode(api_friendica_notification('json'));
self::assertJson($result);
}
projects / friendica.git / blobdiff