Move API DirectMessage tests

diff --git a/src/Factory/Api/Twitter/DirectMessage.php b/src/Factory/Api/Twitter/DirectMessage.php
index f2a4771d37dbb6d9441bcfe3886c76a8b8e706db..07d3367b017d28f41db63f36def5c37447b1f244 100644 (file)
--- a/src/Factory/Api/Twitter/DirectMessage.php
+++ b/src/Factory/Api/Twitter/DirectMessage.php
@@ -51,7 +51,7 @@ class DirectMessage extends BaseFactory
         *
         * @param int    $id        Mail id
         * @param int    $uid       Mail user
-        * @param string $text_mode Either empty, "html" or "text"
+        * @param string $text_mode Either empty, "html" or "plain"
         *
         * @return \Friendica\Object\Api\Twitter\DirectMessage
         */

diff --git a/tests/datasets/mail/mail.fixture.php b/tests/datasets/mail/mail.fixture.php
index 215356beaa3ad435a2e9d7f232f8421a2f53023f..74f8bc1300d31f0d3bac29c99ee91d322badf4e5 100644 (file)
--- a/tests/datasets/mail/mail.fixture.php
+++ b/tests/datasets/mail/mail.fixture.php
@@ -10,8 +10,8 @@ return [
                        'thr-parent-id' => 44,
                        'guid'          => '123456',
                        'from-name'     => 'Tester',
-                       'title'         => 'test message',
-                       'body'          => 'this is a test',
+                       'title'         => 'item_title',
+                       'body'          => '[b]item_body[/b]',
                ],
        ],
 ];

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index eda1c6fdbe0c1ba73d3be79427b01d40ba197a20..db43fde4213148d1bd8deb1b01d871fedf423536 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -679,85 +679,6 @@ class ApiTest extends FixtureTest
                // api_statuses_mediap('json');
        }
 
-       /**
-        * Test the api_format_messages() function.
-        *
-        * @return void
-        */
-       public function testApiFormatMessages()
-       {
-               /*
-               $result = api_format_messages(
-                       ['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']);
-               self::assertEquals(2, $result['recipient_id']);
-               self::assertEquals(3, $result['sender_id']);
-               self::assertEquals('recipient_name', $result['recipient_screen_name']);
-               self::assertEquals('sender_name', $result['sender_screen_name']);
-               */
-       }
-
-       /**
-        * Test the api_format_messages() function with HTML.
-        *
-        * @return void
-        */
-       public function testApiFormatMessagesWithHtmlText()
-       {
-               /*
-               $_GET['getText'] = 'html';
-               $result          = api_format_messages(
-                       ['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']);
-               */
-       }
-
-       /**
-        * Test the api_format_messages() function with plain text.
-        *
-        * @return void
-        */
-       public function testApiFormatMessagesWithPlainText()
-       {
-               /*
-               $_GET['getText'] = 'plain';
-               $result          = api_format_messages(
-                       ['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']);
-               */
-       }
-
-       /**
-        * Test the api_format_messages() function with the getUserObjects GET parameter set to false.
-        *
-        * @return void
-        */
-       public function testApiFormatMessagesWithoutUserObjects()
-       {
-               /*
-               $_GET['getUserObjects'] = 'false';
-               $result                 = api_format_messages(
-                       ['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']));
-               */
-       }
-
        /**
         * Test the api_convert_item() function.
         *

diff --git a/tests/src/Factory/Api/Twitter/DirectMessageTest.php b/tests/src/Factory/Api/Twitter/DirectMessageTest.php
new file mode 100644 (file)
index 0000000..9cc7560
--- /dev/null
+++ b/tests/src/Factory/Api/Twitter/DirectMessageTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Friendica\Test\src\Factory\Api\Twitter;
+
+use Friendica\DI;
+use Friendica\Factory\Api\Twitter\DirectMessage;
+use Friendica\Test\FixtureTest;
+use Friendica\Test\src\Module\Api\ApiTest;
+
+class DirectMessageTest extends FixtureTest
+{
+       /**
+        * Test the api_format_messages() function.
+        *
+        * @return void
+        */
+       public function testApiFormatMessages()
+       {
+               $this->loadFixture(__DIR__ . '/../../../../datasets/mail/mail.fixture.php', DI::dba());
+               $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();
+
+               self::assertEquals('item_title' . "\n" . 'item_body', $directMessage['text']);
+               self::assertIsInt($directMessage['id']);
+               self::assertIsInt($directMessage['recipient_id']);
+               self::assertIsInt($directMessage['sender_id']);
+               self::assertEquals('selfcontact', $directMessage['recipient_screen_name']);
+               self::assertEquals('friendcontact', $directMessage['sender_screen_name']);
+       }
+
+       /**
+        * Test the api_format_messages() function with HTML.
+        *
+        * @return void
+        */
+       public function testApiFormatMessagesWithHtmlText()
+       {
+               $this->loadFixture(__DIR__ . '/../../../../datasets/mail/mail.fixture.php', DI::dba());
+               $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();
+
+               self::assertEquals('item_title', $directMessage['title']);
+               self::assertEquals('<strong>item_body</strong>', $directMessage['text']);
+       }
+
+       /**
+        * Test the api_format_messages() function with plain text.
+        *
+        * @return void
+        */
+       public function testApiFormatMessagesWithPlainText()
+       {
+               $this->loadFixture(__DIR__ . '/../../../../datasets/mail/mail.fixture.php', DI::dba());
+               $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();
+
+               self::assertEquals('item_title', $directMessage['title']);
+               self::assertEquals('item_body', $directMessage['text']);
+       }
+
+       /**
+        * Test the api_format_messages() function with the getUserObjects GET parameter set to false.
+        *
+        * @return void
+        */
+       public function testApiFormatMessagesWithoutUserObjects()
+       {
+               self::markTestIncomplete('Needs processing of "getUserObjects" first');
+
+               /*
+                $this->loadFixture(__DIR__ . '/../../../../datasets/mail/mail.fixture.php', DI::dba());
+               $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();
+
+               self::assertTrue(!isset($directMessage['sender']));
+               self::assertTrue(!isset($directMessage['recipient']));
+               */
+       }
+}

diff --git a/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php b/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
index c66a1f42eda8fdab061d1cba639d52196ff40835..9fe8f7ca708b10a165bdad989a141726ee3a9272 100644 (file)
--- a/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
+++ b/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
@@ -52,7 +52,7 @@ class SearchTest extends ApiTest
                $directMessage = new DirectMessage(new NullLogger(), DI::dba(), DI::twitterUser());
 
                $search   = new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]);
-               $response = $search->run(['searchstring' => 'test']);
+               $response = $search->run(['searchstring' => 'item_body']);
 
                $json = $this->toJson($response);