X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FUtilsTest.php;h=6a7870c4620ac5cd3bbf2a838f108c27755dd411;hb=e652ba3670a8481eaabb1f8bf721024107abd1e1;hp=02eecda216f8c03adafe50f57bcb32bdf7ace787;hpb=b16e3dc5903e23ac653d0de4e3bffc3d1e529a89;p=github%2Fshaarli%2FShaarli.git
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index 02eecda2..6a7870c4 100644
--- 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
*/
@@ -187,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);
- }
}