Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add feedback - avoid intermediate variables

Browse source
This commit is contained in:
Philipp 2022-01-02 01:04:04 +01:00
parent adf0d7bc95
commit 301ac83ebf
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
42 changed files with 367 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/src/Factory/Api/Twitter/ActivitiesTest.php
View file

@ -17,8 +17,8 @@ class ActivitiesTest extends FixtureTest
{
$item = ['uid' => 0, 'uri-id' => 1];
$friendicaActivitiesFac = new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser());
$result = $friendicaActivitiesFac->createFromUriId($item['uri-id'], $item['uid']);
$result = (new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser()))
->createFromUriId($item['uri-id'], $item['uid']);
self::assertArrayHasKey('like', $result);
self::assertArrayHasKey('dislike', $result);
@ -36,8 +36,8 @@ class ActivitiesTest extends FixtureTest
{
$item = ['uid' => 0, 'uri-id' => 1];
$friendicaActivitiesFac = new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser());
$result = $friendicaActivitiesFac->createFromUriId($item['uri-id'], $item['uid'], 'xml');
$result = (new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser()))
->createFromUriId($item['uri-id'], $item['uid'], 'xml');
self::assertArrayHasKey('friendica:like', $result);
self::assertArrayHasKey('friendica:dislike', $result);

24
tests/src/Factory/Api/Twitter/DirectMessageTest.php
View file

@ -20,9 +20,9 @@ class DirectMessageTest extends FixtureTest
$ids = DI::dba()->selectToArray('mail', ['id']);
$id = $ids[0]['id'];
$directMessageFactory = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
$directMessageObj = $directMessageFactory->createFromMailId($id, ApiTest::SELF_USER['id']);
$directMessage = $directMessageObj->toArray();
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'])
->toArray();
self::assertEquals('item_title' . "\n" . 'item_body', $directMessage['text']);
self::assertIsInt($directMessage['id']);
@ -43,9 +43,9 @@ class DirectMessageTest extends FixtureTest
$ids = DI::dba()->selectToArray('mail', ['id']);
$id = $ids[0]['id'];
$directMessageFactory = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
$directMessageObj = $directMessageFactory->createFromMailId($id, ApiTest::SELF_USER['id'], 'html');
$directMessage = $directMessageObj->toArray();
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'html')
->toArray();
self::assertEquals('item_title', $directMessage['title']);
self::assertEquals('<strong>item_body</strong>', $directMessage['text']);
@ -62,9 +62,9 @@ class DirectMessageTest extends FixtureTest
$ids = DI::dba()->selectToArray('mail', ['id']);
$id = $ids[0]['id'];
$directMessageFactory = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
$directMessageObj = $directMessageFactory->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain');
$directMessage = $directMessageObj->toArray();
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain')
->toArray();
self::assertEquals('item_title', $directMessage['title']);
self::assertEquals('item_body', $directMessage['text']);
@ -84,9 +84,9 @@ class DirectMessageTest extends FixtureTest
$ids = DI::dba()->selectToArray('mail', ['id']);
$id = $ids[0]['id'];
$directMessageFactory = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
$directMessageObj = $directMessageFactory->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$);
$directMessage = $directMessageObj->toArray();
$directMessage = (new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser()))
->createFromMailId($id, ApiTest::SELF_USER['id'], 'plain', $$GETUSEROBJECTS$$)
->toArray();
self::assertTrue(!isset($directMessage['sender']));
self::assertTrue(!isset($directMessage['recipient']));

58
tests/src/Factory/Api/Twitter/StatusTest.php
View file

