Initial test for SimpleSAML\Utils\Time.

lib/SimpleSAML/Utils/Time.php

@@ -91,7 +91,8 @@ class Time
         }
 
         // parse the duration. We use a very strict pattern
-        $durationRegEx = '#^(-?)P(?:(?:(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)(?:[.,]\d+)?S)?)?)|(?:(\\d+)W))$#D';
+        $durationRegEx = '#^(-?)P(?:(?:(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)'.
+            '(?:[.,]\d+)?S)?)?)|(?:(\\d+)W))$#D';
         if (!preg_match($durationRegEx, $duration, $matches)) {
             throw new \InvalidArgumentException('Invalid ISO 8601 duration: '.$duration);
         }
@@ -159,4 +160,4 @@ class Time
 
         return $timestamp;
     }
-}
\ No newline at end of file
+}

tests/lib/SimpleSAML/Utils/TimeTest.php

+<?php
+
+namespace SimpleSAML\Test\Utils;
+
+use SimpleSAML\Utils\Time;
+
+class TimeTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test the SimpleSAML\Utils\Time::generateTimestamp() method.
+     */
+    public function testGenerateTimestamp()
+    {
+        // make sure passed timestamps are used
+        $this->assertEquals('2016-03-03T14:48:05Z', Time::generateTimestamp(1457016485));
+
+        // test timestamp generation for current time
+        $this->assertRegExp('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/', Time::generateTimestamp());
+    }
+}