X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=c885f552350b62cf003921c5b36673b3224eea14;hb=7f96d9ec21a95cb85d0292b46e18235b20efbcb2;hp=f3bb556ec5d0e7f851822a6d4d4cc71d9257c210;hpb=122d90ef8d83c6702a8b47f81c32fa3ba7a53c31;p=github%2Fshaarli%2FShaarli.git

diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index f3bb556e..c885f552 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,33 @@ class UtilsTest extends PHPUnit_Framework_TestCase
             is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI=')
         );
     }
-
+    
     /**
-     * Test text2clickable without a redirector being set.
+     * Test generateSecretApi.
      */
-    public function testText2clickableWithoutRedirector()
+    public function testGenerateSecretApi()
     {
-        $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);
+        $this->assertEquals(12, strlen(generate_api_secret('foo', 'bar')));
     }
 
     /**
-     * Test text2clickable a redirector set.
+     * Test generateSecretApi with invalid parameters.
      */
-    public function testText2clickableWithRedirector()
+    public function testGenerateSecretApiInvalid()
     {
-        $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);
+        $this->assertFalse(generate_api_secret('', ''));
+        $this->assertFalse(generate_api_secret(false, false));
     }
 
     /**
-     * Test testSpace2nbsp.
+     * Test normalize_spaces.
      */
-    public function testSpace2nbsp()
+    public function testNormalizeSpace()
     {
-        $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);
+        $str = ' foo   bar is   important ';
+        $this->assertEquals('foo bar is important', normalize_spaces($str));
+        $this->assertEquals('foo', normalize_spaces('foo'));
+        $this->assertEquals('', normalize_spaces(''));
+        $this->assertEquals(null, normalize_spaces(null));
     }
 }