b9492e73f5
There are 2 useless routines in the Koha::DateUtils module:output_pref_due and format_sqlduedatetime. We can call output_pref and format_datetime with dateonly = 0. format_sqlduedatetime is only used in one place: opac-reserve.pl Test plan: 1/ Verify on the opac-reserve.pl page that the date is correctly displayed for for onloan items (you should use the "specific copy" feature). 2/ Launch prove t/DateUtils.t UT file and verify all UT pass. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Due date on opac-reserve shown correctly. Unit tests pass. Did a grep on both function names. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> No references to subs found. Passes koha-qa.pl, t and xt Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
110 lines
4.1 KiB
Perl
Executable file
110 lines
4.1 KiB
Perl
Executable file
use strict;
|
|
use warnings;
|
|
use 5.010;
|
|
use DateTime;
|
|
use DateTime::TimeZone;
|
|
|
|
use C4::Context;
|
|
use Test::More tests => 27;
|
|
use Test::MockModule;
|
|
|
|
BEGIN { use_ok('Koha::DateUtils'); }
|
|
|
|
my $tz = C4::Context->tz;
|
|
|
|
isa_ok( $tz, 'DateTime::TimeZone', 'Context returns timezone object' );
|
|
|
|
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' );
|
|
|
|
$dt->set_hour(12);
|
|
$dt->set_minute(0);
|
|
|
|
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)';
|
|
|
|
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' );
|