Jonathan Druart
320d2c586a
To simplify the management of dates, it would be great that output_pref takes a string in parameter.
my $date = $input->param('my_date');
$date = eval { dt_from_string( $date ) } if $date;
$date = output_pref({dt => $date}) if $date;
Could be replace with:
my $date = output_pref({ str => $input->param('my_date') });
Tested with t/DateUtils.t, passed OK.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
225 lines
9.5 KiB
Perl
Executable file
225 lines
9.5 KiB
Perl
Executable file
use Modern::Perl;
|
|
use DateTime;
|
|
use DateTime::TimeZone;
|
|
|
|
use C4::Context;
|
|
use Test::More tests => 58;
|
|
use Test::MockModule;
|
|
use Test::Warn;
|
|
use Time::HiRes qw/ gettimeofday /;
|
|
use t::lib::Mocks;
|
|
|
|
BEGIN { use_ok('Koha::DateUtils'); }
|
|
|
|
t::lib::Mocks::mock_preference('dateformat', 'us');
|
|
t::lib::Mocks::mock_preference('TimeFormat', 'This_is_not_used_but_called');
|
|
|
|
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 $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' );
|
|
|
|
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' );
|
|
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" );
|
|
|
|
# Return undef if passed mysql 9999-* date
|
|
my $dt9999 = dt_from_string( '9999-12-31', 'sql' );
|
|
is( $dt9999->ymd(), '9999-12-31', "dt_from_string should return a DateTime object for 9999-12-31" );
|
|
|
|
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)';
|
|
|
|
my $now = DateTime->now;
|
|
is( dt_from_string, $now, "Without parameter, dt_from_string should return today" );
|
|
|
|
my $module_context = new Test::MockModule('C4::Context');
|
|
$module_context->mock(
|
|
'tz',
|
|
sub {
|
|
return DateTime::TimeZone->new( name => 'Europe/Lisbon' );
|
|
}
|
|
);
|
|
|
|
$dt = dt_from_string('1979-04-01');
|
|
isa_ok( $dt, 'DateTime', 'dt_from_string should return a DateTime object if a DST is given' );
|
|
|
|
$module_context->mock(
|
|
'tz',
|
|
sub {
|
|
return DateTime::TimeZone->new( name => 'Europe/Paris' );
|
|
}
|
|
);
|
|
|
|
$dt = dt_from_string('2014-03-30 02:00:00');
|
|
isa_ok( $dt, 'DateTime', 'dt_from_string should return a DateTime object if a DST is given' );
|
|
|
|
# Test dt_from_string
|
|
t::lib::Mocks::mock_preference('dateformat', 'metric');
|
|
t::lib::Mocks::mock_preference('TimeFormat', '24hr');
|
|
|
|
# dt_from_string should take into account the dateformat pref, or the given parameter
|
|
$dt = dt_from_string('31/01/2015');
|
|
is( ref($dt), 'DateTime', '31/01/2015 is a correct date in metric format' );
|
|
is( output_pref( { dt => $dt, dateonly => 1 } ), '31/01/2015' );
|
|
$dt = eval { dt_from_string( '31/01/2015', 'iso' ); };
|
|
is( ref($dt), '', '31/01/2015 is not a correct date in iso format' );
|
|
$dt = eval { dt_from_string( '01/01/2015', 'iso' ); };
|
|
is( ref($dt), '', '01/01/2015 is not a correct date in iso format' );
|
|
$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' );
|
|
|
|
|
|
# default value for hh and mm is 00:00
|
|
$dt = dt_from_string('31/01/2015');
|
|
is( output_pref( { dt => $dt } ), '31/01/2015 00:00', 'dt_from_string should generate a DT object with 00:00 as default hh:mm' );
|
|
|
|
$dt = dt_from_string('31/01/2015 12:34');
|
|
is( output_pref( { dt => $dt } ), '31/01/2015 12:34', 'dt_from_string should match hh:mm' );
|
|
|
|
$dt = dt_from_string('31/01/2015 12:34:56');
|
|
is( output_pref( { dt => $dt } ), '31/01/2015 12:34', 'dt_from_string should match hh:mm:ss' );
|
|
|
|
# date before 1900
|
|
$dt = dt_from_string('01/01/1900');
|
|
is( output_pref( { dt => $dt, dateonly => 1 } ), '01/01/1900', 'dt_from_string should manage date < 1900' );
|
|
|
|
# fallback
|
|
$dt = dt_from_string('2015-01-31 01:02:03');
|
|
is( output_pref( {dt => $dt} ), '31/01/2015 01:02', 'dt_from_string should fallback to sql format' );
|
|
|
|
# output_pref with str parameter
|
|
is( output_pref( { 'str' => $testdate_iso, dateformat => 'iso', dateonly => 1 } ), $testdate_iso, 'output_pref should handle correctly the iso parameter' );
|
|
is( output_pref( { 'str' => 'invalid_date', dateformat => 'iso', dateonly => 1 } ), undef, 'output_pref should return undef if an invalid date is passed' );
|
|
warning_is { output_pref( { 'str' => $testdate_iso, dt => $dt, dateformat => 'iso', dateonly => 1 } ) }
|
|
{ carped => 'output_pref should not be called with both dt and str parameters' },
|
|
'output_pref should carp if str and dt parameters are passed together';
|