Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 35 insertions, 0 deletions

diff --git a/_test/tests/inc/ixr_library_date.test.php b/_test/tests/inc/ixr_library_date.test.php
new file mode 100644
index 000000000..f38486925
--- /dev/null
+++ b/_test/tests/inc/ixr_library_date.test.php
@@ -0,0 +1,35 @@
+<?php
+
+require_once DOKU_INC.'inc/IXR_Library.php';
+
+class ixr_library_date_test extends DokuWikiTest {
+
+
+    function test_parseIso(){
+        // multiple tests
+        $tests = array(
+            // full datetime, different formats
+            array('2010-08-17T09:23:14',  1282036994),
+            array('20100817T09:23:14',    1282036994),
+            array('2010-08-17 09:23:14',  1282036994),
+            array('20100817 09:23:14',    1282036994),
+            array('2010-08-17T09:23:14Z', 1282036994),
+            array('20100817T09:23:14Z',   1282036994),
+
+            // no seconds
+            array('2010-08-17T09:23',     1282036980),
+            array('20100817T09:23',       1282036980),
+
+            // no time
+            array('2010-08-17',           1282003200),
+            //array('20100817',             1282003200), #this will NOT be parsed, but is assumed to be timestamp
+        );
+
+        foreach($tests as $test){
+            $dt = new IXR_Date($test[0]);
+            $this->assertEquals($dt->getTimeStamp(),$test[1]);
+        }
+    }
+
+}
+//Setup VIM: ex: et ts=4 :