X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=tests%2FUtilsTest.php;h=3073b5eb45ca2736f7ed8cf649ad9997392e1287;hb=ebd8075a896484e43c7c938bbc606b67df102013;hp=311d4bfb4979016146549518637f9af931e2b3e3;hpb=70df947af60afb05529024bb2d3825eaf6cc7950;p=github%2Fshaarli%2FShaarli.git
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
old mode 100755
new mode 100644
index 311d4bfb..3073b5eb
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -18,6 +18,13 @@ class UtilsTest extends PHPUnit_Framework_TestCase
// Session ID hashes
protected static $sidHashes = null;
+ // Log file
+ protected static $testLogFile = 'tests.log';
+
+ // Expected log date format
+ protected static $dateFormat = 'Y/m/d H:i:s';
+
+
/**
* Assign reference data
*/
@@ -26,6 +33,65 @@ class UtilsTest extends PHPUnit_Framework_TestCase
self::$sidHashes = ReferenceSessionIdHashes::getHashes();
}
+ /**
+ * Resets test data before each test
+ */
+ protected function setUp()
+ {
+ if (file_exists(self::$testLogFile)) {
+ unlink(self::$testLogFile);
+ }
+ }
+
+ /**
+ * Returns a list of the elements from the last logged entry
+ *
+ * @return list (date, ip address, message)
+ */
+ protected function getLastLogEntry()
+ {
+ $logFile = file(self::$testLogFile);
+ return explode(' - ', trim(array_pop($logFile), PHP_EOL));
+ }
+
+ /**
+ * Log a message to a file - IPv4 client address
+ */
+ public function testLogmIp4()
+ {
+ $logMessage = 'IPv4 client connected';
+ logm(self::$testLogFile, '127.0.0.1', $logMessage);
+ list($date, $ip, $message) = $this->getLastLogEntry();
+
+ $this->assertInstanceOf(
+ 'DateTime',
+ DateTime::createFromFormat(self::$dateFormat, $date)
+ );
+ $this->assertTrue(
+ filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false
+ );
+ $this->assertEquals($logMessage, $message);
+ }
+
+ /**
+ * Log a message to a file - IPv6 client address
+ */
+ public function testLogmIp6()
+ {
+ $logMessage = 'IPv6 client connected';
+ logm(self::$testLogFile, '2001:db8::ff00:42:8329', $logMessage);
+ list($date, $ip, $message) = $this->getLastLogEntry();
+
+ $this->assertInstanceOf(
+ 'DateTime',
+ DateTime::createFromFormat(self::$dateFormat, $date)
+ );
+ $this->assertTrue(
+ filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false
+ );
+ $this->assertEquals($logMessage, $message);
+ }
+
/**
* Represent a link by its hash
*/
@@ -138,37 +204,6 @@ class UtilsTest extends PHPUnit_Framework_TestCase
$this->assertEquals('?', generateLocation($ref, 'localhost'));
}
- /**
- * Check supported PHP versions
- */
- public function testCheckSupportedPHPVersion()
- {
- $minVersion = '5.3';
- checkPHPVersion($minVersion, '5.4.32');
- checkPHPVersion($minVersion, '5.5');
- checkPHPVersion($minVersion, '5.6.10');
- }
-
- /**
- * Check a unsupported PHP version
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
- */
- public function testCheckSupportedPHPVersion51()
- {
- checkPHPVersion('5.3', '5.1.0');
- }
-
- /**
- * Check another unsupported PHP version
- * @expectedException Exception
- * @expectedExceptionMessageRegExp /Your PHP version is obsolete/
- */
- public function testCheckSupportedPHPVersion52()
- {
- checkPHPVersion('5.3', '5.2');
- }
-
/**
* Test is_session_id_valid with a valid ID - TEST ALL THE HASHES!
*
@@ -218,4 +253,41 @@ 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);
+ }
}