X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=c885f552350b62cf003921c5b36673b3224eea14;hb=2d3a9be73de8a2e7b38ba0c8af19b940bf376243;hp=869a9695be1b2075eac0e6f0e9eadcdc170ed5b7;hpb=1abe655597da7b3c5b59146c4351eef59f69514c;p=github%2Fshaarli%2FShaarli.git
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 869a9695..c885f552 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,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 http://hello.there/is=someone#here 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 http://hello.there/is=someone#here 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 = ' Are you thrilled by flags ?'. PHP_EOL .' 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));
}
}