Bug 7728: QA fixes

[koha.git] / t / DateUtils.t

diff --git a/t/DateUtils.t b/t/DateUtils.t
index 92f8777..47cf1c5 100755 (executable)
--- a/t/DateUtils.t
+++ b/t/DateUtils.t
@@ -3,7 +3,9 @@ use DateTime;
 use DateTime::TimeZone;
 
 use C4::Context;
-use Test::More tests => 59;
+
+use Test::More tests => 60;
+
 use Test::MockModule;
 use Test::Warn;
 use Time::HiRes qw/ gettimeofday /;
@@ -73,16 +75,19 @@ isa_ok( $new_dt, 'DateTime', 'Create DateTime with different timezone' );
 cmp_ok( $new_dt->ymd(), 'eq', $testdate_iso,
     'Returned Dublin object matches input' );
 
-for ( qw/ 2014-01-01 2100-01-01 9999-01-01 / ) {
-    my $duration = gettimeofday();
-    $new_dt = dt_from_string($_, 'iso', $dear_dirty_dublin);
-    $duration = gettimeofday() - $duration;
-    cmp_ok $duration, '<', 1, "Create DateTime with dt_from_string() for $_ with TZ in less than 1s";
-    $duration = gettimeofday();
-    output_pref( { dt => $new_dt } );
-    $duration = gettimeofday() - $duration;
-    cmp_ok $duration, '<', 1, "Create DateTime with output_pref() for $_ with TZ in less than 1s";
-}
+SKIP: {
+    skip "Don't test execution time of dt_from_string on slow servers", 6 if $ENV{SLOW_SERVER};
+    for ( qw/ 2014-01-01 2100-01-01 9999-01-01 / ) {
+        my $duration = gettimeofday();
+        $new_dt = dt_from_string($_, 'iso', $dear_dirty_dublin);
+        $duration = gettimeofday() - $duration;
+        cmp_ok $duration, '<', 1, "Create DateTime with dt_from_string() for $_ with TZ in less than 1s";
+        $duration = gettimeofday();
+        output_pref( { dt => $new_dt } );
+        $duration = gettimeofday() - $duration;
+        cmp_ok $duration, '<', 1, "Create DateTime with output_pref() for $_ with TZ in less than 1s";
+    }
+};
 
 $new_dt = dt_from_string( '2011-06-16 12:00', 'sql' );
 isa_ok( $new_dt, 'DateTime', 'Create DateTime from (mysql) sql' );
@@ -195,6 +200,8 @@ $dt = eval { dt_from_string( '31/01/2015', 'us' ); };
 is( ref($dt), '', '31/01/2015 is not a correct date in us format' );
 $dt = dt_from_string( '01/01/2015', 'us' );
 is( ref($dt), 'DateTime', '01/01/2015 is a correct date in us format' );
+$dt = dt_from_string( '01.01.2015', 'dmydot' );
+is( ref($dt), 'DateTime', '01.01.2015 is a correct date in dmydot format' );
 
 
 # default value for hh and mm is 00:00