X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2FDateUtils.t;h=9afddc1bd6b3dbe4eaee8882f97cd1d99f173d30;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=ed1ac9f71534f4967cfc8c0620a80d128461fee0;hpb=894a3939509ecfb6eeec3ae27a47ae99871fad9a;p=koha_fer

diff --git a/t/DateUtils.t b/t/DateUtils.t
index ed1ac9f715..9afddc1bd6 100755
--- a/t/DateUtils.t
+++ b/t/DateUtils.t
@@ -2,25 +2,146 @@ use strict;
 use warnings;
 use 5.010;
 use DateTime;
+use DateTime::TimeZone;
 
-use Test::More tests => 8;                      # last test to print
+use C4::Context;
+use Test::More tests => 34;
+use Test::MockModule;
 
-use_ok('Koha::DateUtils');
+BEGIN { use_ok('Koha::DateUtils'); }
 
-my $dt_metric = dt_from_string('01/02/2010', 'metric', 'Europe/London');
-isa_ok $dt_metric, 'DateTime', 'metric returns a DateTime object';
-cmp_ok $dt_metric->ymd(), 'eq', '2010-02-01', 'metric date correct';
+my $tz = C4::Context->tz;
 
-my $dt_us = dt_from_string('02/01/2010', 'us', 'Europe/London');
-isa_ok $dt_us, 'DateTime', 'us returns a DateTime object';
-cmp_ok $dt_us->ymd(), 'eq', '2010-02-01', 'us date correct';
+isa_ok( $tz, 'DateTime::TimeZone', 'Context returns timezone object' );
 
-my $dt_iso = dt_from_string('2010-02-01', 'iso', 'Europe/London');
-isa_ok $dt_iso, 'DateTime', 'iso returns a DateTime object';
-cmp_ok $dt_iso->ymd(), 'eq', '2010-02-01', 'iso date correct';
+my $testdate_iso = '2011-06-16';                   # Bloomsday 2011
+my $dt = dt_from_string( $testdate_iso, 'iso' );
 
+isa_ok( $dt, 'DateTime', 'dt_from_string returns a DateTime object' );
 
+cmp_ok( $dt->ymd(), 'eq', $testdate_iso, 'Returned object matches input' );
 
-my $dt = dt_from_string( undef );
+$dt->set_hour(12);
+$dt->set_minute(0);
 
