X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=6a7870c4620ac5cd3bbf2a838f108c27755dd411;hb=f63632a6fb84594b8aeacb387a5cd17b4a841d2c;hp=869a9695be1b2075eac0e6f0e9eadcdc170ed5b7;hpb=73151d95469b6aee727f3c1f55c07bb91346f9d3;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 869a9695..6a7870c4 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -22,7 +22,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase
     protected static $testLogFile = 'tests.log';
 
     // Expected log date format
-    protected static $dateFormat = 'Y/m/d_H:i:s';
+    protected static $dateFormat = 'Y/m/d H:i:s';
     
 
     /**
@@ -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 <a href="http://hello.there/is=someone#here">http://hello.there/is=someone#here</a> 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 <a href="'.
-            $redirector .
-            urlencode('http://hello.there/is=someone#here') .
-            '">http://hello.there/is=someone#here</a> otherstuff';
-        $processedText = text2clickable($text, $redirector);
-        $this->assertEquals($expectedText, $processedText);
-    }
-
-    /**
-     * Test testSpace2nbsp.
-     */
-    public function testSpace2nbsp()
-    {
-        $text = '  Are you   thrilled  by flags   ?'. PHP_EOL .' Really?';
-        $expectedText = '&nbsp; Are you &nbsp; thrilled &nbsp;by flags &nbsp; ?'. PHP_EOL .'&nbsp;Really?';
-        $processedText = space2nbsp($text);
-        $this->assertEquals($expectedText, $processedText);
-    }
 }