use DateTime::TimeZone;
use C4::Context;
-use Test::More tests => 28;
+use Test::More tests => 31;
+use Test::MockModule;
BEGIN { use_ok('Koha::DateUtils'); }
$dt->set_hour(12);
$dt->set_minute(0);
-my $date_string = output_pref( $dt, 'iso' );
+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';
-my $date_string = output_pref( $dt, 'iso',1 );
+$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, 'us' );
+$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, 'us', 1 );
+$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, 'metric' );
+$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, 'metric',1 );
+$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_due( $dt, 'metric' );
+$date_string = output_pref({ dt => $dt, dateformat => 'metric', timeformat => '24hr' });
cmp_ok $date_string, 'eq', '16/06/2011 12:00',
'output_pref_due preserves non midnight HH:SS';
$dt->set_hour(23);
$dt->set_minute(59);
-$date_string = output_pref_due( $dt, 'metric' );
+$date_string = output_pref_due({ dt => $dt, dateformat => 'metric', timeformat => '24hr' });
cmp_ok $date_string, 'eq', '16/06/2011',
'output_pref_due truncates HH:SS at midnight';
$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' );
+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' );
-$formatted = format_sqlduedatetime( '2011-06-16 12:00:07', 'metric' );
+$formatted = format_sqlduedatetime( '2011-06-16 12:00:07', 'metric', '24hr' );
cmp_ok(
$formatted, 'eq',
'16/06/2011 12:00',
'format_sqlduedatetime conversion for hourly loans'
);
-$formatted = format_sqlduedatetime( '2011-06-16 23:59:07', 'metric' );
+$formatted = format_sqlduedatetime( '2011-06-16 23:59:07', 'metric', '24hr' );
cmp_ok( $formatted, 'eq', '16/06/2011',
'format_sqlduedatetime conversion for daily loans' );