-isa_ok $dt, 'DateTime', 'No string returns a DateTime object';
+my $date_string;
+
+my $module_context = new Test::MockModule('C4::Context');
+$module_context->mock(
+    'preference',
+    sub {
+        return 'us';
+    }
+);
+
+my $dateformat = C4::Context->preference('dateformat');
+cmp_ok  output_pref({ dt => $dt, dateformat => $dateformat }),
+        'eq',
+        output_pref($dt),
+        'output_pref gives an hashref or a dt';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'iso', timeformat => '24hr' });
+cmp_ok $date_string, 'eq', '2011-06-16 12:00', 'iso output';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'iso', timeformat => '12hr' });
+cmp_ok $date_string, 'eq', '2011-06-16 12:00 PM', 'iso output 12hr';
+
+# "notime" doesn't actually mean anything in this context, but we
+# can't pass undef or output_pref will try to access the database
+$date_string = output_pref({ dt => $dt, dateformat => 'iso', timeformat => 'notime', dateonly => 1 });
+cmp_ok $date_string, 'eq', '2011-06-16', 'iso output (date only)';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'us', timeformat => '24hr' });
+cmp_ok $date_string, 'eq', '06/16/2011 12:00', 'us output';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'us', timeformat => '12hr' });
+cmp_ok $date_string, 'eq', '06/16/2011 12:00 PM', 'us output 12hr';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'us', timeformat => 'notime', dateonly => 1 });
+cmp_ok $date_string, 'eq', '06/16/2011', 'us output (date only)';
+
+# metric should return the French Revolutionary Calendar Really
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr' });
+cmp_ok $date_string, 'eq', '16/06/2011 12:00', 'metric output';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => 'notime', dateonly => 1 });
+cmp_ok $date_string, 'eq', '16/06/2011', 'metric output (date only)';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr' });
+cmp_ok $date_string, 'eq', '16/06/2011 12:00',
+  'output_pref preserves non midnight HH:SS';
+
+my $dear_dirty_dublin = DateTime::TimeZone->new( name => 'Europe/Dublin' );
+my $new_dt = dt_from_string( '16/06/2011', 'metric', $dear_dirty_dublin );
+isa_ok( $new_dt, 'DateTime', 'Create DateTime with different timezone' );
+cmp_ok( $new_dt->ymd(), 'eq', $testdate_iso,
+    'Returned Dublin object matches input' );
+
+$new_dt = dt_from_string( '2011-06-16 12:00', 'sql' );
+isa_ok( $new_dt, 'DateTime', 'Create DateTime from (mysql) sql' );
+cmp_ok( $new_dt->ymd(), 'eq', $testdate_iso, 'sql returns correct date' );
+
+$new_dt = dt_from_string( $dt, 'iso' );
+isa_ok( $new_dt, 'DateTime', 'Passed a DateTime dt_from_string returns it' );
+
+# C4::Dates allowed 00th of the month
+
+my $ymd = '2012-01-01';
+my $dt0 = dt_from_string( '00/01/2012', 'metric' );
+isa_ok( $dt0, 'DateTime',
+    'dt_from_string returns a DateTime object passed a zero metric day' );
+cmp_ok( $dt0->ymd(), 'eq', $ymd, 'Returned object corrects metric day 0' );
+
+$dt0 = dt_from_string( '01/00/2012', 'us' );
+isa_ok( $dt0, 'DateTime',
+    'dt_from_string returns a DateTime object passed a zero us day' );
+cmp_ok( $dt0->ymd(), 'eq', $ymd, 'Returned object corrects us day 0' );
+
+$dt0 = dt_from_string( '2012-01-00', 'iso' );
+isa_ok( $dt0, 'DateTime',
+    'dt_from_string returns a DateTime object passed a zero iso day' );
+cmp_ok( $dt0->ymd(), 'eq', $ymd, 'Returned object corrects iso day 0' );
+
+# Return undef if passed mysql 0 dates
+$dt0 = dt_from_string( '0000-00-00', 'iso' );
+is( $dt0, undef, "undefined returned for 0 iso date" );
+
+my $formatted = format_sqldatetime( '2011-06-16 12:00:07', 'metric', '24hr' );
+cmp_ok( $formatted, 'eq', '16/06/2011 12:00', 'format_sqldatetime conversion' );
+
+$formatted = format_sqldatetime( undef, 'metric' );
+cmp_ok( $formatted, 'eq', q{},
+    'format_sqldatetime formats undef as empty string' );
+
+# Test the as_due_date parameter
+$dt = DateTime->new(
+    year       => 2013,
+    month      => 12,
+    day        => 11,
+    hour       => 23,
+    minute     => 59,
+);
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr', as_due_date => 1 });
+cmp_ok $date_string, 'eq', '11/12/2013', 'as_due_date with hours and timeformat 24hr';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr', dateonly => 1, as_due_date => 1});
+cmp_ok $date_string, 'eq', '11/12/2013', 'as_due_date without hours and timeformat 24hr';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '12hr', as_due_date => 1 });
+cmp_ok $date_string, 'eq', '11/12/2013', 'as_due_date with hours and timeformat 12hr';
+
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '12hr', dateonly => 1, as_due_date => 1});
+cmp_ok $date_string, 'eq', '11/12/2013', 'as_due_date without hours and timeformat 12hr';
+
+# Test as_due_date for hourly loans
+$dt = DateTime->new(
+    year       => 2013,
+    month      => 12,
+    day        => 11,
+    hour       => 18,
+    minute     => 35,
+);
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr', as_due_date => 1 });
+cmp_ok $date_string, 'eq', '11/12/2013 18:35', 'as_due_date with hours and timeformat 24hr (non-midnight time)';
+$date_string = output_pref({ dt => $dt, dateformat => 'us', timeformat => '12hr', as_due_date => 1 });
+cmp_ok $date_string, 'eq', '12/11/2013 06:35 PM', 'as_due_date with hours and timeformat 12hr (non-midnight time)';