X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Finclude%2FApiTest.php;h=ceeaac6f6fdcd4c3e8dca4c68561a5f6c254c5b5;hb=31c55a6fa45f0acd8ef9ff1ef86224778d614819;hp=145619a75daac87f31a5488f46a18d31a96138a6;hpb=dad530802f2af7e3b522d59e73d547812169daf0;p=friendica.git diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php index 145619a75d..ceeaac6f6f 100644 --- a/tests/include/ApiTest.php +++ b/tests/include/ApiTest.php @@ -5,20 +5,12 @@ namespace Friendica\Test; -use Dice\Dice; use Friendica\App; use Friendica\Core\Config\IConfig; use Friendica\Core\PConfig\IPConfig; use Friendica\Core\Protocol; -use Friendica\Core\Session; -use Friendica\Core\Session\ISession; -use Friendica\Core\System; -use Friendica\Database\Database; -use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Contact; use Friendica\Network\HTTPException; -use Friendica\Test\Util\Database\StaticDatabase; use Friendica\Util\Temporal; use Monolog\Handler\TestHandler; @@ -30,7 +22,7 @@ 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 */ -class ApiTest extends DatabaseTest +class ApiTest extends FixtureTest { /** * @var TestHandler Can handle log-outputs @@ -52,9 +44,6 @@ class ApiTest extends DatabaseTest /** @var IConfig */ protected $config; - /** @var Dice */ - protected $dice; - /** * Create variables used by tests. */ @@ -62,15 +51,6 @@ class ApiTest extends DatabaseTest { parent::setUp(); - $this->dice = (new Dice()) - ->addRules(include __DIR__ . '/../../static/dependencies.config.php') - ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]) - ->addRule(ISession::class, ['instanceOf' => Session\Memory::class, 'shared' => true, 'call' => null]); - DI::init($this->dice); - - /** @var Database $dba */ - $dba = $this->dice->create(Database::class); - /** @var IConfig $config */ $this->config = $this->dice->create(IConfig::class); @@ -85,8 +65,6 @@ class ApiTest extends DatabaseTest $this->config->set('system', 'throttle_limit_month', 100); $this->config->set('system', 'theme', 'system_theme'); - // Load the API dataset for the whole API - $this->loadFixture(__DIR__ . '/../datasets/api.fixture.php', $dba); /** @var App app */ $this->app = DI::app(); @@ -839,38 +817,38 @@ class ApiTest extends DatabaseTest } /** - * Test the api_get_user() function with a custom Frio schema. + * Test the api_get_user() function with an empty Frio schema. * * @return void */ - public function testApiGetUserWithCustomFrioSchema() + public function testApiGetUserWithEmptyFrioSchema() { $pConfig = $this->dice->create(IPConfig::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); $this->assertSelfUser($user); - $this->assertEquals('123456', $user['profile_sidebar_fill_color']); - $this->assertEquals('123456', $user['profile_link_color']); - $this->assertEquals('123456', $user['profile_background_color']); + $this->assertEquals('708fa0', $user['profile_sidebar_fill_color']); + $this->assertEquals('6fdbe8', $user['profile_link_color']); + $this->assertEquals('ededed', $user['profile_background_color']); } /** - * Test the api_get_user() function with an empty Frio schema. + * Test the api_get_user() function with a custom Frio schema. * * @return void */ - public function testApiGetUserWithEmptyFrioSchema() + public function testApiGetUserWithCustomFrioSchema() { $pConfig = $this->dice->create(IPConfig::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); $this->assertSelfUser($user); - $this->assertEquals('708fa0', $user['profile_sidebar_fill_color']); - $this->assertEquals('6fdbe8', $user['profile_link_color']); - $this->assertEquals('ededed', $user['profile_background_color']); + $this->assertEquals('123456', $user['profile_sidebar_fill_color']); + $this->assertEquals('123456', $user['profile_link_color']); + $this->assertEquals('123456', $user['profile_background_color']); } /** @@ -2848,61 +2826,6 @@ class ApiTest extends DatabaseTest $this->assertEquals('0.9.7', $result['version']); } - /** - * Test the api_ff_ids() function. - * - * @return void - */ - public function testApiFfIds() - { - $result = api_ff_ids('json', Contact::FOLLOWER); - $this->assertEquals(['id' => []], $result); - } - - /** - * Test the api_ff_ids() function with a result. - * - * @return void - */ - public function testApiFfIdsWithResult() - { - $this->markTestIncomplete(); - } - - /** - * Test the api_ff_ids() function without an authenticated user. - * - * @return void - * @expectedException Friendica\Network\HTTPException\ForbiddenException - */ - public function testApiFfIdsWithoutAuthenticatedUser() - { - $_SESSION['authenticated'] = false; - api_ff_ids('json', Contact::FOLLOWER); - } - - /** - * Test the api_friends_ids() function. - * - * @return void - */ - public function testApiFriendsIds() - { - $result = api_friends_ids('json'); - $this->assertEquals(['id' => []], $result); - } - - /** - * Test the api_followers_ids() function. - * - * @return void - */ - public function testApiFollowersIds() - { - $result = api_followers_ids('json'); - $this->assertEquals(['id' => []], $result); - } - /** * Test the api_direct_messages_new() function. * @@ -2946,6 +2869,7 @@ class ApiTest extends DatabaseTest */ public function testApiDirectMessagesNewWithScreenName() { + $this->app->user = ['nickname' => $this->selfUser['nick']]; $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $result = api_direct_messages_new('json'); @@ -2961,6 +2885,7 @@ class ApiTest extends DatabaseTest */ public function testApiDirectMessagesNewWithTitle() { + $this->app->user = ['nickname' => $this->selfUser['nick']]; $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $_REQUEST['title'] = 'message_title'; @@ -2978,6 +2903,7 @@ class ApiTest extends DatabaseTest */ public function testApiDirectMessagesNewWithRss() { + $this->app->user = ['nickname' => $this->selfUser['nick']]; $_POST['text'] = 'message_text'; $_POST['screen_name'] = $this->friendUser['nick']; $result = api_direct_messages_new('rss'); @@ -3849,7 +3775,7 @@ class ApiTest extends DatabaseTest $assertXml=<< - + XML; $this->assertXmlStringEqualsXmlString($assertXml, $result);