@ -15,6 +15,24 @@ use Friendica\Test\src\Module\Api\ApiTest;
class StatusTest extends FixtureTest
{
protected $statusFactory;
protected function setUp(): void
{
parent::setUp();
$this->statusFactory = new Status(
DI::logger(),
DI::dba(),
DI::twitterUser(),
new Hashtag(DI::logger()),
new Media(DI::logger(), DI::baseUrl()),
new Url(DI::logger()),
new Mention(DI::logger(), DI::baseUrl()),
new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser()),
new Attachment(DI::logger()));
}
/**
* Test the api_convert_item() function.
*
@ -22,16 +40,9 @@ class StatusTest extends FixtureTest
*/
public function testApiConvertItem()
{
$hashTagFac = new Hashtag(DI::logger());
$mediaFac = new Media(DI::logger(), DI::baseUrl());
$urlFac = new Url(DI::logger());
$mentionFac = new Mention(DI::logger(), DI::baseUrl());
$activitiesFac = new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser());
$attachmentFac = new Attachment(DI::logger());
$statusFac = new Status(DI::logger(), DI::dba(), DI::twitterUser(), $hashTagFac, $mediaFac, $urlFac, $mentionFac, $activitiesFac, $attachmentFac);
$statusObj = $statusFac->createFromItemId(13, ApiTest::SELF_USER['id']);
$status = $statusObj->toArray();
$status = $this->statusFactory
->createFromItemId(13, ApiTest::SELF_USER['id'])
->toArray();
self::assertStringStartsWith('item_title', $status['text']);
self::assertStringStartsWith('<h4>item_title</h4><br>perspiciatis impedit voluptatem', $status['friendica_html']);
@ -90,16 +101,9 @@ class StatusTest extends FixtureTest
*/
public function testApiGetEntititiesWithIncludeEntities()
{
$hashTagFac = new Hashtag(DI::logger());
$mediaFac = new Media(DI::logger(), DI::baseUrl());
$urlFac = new Url(DI::logger());
$mentionFac = new Mention(DI::logger(), DI::baseUrl());
$activitiesFac = new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser());
$attachmentFac = new Attachment(DI::logger());
$statusFac = new Status(DI::logger(), DI::dba(), DI::twitterUser(), $hashTagFac, $mediaFac, $urlFac, $mentionFac, $activitiesFac, $attachmentFac);
$statusObj = $statusFac->createFromItemId(13, ApiTest::SELF_USER['id'], true);
$status = $statusObj->toArray();
$status = $this->statusFactory
->createFromItemId(13, ApiTest::SELF_USER['id'], true)
->toArray();
self::assertIsArray($status['entities']);
self::assertIsArray($status['extended_entities']);
@ -114,19 +118,11 @@ class StatusTest extends FixtureTest
*/
public function testApiFormatItems()
{
$hashTagFac = new Hashtag(DI::logger());
$mediaFac = new Media(DI::logger(), DI::baseUrl());
$urlFac = new Url(DI::logger());
$mentionFac = new Mention(DI::logger(), DI::baseUrl());
$activitiesFac = new Activities(DI::logger(), DI::baseUrl(), DI::twitterUser());
$attachmentFac = new Attachment(DI::logger());
$statusFac = new Status(DI::logger(), DI::dba(), DI::twitterUser(), $hashTagFac, $mediaFac, $urlFac, $mentionFac, $activitiesFac, $attachmentFac);
$posts = DI::dba()->selectToArray('post-view', ['uri-id']);
foreach ($posts as $item) {
$statusObj = $statusFac->createFromUriId($item['uri-id'], ApiTest::SELF_USER['id']);
$status = $statusObj->toArray();
$status = $this->statusFactory
->createFromUriId($item['uri-id'], ApiTest::SELF_USER['id'])
->toArray();
self::assertIsInt($status['id']);
self::assertIsString($status['text']);

12
tests/src/Factory/Api/Twitter/UserTest.php
View file

@ -31,9 +31,9 @@ class UserTest extends FixtureTest
*/
public function testApiGetUser()
{
$userFactory = new User(DI::logger(), DI::twitterStatus());
$userObj = $userFactory->createFromUserId(ApiTest::SELF_USER['id']);
$user = $userObj->toArray();
$user = (new User(DI::logger(), DI::twitterStatus()))
->createFromUserId(ApiTest::SELF_USER['id'])
->toArray();
$this->assertSelfUser($user);
}
@ -114,9 +114,9 @@ class UserTest extends FixtureTest
*/
public function testApiGetUserWithWrongGetId()
{
$userFactory = new User(DI::logger(), DI::twitterStatus());
$userObj = $userFactory->createFromUserId(-1);
$user = $userObj->toArray();
$user = (new User(DI::logger(), DI::twitterStatus()))
->createFromUserId(-1)
->toArray();
self::assertEquals(0, $user['id']);
self::assertEquals(0, $user['uid']);