Merge pull request #8128 from nupplaphil/task/di_static_methods

[friendica.git] / tests / src / Content / Text / BBCodeTest.php

diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 3d8beb3930607e662fa375935ed4ce027bfa59c9..ed33306edf85bb395504bf53293374d669a387f3 100644 (file)
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -179,42 +179,96 @@ class BBCodeTest extends MockedTest
                        'bug-2199-named-size' => [
                                'expectedHtml' => '<span style="font-size: xx-large; line-height: initial;">Test text</span>',
                                'text' => '[size=xx-large]Test text[/size]',
-                               'simpleHtml' => 0,
                        ],
                        'bug-2199-numeric-size' => [
                                'expectedHtml' => '<span style="font-size: 24px; line-height: initial;">Test text</span>',
                                'text' => '[size=24]Test text[/size]',
-                               'simpleHtml' => 0,
                        ],
                        'bug-2199-diaspora-no-named-size' => [
                                'expectedHtml' => 'Test text',
                                'text' => '[size=xx-large]Test text[/size]',
+                               'try_oembed' => false,
                                // Triggers the diaspora compatible output
                                'simpleHtml' => 3,
                        ],
                        'bug-2199-diaspora-no-numeric-size' => [
                                'expectedHtml' => 'Test text',
                                'text' => '[size=24]Test text[/size]',
+                               'try_oembed' => false,
                                // Triggers the diaspora compatible output
                                'simpleHtml' => 3,
                        ],
+                       'bug-7665-audio-tag' => [
+                               'expectedHtml' => '<audio src="http://www.cendrones.fr/colloque2017/jonathanbocquet.mp3" controls="controls"><a href="http://www.cendrones.fr/colloque2017/jonathanbocquet.mp3">http://www.cendrones.fr/colloque2017/jonathanbocquet.mp3</a></audio>',
+                               'text' => '[audio]http://www.cendrones.fr/colloque2017/jonathanbocquet.mp3[/audio]',
+                               'try_oembed' => true,
+                       ],
+                       'bug-7808-code-lt' => [
+                               'expectedHtml' => '<code>&lt;</code>',
+                               'text' => '[code]<[/code]',
+                       ],
+                       'bug-7808-code-gt' => [
+                               'expectedHtml' => '<code>&gt;</code>',
+                               'text' => '[code]>[/code]',
+                       ],
+                       'bug-7808-code-amp' => [
+                               'expectedHtml' => '<code>&amp;</code>',
+                               'text' => '[code]&[/code]',
+                       ]
                ];
        }
 
        /**
         * Test convert bbcodes to HTML
+        *
         * @dataProvider dataBBCodes
         *
         * @param string $expectedHtml Expected HTML output
         * @param string $text         BBCode text
+        * @param bool   $try_oembed   Whether to convert multimedia BBCode tag
         * @param int    $simpleHtml   BBCode::convert method $simple_html parameter value, optional.
         * @param bool   $forPlaintext BBCode::convert method $for_plaintext parameter value, optional.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function testConvert($expectedHtml, $text, $simpleHtml = 0, $forPlaintext = false)
+       public function testConvert($expectedHtml, $text, $try_oembed = false, $simpleHtml = 0, $forPlaintext = false)
        {
-               $actual = BBCode::convert($text, false, $simpleHtml, $forPlaintext);
+               $actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext);
 
                $this->assertEquals($expectedHtml, $actual);
        }
+
+       public function dataBBCodesToMarkdown()
+       {
+               return [
+                       'bug-7808-gt' => [
+                               'expected' => '&gt;`>`',
+                               'text' => '>[code]>[/code]',
+                       ],
+                       'bug-7808-lt' => [
+                               'expected' => '&lt;`<`',
+                               'text' => '<[code]<[/code]',
+                       ],
+                       'bug-7808-amp' => [
+                               'expected' => '&amp;`&`',
+                               'text' => '&[code]&[/code]',
+                       ],
+               ];
+       }
+
+       /**
+        * Test convert bbcodes to Markdown
+        *
+        * @dataProvider dataBBCodesToMarkdown
+        *
+        * @param string $expected     Expected Markdown output
+        * @param string $text         BBCode text
+        * @param bool   $for_diaspora
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public function testToMarkdown($expected, $text, $for_diaspora = false)
+       {
+               $actual = BBCode::toMarkdown($text, $for_diaspora);
+
+               $this->assertEquals($expected, $actual);
+       }
 }