X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Flegacy%2FApiTest.php;h=12475fd16c3d5a6eecdf1171bf03e764e04d82bf;hb=66db55f0cdb7340602154f2fa411daab6aae9459;hp=265f502f0aae3c7283e868a16c89152ac1ed6a63;hpb=09c2f424be74b51cadf30de28c3cea42a80a53c4;p=friendica.git
diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 265f502f0a..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;
@@ -22,6 +27,8 @@ require_once __DIR__ . '/../../include/api.php';
*
* Functions that use header() need to be tested in a separate process.
* @see https://phpunit.de/manual/5.7/en/appendixes.annotations.html#appendixes.annotations.runTestsInSeparateProcesses
+ *
+ * @backupGlobals enabled
*/
class ApiTest extends FixtureTest
{
@@ -42,13 +49,13 @@ class ApiTest extends FixtureTest
/** @var App */
protected $app;
- /** @var IConfig */
+ /** @var IManageConfigValues */
protected $config;
/**
* Create variables used by tests.
*/
- protected function setUp()
+ protected function setUp() : void
{
global $API, $called_api;
$API = [];
@@ -56,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');
@@ -74,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 = [
@@ -108,10 +114,6 @@ class ApiTest extends FixtureTest
'authenticated' => true,
'uid' => $this->selfUser['id']
];
-
- $_POST = [];
- $_GET = [];
- $_SERVER = [];
}
/**
@@ -140,7 +142,7 @@ class ApiTest extends FixtureTest
*
* @return void
*/
- private function assertOtherUser(array $user)
+ private function assertOtherUser(array $user = [])
{
self::assertEquals($this->otherUser['id'], $user['id']);
self::assertEquals($this->otherUser['id'], $user['id_str']);
@@ -157,10 +159,10 @@ class ApiTest extends FixtureTest
*
* @return void
*/
- private function assertStatus(array $status)
+ 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.
}
@@ -171,11 +173,11 @@ class ApiTest extends FixtureTest
*
* @return void
*/
- private function assertList(array $list)
+ 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.
}
@@ -188,10 +190,10 @@ class ApiTest extends FixtureTest
*
* @return void
*/
- private function assertXml($result, $root_element)
+ private function assertXml($result = '', $root_element = '')
{
self::assertStringStartsWith('', $result);
- self::assertContains('<' . $root_element, $result);
+ self::assertStringContainsString('<' . $root_element, $result);
// We could probably do more checks here.
}
@@ -300,32 +302,34 @@ class ApiTest extends FixtureTest
}
/**
- * Test the api_login() function without any login.
+ * Test the BasicAuth::getCurrentUserID() function without any login.
*
- * @return void
* @runInSeparateProcess
- * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+ * @preserveGlobalState disabled
+ * @preserveGlobalState disabled
*/
public function testApiLoginWithoutLogin()
{
- api_login($this->app);
+ $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
+ BasicAuth::getCurrentUserID(true);
}
/**
- * Test the api_login() function with a bad login.
+ * Test the BasicAuth::getCurrentUserID() function with a bad login.
*
- * @return void
* @runInSeparateProcess
- * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+ * @preserveGlobalState disabled
+ * @preserveGlobalState disabled
*/
public function testApiLoginWithBadLogin()
{
+ $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,29 +349,30 @@ class ApiTest extends FixtureTest
}
/**
- * Test the api_login() function with a correct login.
+ * Test the BasicAuth::getCurrentUserID() function with a correct login.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
+ * @doesNotPerformAssertions
*/
public function testApiLoginWithCorrectLogin()
{
$_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.
*
- * @return void
* @runInSeparateProcess
- * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+ * @preserveGlobalState disabled
*/
public function testApiLoginWithRemoteUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
$_SERVER['REDIRECT_REMOTE_USER'] = '123456dXNlcjpwYXNzd29yZA==';
- api_login($this->app);
+ BasicAuth::getCurrentUserID(true);
}
/**
@@ -404,8 +409,8 @@ class ApiTest extends FixtureTest
/**
* Test the api_call() function.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCall()
{
@@ -431,8 +436,8 @@ class ApiTest extends FixtureTest
/**
* Test the api_call() function with the profiled enabled.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCallWithProfiler()
{
@@ -465,51 +470,11 @@ class ApiTest extends FixtureTest
);
}
- /**
- * Test the api_call() function without any result.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCallWithJson()
{
@@ -534,8 +499,8 @@ class ApiTest extends FixtureTest
/**
* Test the api_call() function with an XML result.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCallWithXml()
{
@@ -560,8 +525,8 @@ class ApiTest extends FixtureTest
/**
* Test the api_call() function with an RSS result.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCallWithRss()
{
@@ -587,8 +552,8 @@ class ApiTest extends FixtureTest
/**
* Test the api_call() function with an Atom result.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiCallWithAtom()
{
@@ -611,129 +576,6 @@ class ApiTest extends FixtureTest
);
}
- /**
- * Test the api_call() function with an unallowed method.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
- *
- * @return void
- * @runInSeparateProcess
- */
- 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.
*
@@ -761,7 +603,7 @@ class ApiTest extends FixtureTest
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']);
@@ -798,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']);
@@ -812,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']);
@@ -828,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']);
@@ -844,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']);
@@ -859,15 +701,15 @@ class ApiTest extends FixtureTest
/**
* Test the api_get_user() function with an user that is not allowed to use the API.
*
- * @return void
* @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiGetUserWithoutApiUser()
{
$_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());
}
/**
@@ -878,19 +720,19 @@ 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());
}
/**
* Test the api_get_user() function with a wrong user ID in a GET parameter.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiGetUserWithWrongGetId()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
$_GET['user_id'] = $this->wrongUserId;
- self::assertOtherUser(api_get_user($this->app));
+ self::assertOtherUser(api_get_user());
}
/**
@@ -901,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());
}
/**
@@ -912,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());
}
/**
@@ -924,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());
}
/**
@@ -937,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());
}
/**
@@ -947,18 +789,18 @@ 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']));
}
/**
* Test the api_get_user() function with a wrong user ID.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiGetUserWithWrongUser()
{
- self::assertOtherUser(api_get_user($this->app, $this->wrongUserId));
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
+ self::assertOtherUser(api_get_user($this->wrongUserId));
}
/**
@@ -968,7 +810,7 @@ class ApiTest extends FixtureTest
*/
public function testApiGetUserWithZeroUser()
{
- self::assertSelfUser(api_get_user($this->app, 0));
+ self::assertSelfUser(api_get_user(0));
}
/**
@@ -995,7 +837,7 @@ class ApiTest extends FixtureTest
}
/**
- * Test the api_walk_recursive() function.
+ * Test the Arrays::walkRecursive() function.
*
* @return void
*/
@@ -1004,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?
@@ -1015,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
*/
@@ -1024,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?
@@ -1035,7 +877,7 @@ class ApiTest extends FixtureTest
}
/**
- * Test the api_reformat_xml() function.
+ * Test the BaseApi::reformatXML() function.
*
* @return void
*/
@@ -1043,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
*/
@@ -1056,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
*/
@@ -1069,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
*/
@@ -1087,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
*/
@@ -1103,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
*/
@@ -1132,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']])
);
}
@@ -1150,10 +992,10 @@ class ApiTest extends FixtureTest
* Test the api_account_verify_credentials() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiAccountVerifyCredentialsWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_account_verify_credentials('json');
}
@@ -1197,7 +1039,7 @@ class ApiTest extends FixtureTest
*/
public function testApiStatusesMediap()
{
- $this->app->argc = 2;
+ DI::args()->setArgc(2);
$_FILES = [
'media' => [
@@ -1220,10 +1062,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_mediap() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesMediapWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_statuses_mediap('json');
}
@@ -1272,10 +1114,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_update() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesUpdateWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_statuses_update('json');
}
@@ -1312,12 +1154,12 @@ class ApiTest extends FixtureTest
/**
* Test the api_media_upload() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
+ * @runInSeparateProcess
+ * @preserveGlobalState disabled
*/
public function testApiMediaUpload()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_media_upload();
}
@@ -1325,10 +1167,10 @@ class ApiTest extends FixtureTest
* Test the api_media_upload() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiMediaUploadWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_media_upload();
}
@@ -1337,10 +1179,10 @@ class ApiTest extends FixtureTest
* Test the api_media_upload() function with an invalid uploaded media.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
*/
public function testApiMediaUploadWithMedia()
{
+ $this->expectException(\Friendica\Network\HTTPException\InternalServerErrorException::class);
$_FILES = [
'media' => [
'id' => 666,
@@ -1369,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']);
@@ -1462,10 +1304,10 @@ class ApiTest extends FixtureTest
* Test the api_users_search() function without a GET q parameter.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiUsersSearchWithoutQuery()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_users_search('json');
}
@@ -1473,10 +1315,10 @@ class ApiTest extends FixtureTest
* Test the api_users_lookup() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\NotFoundException
*/
public function testApiUsersLookup()
{
+ $this->expectException(\Friendica\Network\HTTPException\NotFoundException::class);
api_users_lookup('json');
}
@@ -1504,7 +1346,7 @@ class ApiTest extends FixtureTest
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], null, true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
@@ -1520,7 +1362,7 @@ class ApiTest extends FixtureTest
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], null, true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
@@ -1536,14 +1378,13 @@ class ApiTest extends FixtureTest
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('reply', $status['text'], null, true);
+ self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
}
}
/**
* Test the api_search() function with an q parameter contains hashtag.
- *
- * @return void
+ * @doesNotPerformAssertions
*/
public function testApiSearchWithHashtag()
{
@@ -1551,14 +1392,13 @@ class ApiTest extends FixtureTest
$result = api_search('json');
foreach ($result['status'] as $status) {
self::assertStatus($status);
- self::assertContains('#friendica', $status['text'], null, true);
+ self::assertStringContainsStringIgnoringCase('#friendica', $status['text'], '', true);
}
}
/**
* Test the api_search() function with an exclude_replies parameter.
- *
- * @return void
+ * @doesNotPerformAssertions
*/
public function testApiSearchWithExcludeReplies()
{
@@ -1575,10 +1415,10 @@ class ApiTest extends FixtureTest
* Test the api_search() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiSearchWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_search('json');
@@ -1588,10 +1428,10 @@ class ApiTest extends FixtureTest
* Test the api_search() function without any GET query parameter.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiSearchWithoutQuery()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_search('json');
}
@@ -1631,10 +1471,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_home_timeline() with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesHomeTimelineWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_home_timeline('json');
@@ -1702,10 +1542,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_public_timeline() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesPublicTimelineWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_public_timeline('json');
@@ -1756,10 +1596,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_networkpublic_timeline() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesNetworkpublicTimelineWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_networkpublic_timeline('json');
@@ -1780,10 +1620,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_show() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiStatusesShow()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_statuses_show('json');
}
@@ -1794,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']);
}
@@ -1806,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']);
@@ -1819,10 +1659,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_show() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesShowWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_show('json');
@@ -1832,10 +1672,10 @@ class ApiTest extends FixtureTest
* Test the api_conversation_show() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiConversationShow()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_conversation_show('json');
}
@@ -1846,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');
@@ -1860,10 +1700,10 @@ class ApiTest extends FixtureTest
* Test the api_conversation_show() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiConversationShowWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_conversation_show('json');
@@ -1873,10 +1713,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_repeat() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesRepeat()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
api_statuses_repeat('json');
}
@@ -1884,10 +1724,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_repeat() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesRepeatWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_statuses_repeat('json');
}
@@ -1899,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']);
}
@@ -1913,10 +1753,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_destroy() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiStatusesDestroy()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_statuses_destroy('json');
}
@@ -1924,10 +1764,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_destroy() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesDestroyWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_statuses_destroy('json');
}
@@ -1939,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']);
}
@@ -1951,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']);
@@ -1974,10 +1814,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_mentions() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesMentionsWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_mentions('json');
@@ -2041,10 +1881,10 @@ class ApiTest extends FixtureTest
* Test the api_statuses_user_timeline() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiStatusesUserTimelineWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_statuses_user_timeline('json');
@@ -2054,12 +1894,11 @@ class ApiTest extends FixtureTest
* Test the api_favorites_create_destroy() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFavoritesCreateDestroy()
{
- $this->app->argv = ['api', '1.1', 'favorites', 'create'];
- $this->app->argc = count($this->app->argv);
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
+ DI::args()->setArgv(['api', '1.1', 'favorites', 'create']);
api_favorites_create_destroy('json');
}
@@ -2067,12 +1906,11 @@ class ApiTest extends FixtureTest
* Test the api_favorites_create_destroy() function with an invalid ID.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFavoritesCreateDestroyWithInvalidId()
{
- $this->app->argv = ['api', '1.1', 'favorites', 'create', '12.json'];
- $this->app->argc = count($this->app->argv);
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
+ DI::args()->setArgv(['api', '1.1', 'favorites', 'create', '12.json']);
api_favorites_create_destroy('json');
}
@@ -2080,13 +1918,12 @@ class ApiTest extends FixtureTest
* Test the api_favorites_create_destroy() function with an invalid action.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFavoritesCreateDestroyWithInvalidAction()
{
- $this->app->argv = ['api', '1.1', 'favorites', 'change.json'];
- $this->app->argc = count($this->app->argv);
- $_REQUEST['id'] = 1;
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
+ DI::args()->setArgv(['api', '1.1', 'favorites', 'change.json']);
+ $_REQUEST['id'] = 1;
api_favorites_create_destroy('json');
}
@@ -2097,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']);
}
@@ -2111,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');
}
@@ -2125,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']);
}
@@ -2136,12 +1970,11 @@ class ApiTest extends FixtureTest
* Test the api_favorites_create_destroy() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFavoritesCreateDestroyWithoutAuthenticatedUser()
{
- $this->app->argv = ['api', '1.1', 'favorites', 'create.json'];
- $this->app->argc = count($this->app->argv);
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
+ DI::args()->setArgv(['api', '1.1', 'favorites', 'create.json']);
$_SESSION['authenticated'] = false;
api_favorites_create_destroy('json');
}
@@ -2176,10 +2009,10 @@ class ApiTest extends FixtureTest
* Test the api_favorites() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFavoritesWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_favorites('json');
@@ -2193,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']);
@@ -2214,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']);
@@ -2231,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']);
@@ -2248,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']));
@@ -2267,30 +2100,31 @@ class ApiTest extends FixtureTest
[
'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 ' .
- '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'
]
);
@@ -2309,11 +2143,12 @@ class ApiTest extends FixtureTest
[
'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('item_title
item_plink', $result['html']);
}
@@ -2326,8 +2161,9 @@ class ApiTest extends FixtureTest
{
$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']);
@@ -2342,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));
}
/**
@@ -2353,7 +2189,7 @@ class ApiTest extends FixtureTest
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));
}
/**
@@ -2365,7 +2201,7 @@ class ApiTest extends FixtureTest
{
$_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));
}
/**
@@ -2376,7 +2212,7 @@ class ApiTest extends FixtureTest
public function testApiGetEntitities()
{
$text = 'text';
- self::assertInternalType('array', api_get_entitities($text, 'bbcode'));
+ self::assertIsArray(api_get_entitities($text, 'bbcode', 0));
}
/**
@@ -2388,11 +2224,11 @@ class ApiTest extends FixtureTest
{
$_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']);
}
/**
@@ -2474,8 +2310,7 @@ class ApiTest extends FixtureTest
/**
* Test the api_format_items() function.
- *
- * @return void
+ * @doesNotPerformAssertions
*/
public function testApiFormatItems()
{
@@ -2500,8 +2335,7 @@ class ApiTest extends FixtureTest
/**
* Test the api_format_items() function with an XML result.
- *
- * @return void
+ * @doesNotPerformAssertions
*/
public function testApiFormatItemsWithXml()
{
@@ -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::assertInternalType('int', $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.
*
@@ -2596,10 +2384,10 @@ class ApiTest extends FixtureTest
* Test the api_lists_ownerships() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiListsOwnershipsWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_lists_ownerships('json');
}
@@ -2607,18 +2395,17 @@ class ApiTest extends FixtureTest
/**
* Test the api_lists_statuses() function.
*
- * @expectedException Friendica\Network\HTTPException\BadRequestException
* @return void
*/
public function testApiListsStatuses()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_lists_statuses('json');
}
/**
* Test the api_lists_statuses() function with a list ID.
- *
- * @return void
+ * @doesNotPerformAssertions
*/
public function testApiListsStatusesWithListId()
{
@@ -2647,10 +2434,10 @@ class ApiTest extends FixtureTest
* Test the api_lists_statuses() function with an unallowed user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiListsStatusesWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_lists_statuses('json');
@@ -2807,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']);
@@ -2818,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']);
+ */
}
/**
@@ -2846,10 +2624,10 @@ class ApiTest extends FixtureTest
* Test the api_direct_messages_new() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiDirectMessagesNewWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_direct_messages_new('json');
}
@@ -2874,11 +2652,11 @@ 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');
- 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']);
}
@@ -2890,13 +2668,13 @@ 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';
$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']);
}
@@ -2908,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');
@@ -2919,10 +2697,10 @@ class ApiTest extends FixtureTest
* Test the api_direct_messages_destroy() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiDirectMessagesDestroy()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_direct_messages_destroy('json');
}
@@ -2950,10 +2728,10 @@ class ApiTest extends FixtureTest
* Test the api_direct_messages_destroy() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiDirectMessagesDestroyWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_direct_messages_destroy('json');
}
@@ -2962,10 +2740,10 @@ class ApiTest extends FixtureTest
* Test the api_direct_messages_destroy() function with a non-zero ID.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiDirectMessagesDestroyWithId()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
$_REQUEST['id'] = 1;
api_direct_messages_destroy('json');
}
@@ -3082,10 +2860,10 @@ class ApiTest extends FixtureTest
* Test the api_direct_messages_box() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiDirectMessagesBoxWithUnallowedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['allow_api'] = false;
$_GET['screen_name'] = $this->selfUser['nick'];
api_direct_messages_box('json', 'sentbox', 'false');
@@ -3155,97 +2933,6 @@ class ApiTest extends FixtureTest
$this->markTestIncomplete('exit() kills phpunit as well');
}
- /**
- * Test the api_fr_photoalbum_delete() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoalbumDelete()
- {
- api_fr_photoalbum_delete('json');
- }
-
- /**
- * Test the api_fr_photoalbum_delete() function with an album name.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoalbumDeleteWithAlbum()
- {
- $_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
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoalbumUpdate()
- {
- api_fr_photoalbum_update('json');
- }
-
- /**
- * Test the api_fr_photoalbum_delete() function with an album name.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoalbumUpdateWithAlbum()
- {
- $_REQUEST['album'] = 'album_name';
- api_fr_photoalbum_update('json');
- }
-
- /**
- * Test the api_fr_photoalbum_delete() function with an album name.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoalbumUpdateWithAlbumAndNewAlbum()
- {
- $_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
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
- */
- public function testApiFrPhotoalbumUpdateWithoutAuthenticatedUser()
- {
- $_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.
*
@@ -3261,22 +2948,20 @@ class ApiTest extends FixtureTest
* Test the api_fr_photos_list() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFrPhotosListWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_fr_photos_list('json');
}
/**
* Test the api_fr_photo_create_update() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFrPhotoCreateUpdate()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_fr_photo_create_update('json');
}
@@ -3284,10 +2969,10 @@ class ApiTest extends FixtureTest
* Test the api_fr_photo_create_update() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFrPhotoCreateUpdateWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_fr_photo_create_update('json');
}
@@ -3296,10 +2981,10 @@ class ApiTest extends FixtureTest
* Test the api_fr_photo_create_update() function with an album name.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFrPhotoCreateUpdateWithAlbum()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
$_REQUEST['album'] = 'album_name';
api_fr_photo_create_update('json');
}
@@ -3324,59 +3009,14 @@ class ApiTest extends FixtureTest
$this->markTestIncomplete();
}
- /**
- * Test the api_fr_photo_delete() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoDelete()
- {
- api_fr_photo_delete('json');
- }
-
- /**
- * Test the api_fr_photo_delete() function without an authenticated user.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
- */
- public function testApiFrPhotoDeleteWithoutAuthenticatedUser()
- {
- $_SESSION['authenticated'] = false;
- api_fr_photo_delete('json');
- }
-
- /**
- * Test the api_fr_photo_delete() function with a photo ID.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFrPhotoDeleteWithPhotoId()
- {
- $_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.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFrPhotoDetail()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_fr_photo_detail('json');
}
@@ -3384,10 +3024,10 @@ class ApiTest extends FixtureTest
* Test the api_fr_photo_detail() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFrPhotoDetailWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_fr_photo_detail('json');
}
@@ -3396,10 +3036,10 @@ class ApiTest extends FixtureTest
* Test the api_fr_photo_detail() function with a photo ID.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\NotFoundException
*/
public function testApiFrPhotoDetailWithPhotoId()
{
+ $this->expectException(\Friendica\Network\HTTPException\NotFoundException::class);
$_REQUEST['photo_id'] = 1;
api_fr_photo_detail('json');
}
@@ -3418,10 +3058,10 @@ class ApiTest extends FixtureTest
* Test the api_account_update_profile_image() function.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiAccountUpdateProfileImage()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
api_account_update_profile_image('json');
}
@@ -3429,10 +3069,10 @@ class ApiTest extends FixtureTest
* Test the api_account_update_profile_image() function without an authenticated user.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiAccountUpdateProfileImageWithoutAuthenticatedUser()
{
+ $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
$_SESSION['authenticated'] = false;
api_account_update_profile_image('json');
}
@@ -3441,10 +3081,10 @@ class ApiTest extends FixtureTest
* Test the api_account_update_profile_image() function with an uploaded file.
*
* @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiAccountUpdateProfileImageWithUpload()
{
+ $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
$this->markTestIncomplete();
}
@@ -3521,55 +3161,6 @@ class ApiTest extends FixtureTest
$this->markTestIncomplete();
}
- /**
- * Test the api_friendica_remoteauth() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFriendicaRemoteauth()
- {
- api_friendica_remoteauth();
- }
-
- /**
- * Test the api_friendica_remoteauth() function with an URL.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFriendicaRemoteauthWithUrl()
- {
- $_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.
*
@@ -3729,76 +3320,6 @@ class ApiTest extends FixtureTest
$this->markTestIncomplete();
}
- /**
- * Test the api_friendica_notification() function.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\BadRequestException
- */
- public function testApiFriendicaNotification()
- {
- api_friendica_notification('json');
- }
-
- /**
- * Test the api_friendica_notification() function without an authenticated user.
- *
- * @return void
- * @expectedException Friendica\Network\HTTPException\ForbiddenException
- */
- public function testApiFriendicaNotificationWithoutAuthenticatedUser()
- {
- $_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.
*
@@ -3828,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']);
- }
}