From: Chris Cormack Date: Sat, 28 Jul 2012 08:07:36 +0000 (+1200) Subject: Bug 8486 - Follow up making the tests db independent X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=d434be61e25f0be9b2d2102ab134ecbdae020cc3;hp=54f363c0a6ff3fa14236e6d390d692929d3e04aa;p=koha.git Bug 8486 - Follow up making the tests db independent Signed-off-by: Paul Poulain Makes the test db independant by specifying the date format. Thus, there is no call to ->preference() that retrieve a systempreference --- diff --git a/t/Calendar.t b/t/Calendar.t index d47e1043d9..283300ee52 100755 --- a/t/Calendar.t +++ b/t/Calendar.t @@ -106,24 +106,24 @@ $cal->set_daysmode('Calendar'); # example tests for bug report $cal->clear_weekly_closed_days(); -$daycount = $cal->days_between( dt_from_string('2012-01-10'), - dt_from_string("2012-05-05") )->in_units('days'); +$daycount = $cal->days_between( dt_from_string('2012-01-10','iso'), + dt_from_string("2012-05-05",'iso') )->in_units('days'); cmp_ok( $daycount, '==', 116, 'test larger intervals' ); -$daycount = $cal->days_between( dt_from_string("2012-01-01"), - dt_from_string("2012-05-05") )->in_units('days'); +$daycount = $cal->days_between( dt_from_string("2012-01-01",'iso'), + dt_from_string("2012-05-05",'iso') )->in_units('days'); cmp_ok( $daycount, '==', 125, 'test positive intervals' ); -my $daycount2 = $cal->days_between( dt_from_string("2012-05-05"), - dt_from_string("2012-01-01") )->in_units('days'); +my $daycount2 = $cal->days_between( dt_from_string("2012-05-05",'iso'), + dt_from_string("2012-01-01",'iso') )->in_units('days'); cmp_ok( $daycount2, '==', $daycount, 'test parameter order not relevant' ); -$daycount = $cal->days_between( dt_from_string("2012-07-01"), - dt_from_string("2012-07-15") )->in_units('days'); +$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), + dt_from_string("2012-07-15",'iso') )->in_units('days'); cmp_ok( $daycount, '==', 14, 'days_between calculates correctly' ); -$cal->add_holiday( dt_from_string('2012-07-06') ); -$daycount = $cal->days_between( dt_from_string("2012-07-01"), - dt_from_string("2012-07-15") )->in_units('days'); +$cal->add_holiday( dt_from_string('2012-07-06','iso') ); +$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), + dt_from_string("2012-07-15",'iso') )->in_units('days'); cmp_ok( $daycount, '==', 13, 'holiday correctly recognized' ); -$cal->add_holiday( dt_from_string('2012-07-07') ); -$daycount = $cal->days_between( dt_from_string("2012-07-01"), - dt_from_string("2012-07-15") )->in_units('days'); +$cal->add_holiday( dt_from_string('2012-07-07','iso') ); +$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), + dt_from_string("2012-07-15",'iso') )->in_units('days'); cmp_ok( $daycount, '==', 12, 'multiple holidays correctly recognized' );