rename and move ApiTest to ApiTestCase

This commit is contained in:
Art4 2024-12-13 22:42:27 +00:00
parent cb6269eddb
commit 9f8023b91f
49 changed files with 113 additions and 116 deletions

View file

@ -10,7 +10,7 @@ namespace Friendica\Test\src\Factory\Api\Twitter;
use Friendica\DI;
use Friendica\Factory\Api\Twitter\DirectMessage;
use Friendica\Test\FixtureTestCase;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\ApiTestCase;
class DirectMessageTest extends FixtureTestCase
{
@ -26,7 +26,7 @@ class DirectMessageTest extends FixtureTestCase
$id = $ids[0]['id'];
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'])
->createFromMailId($id, ApiTestCase::SELF_USER['id'])
->toArray();
self::assertEquals('item_title' . "\n" . 'item_body', $directMessage['text']);
@ -49,7 +49,7 @@ class DirectMessageTest extends FixtureTestCase
$id = $ids[0]['id'];
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'html')
->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'html')
->toArray();
self::assertEquals('item_title', $directMessage['title']);
@ -68,7 +68,7 @@ class DirectMessageTest extends FixtureTestCase
$id = $ids[0]['id'];
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain')
->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'plain')
->toArray();
self::assertEquals('item_title', $directMessage['title']);
@ -90,7 +90,7 @@ class DirectMessageTest extends FixtureTestCase
$id = $ids[0]['id'];
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$)
->createFromMailId($id, ApiTestCase::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$)
->toArray();
self::assertTrue(!isset($directMessage['sender']));

View file

@ -17,7 +17,7 @@ use Friendica\Factory\Api\Twitter\Mention;
use Friendica\Factory\Api\Twitter\Status;
use Friendica\Factory\Api\Twitter\Url;
use Friendica\Test\FixtureTestCase;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\ApiTestCase;
class StatusTest extends FixtureTestCase
{
@ -47,7 +47,7 @@ class StatusTest extends FixtureTestCase
public function testApiConvertItem()
{
$status = $this->statusFactory
->createFromItemId(13, ApiTest::SELF_USER['id'])
->createFromItemId(13, ApiTestCase::SELF_USER['id'])
->toArray();
self::assertStringStartsWith('item_title', $status['text']);
@ -108,7 +108,7 @@ class StatusTest extends FixtureTestCase
public function testApiGetEntitiesWithIncludeEntities()
{
$status = $this->statusFactory
->createFromItemId(13, ApiTest::SELF_USER['id'], true)
->createFromItemId(13, ApiTestCase::SELF_USER['id'], true)
->toArray();
self::assertIsArray($status['entities']);
@ -130,7 +130,7 @@ class StatusTest extends FixtureTestCase
$posts = DI::dba()->selectToArray('post-view', ['uri-id']);
foreach ($posts as $item) {
$status = $this->statusFactory
->createFromUriId($item['uri-id'], ApiTest::SELF_USER['id'])
->createFromUriId($item['uri-id'], ApiTestCase::SELF_USER['id'])
->toArray();
self::assertIsInt($status['id']);

View file

@ -11,7 +11,7 @@ use Friendica\DI;
use Friendica\Factory\Api\Twitter\User;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Test\FixtureTestCase;
use Friendica\Test\src\Module\Api\ApiTest;
use Friendica\Test\ApiTestCase;
class UserTest extends FixtureTestCase
{
@ -22,11 +22,11 @@ class UserTest extends FixtureTestCase
*/
protected function assertSelfUser(array $user)
{
self::assertEquals(ApiTest::SELF_USER['id'], $user['uid']);
self::assertEquals(ApiTest::SELF_USER['id'], $user['cid']);
self::assertEquals(ApiTestCase::SELF_USER['id'], $user['uid']);
self::assertEquals(ApiTestCase::SELF_USER['id'], $user['cid']);
self::assertEquals('DFRN', $user['location']);
self::assertEquals(ApiTest::SELF_USER['name'], $user['name']);
self::assertEquals(ApiTest::SELF_USER['nick'], $user['screen_name']);
self::assertEquals(ApiTestCase::SELF_USER['name'], $user['name']);
self::assertEquals(ApiTestCase::SELF_USER['nick'], $user['screen_name']);
self::assertTrue($user['verified']);
}
@ -38,7 +38,7 @@ class UserTest extends FixtureTestCase
public function testApiGetUser()
{
$user = (new User(DI::logger(), DI::twitterStatus()))
->createFromUserId(ApiTest::SELF_USER['id'])
->createFromUserId(ApiTestCase::SELF_USER['id'])
->toArray();
$this->assertSelfUser($user);
@ -54,7 +54,7 @@ class UserTest extends FixtureTestCase
$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
/*
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', 'red');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', 'red');
$userFactory = new User(DI::logger(), DI::twitterStatus());
$user = $userFactory->createFromUserId(42);
@ -76,7 +76,7 @@ class UserTest extends FixtureTestCase
$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
/*
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', '---');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', '---');
$userFactory = new User(DI::logger(), DI::twitterStatus());
$user = $userFactory->createFromUserId(42);
@ -98,10 +98,10 @@ class UserTest extends FixtureTestCase
$this->markTestIncomplete('Needs missing fields for profile colors at API User object first.');
/*
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'schema', '---');
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'nav_bg', '#123456');
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'link_color', '#123456');
DI::pConfig()->set(ApiTest::SELF_USER['id'], 'frio', 'background_color', '#123456');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'schema', '---');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'nav_bg', '#123456');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'link_color', '#123456');
DI::pConfig()->set(ApiTestCase::SELF_USER['id'], 'frio', 'background_color', '#123456');
$userFactory = new User(DI::logger(), DI::twitterStatus());
$user = $userFactory->createFromUserId(42);