X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=6a7870c4620ac5cd3bbf2a838f108c27755dd411;hb=d592daea8343bb4dfecff5d97e93699581ccc58c;hp=f3bb556ec5d0e7f851822a6d4d4cc71d9257c210;hpb=122d90ef8d83c6702a8b47f81c32fa3ba7a53c31;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index f3bb556e..6a7870c4 100644 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php @@ -51,7 +51,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase protected function getLastLogEntry() { $logFile = file(self::$testLogFile); - return explode(' - ', trim(array_pop($logFile), '\n')); + return explode(' - ', trim(array_pop($logFile), PHP_EOL)); } /** @@ -253,41 +253,4 @@ class UtilsTest extends PHPUnit_Framework_TestCase is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=') ); } - - /** - * Test text2clickable without a redirector being set. - */ - public function testText2clickableWithoutRedirector() - { - $text = 'stuff http://hello.there/is=someone#here otherstuff'; - $expectedText = 'stuff http://hello.there/is=someone#here otherstuff'; - $processedText = text2clickable($text, ''); - $this->assertEquals($expectedText, $processedText); - } - - /** - * Test text2clickable a redirector set. - */ - public function testText2clickableWithRedirector() - { - $text = 'stuff http://hello.there/is=someone#here otherstuff'; - $redirector = 'http://redirector.to'; - $expectedText = 'stuff http://hello.there/is=someone#here otherstuff'; - $processedText = text2clickable($text, $redirector); - $this->assertEquals($expectedText, $processedText); - } - - /** - * Test testSpace2nbsp. - */ - public function testSpace2nbsp() - { - $text = ' Are you thrilled by flags ?'. PHP_EOL .' Really?'; - $expectedText = '  Are you   thrilled  by flags   ?'. PHP_EOL .' Really?'; - $processedText = space2nbsp($text); - $this->assertEquals($expectedText, $processedText); - } }