Bug 33727: (QA follow-up) perl tidy whole file
Test plan: Run prove again. Run qa tools. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> (cherry picked from commitc0f2a47d3c
) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> (cherry picked from commit8ecb70b338
) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
parent
419d3ca563
commit
08741b6426
1 changed files with 258 additions and 212 deletions
|
@ -34,13 +34,14 @@ my $schema = Koha::Database->new->schema;
|
|||
my $builder = t::lib::TestBuilder->new;
|
||||
$schema->storage->txn_begin;
|
||||
|
||||
my $today = dt_from_string();
|
||||
my $today = dt_from_string();
|
||||
my $holiday_dt = $today->clone;
|
||||
$holiday_dt->add(days => 3);
|
||||
$holiday_dt->add( days => 3 );
|
||||
|
||||
Koha::Caches->get_instance()->flush_all();
|
||||
|
||||
subtest 'Original tests from t' => sub {
|
||||
|
||||
# We need to mock the C4::Context->preference method for
|
||||
# simplicity and re-usability of the session definition. Any
|
||||
# syspref fits for syspref-agnostic tests.
|
||||
|
@ -52,31 +53,31 @@ subtest 'Original tests from t' => sub {
|
|||
}
|
||||
);
|
||||
|
||||
my $mpl = $builder->build_object({ class => 'Koha::Libraries' })->branchcode;
|
||||
my $cpl = $builder->build_object({ class => 'Koha::Libraries' })->branchcode;
|
||||
my $rows = [ # add weekly holidays
|
||||
{ branchcode => $mpl, weekday => 0 }, # sundays
|
||||
{ branchcode => $mpl, weekday => 6 }, # saturdays
|
||||
{ branchcode => $mpl, day => 1, month => 1 }, # new year's day
|
||||
{ branchcode => $mpl, day => 25, month => 12 }, # chrismas
|
||||
my $mpl = $builder->build_object( { class => 'Koha::Libraries' } )->branchcode;
|
||||
my $cpl = $builder->build_object( { class => 'Koha::Libraries' } )->branchcode;
|
||||
my $rows = [ # add weekly holidays
|
||||
{ branchcode => $mpl, weekday => 0 }, # sundays
|
||||
{ branchcode => $mpl, weekday => 6 }, # saturdays
|
||||
{ branchcode => $mpl, day => 1, month => 1 }, # new year's day
|
||||
{ branchcode => $mpl, day => 25, month => 12 }, # chrismas
|
||||
];
|
||||
$schema->resultset('RepeatableHoliday')->delete_all;
|
||||
$schema->resultset('RepeatableHoliday')->create({ %$_, description => q{} }) for @$rows;
|
||||
$schema->resultset('RepeatableHoliday')->create( { %$_, description => q{} } ) for @$rows;
|
||||
|
||||
$rows = [ # exception holidays
|
||||
$rows = [ # exception holidays
|
||||
{ branchcode => $mpl, day => 11, month => 11, year => 2012, isexception => 1 }, # sunday exception
|
||||
{ branchcode => $mpl, day => 1, month => 6, year => 2011, isexception => 0 },
|
||||
{ branchcode => $mpl, day => 4, month => 7, year => 2012, isexception => 0 },
|
||||
{ branchcode => $cpl, day => 6, month => 8, year => 2012, isexception => 0 },
|
||||
{ branchcode => $mpl, day => 7, month => 7, year => 2012, isexception => 1 }, # holiday exception
|
||||
{ branchcode => $mpl, day => 7, month => 7, year => 2012, isexception => 0 }, # holiday
|
||||
{ branchcode => $mpl, day => 7, month => 7, year => 2012, isexception => 1 }, # holiday exception
|
||||
{ branchcode => $mpl, day => 7, month => 7, year => 2012, isexception => 0 }, # holiday
|
||||
];
|
||||
$schema->resultset('SpecialHoliday')->delete_all;
|
||||
$schema->resultset('SpecialHoliday')->create({ %$_, description => q{} }) for @$rows;
|
||||
$schema->resultset('SpecialHoliday')->create( { %$_, description => q{} } ) for @$rows;
|
||||
|
||||
my $cache = Koha::Caches->get_instance();
|
||||
$cache->clear_from_cache( $mpl.'_holidays' );
|
||||
$cache->clear_from_cache( $cpl.'_holidays' );
|
||||
$cache->clear_from_cache( $mpl . '_holidays' );
|
||||
$cache->clear_from_cache( $cpl . '_holidays' );
|
||||
|
||||
# $mpl branch is arbitrary, is not used at all but is needed for initialization
|
||||
my $cal = Koha::Calendar->new( branchcode => $mpl );
|
||||
|
@ -84,81 +85,84 @@ subtest 'Original tests from t' => sub {
|
|||
isa_ok( $cal, 'Koha::Calendar', 'Calendar class returned' );
|
||||
|
||||
my $saturday = DateTime->new(
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 24,
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 24,
|
||||
);
|
||||
|
||||
my $sunday = DateTime->new(
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 25,
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 25,
|
||||
);
|
||||
|
||||
my $monday = DateTime->new(
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 26,
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 26,
|
||||
);
|
||||
|
||||
my $new_year = DateTime->new(
|
||||
year => 2013,
|
||||
month => 1,
|
||||
day => 1,
|
||||
year => 2013,
|
||||
month => 1,
|
||||
day => 1,
|
||||
);
|
||||
|
||||
my $single_holiday = DateTime->new(
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 1,
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 1,
|
||||
); # should be a holiday
|
||||
|
||||
my $notspecial = DateTime->new(
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 2
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 2
|
||||
); # should NOT be a holiday
|
||||
|
||||
my $sunday_exception = DateTime->new(
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 11
|
||||
year => 2012,
|
||||
month => 11,
|
||||
day => 11
|
||||
);
|
||||
|
||||
my $day_after_christmas = DateTime->new(
|
||||
year => 2012,
|
||||
month => 12,
|
||||
day => 26
|
||||
); # for testing negative addDuration
|
||||
year => 2012,
|
||||
month => 12,
|
||||
day => 26
|
||||
); # for testing negative addDuration
|
||||
|
||||
my $holiday_for_another_branch = DateTime->new(
|
||||
year => 2012,
|
||||
year => 2012,
|
||||
month => 8,
|
||||
day => 6, # This is a monday
|
||||
day => 6, # This is a monday
|
||||
);
|
||||
|
||||
my $holiday_excepted = DateTime->new(
|
||||
year => 2012,
|
||||
year => 2012,
|
||||
month => 7,
|
||||
day => 7, # Both a holiday and exception
|
||||
day => 7, # Both a holiday and exception
|
||||
);
|
||||
|
||||
{ # Syspref-agnostic tests
|
||||
is ( $saturday->day_of_week, 6, '\'$saturday\' is actually a saturday (6th day of week)');
|
||||
is ( $sunday->day_of_week, 7, '\'$sunday\' is actually a sunday (7th day of week)');
|
||||
is ( $monday->day_of_week, 1, '\'$monday\' is actually a monday (1st day of week)');
|
||||
is ( $cal->is_holiday($saturday), 1, 'Saturday is a closed day' );
|
||||
is ( $cal->is_holiday($sunday), 1, 'Sunday is a closed day' );
|
||||
is ( $cal->is_holiday($monday), 0, 'Monday is not a closed day' );
|
||||
is ( $cal->is_holiday($new_year), 1, 'Month/Day closed day test (New year\'s day)' );
|
||||
is ( $cal->is_holiday($single_holiday), 1, 'Single holiday closed day test' );
|
||||
is ( $cal->is_holiday($notspecial), 0, 'Fixed single date that is not a holiday test' );
|
||||
is ( $cal->is_holiday($sunday_exception), 0, 'Exception holiday is not a closed day test' );
|
||||
is ( $cal->is_holiday($holiday_for_another_branch), 0, 'Holiday defined for another branch should not be defined as an holiday' );
|
||||
is ( $cal->is_holiday($holiday_excepted), 0, 'Holiday defined and excepted should not be a holiday' );
|
||||
{ # Syspref-agnostic tests
|
||||
is( $saturday->day_of_week, 6, '\'$saturday\' is actually a saturday (6th day of week)' );
|
||||
is( $sunday->day_of_week, 7, '\'$sunday\' is actually a sunday (7th day of week)' );
|
||||
is( $monday->day_of_week, 1, '\'$monday\' is actually a monday (1st day of week)' );
|
||||
is( $cal->is_holiday($saturday), 1, 'Saturday is a closed day' );
|
||||
is( $cal->is_holiday($sunday), 1, 'Sunday is a closed day' );
|
||||
is( $cal->is_holiday($monday), 0, 'Monday is not a closed day' );
|
||||
is( $cal->is_holiday($new_year), 1, 'Month/Day closed day test (New year\'s day)' );
|
||||
is( $cal->is_holiday($single_holiday), 1, 'Single holiday closed day test' );
|
||||
is( $cal->is_holiday($notspecial), 0, 'Fixed single date that is not a holiday test' );
|
||||
is( $cal->is_holiday($sunday_exception), 0, 'Exception holiday is not a closed day test' );
|
||||
is(
|
||||
$cal->is_holiday($holiday_for_another_branch), 0,
|
||||
'Holiday defined for another branch should not be defined as an holiday'
|
||||
);
|
||||
is( $cal->is_holiday($holiday_excepted), 0, 'Holiday defined and excepted should not be a holiday' );
|
||||
}
|
||||
|
||||
{ # Bugzilla #8966 - is_holiday truncates referenced date
|
||||
{ # Bugzilla #8966 - is_holiday truncates referenced date
|
||||
my $later_dt = DateTime->new( # Monday
|
||||
year => 2012,
|
||||
month => 9,
|
||||
|
@ -168,159 +172,200 @@ subtest 'Original tests from t' => sub {
|
|||
time_zone => 'Europe/London',
|
||||
);
|
||||
|
||||
|
||||
is( $cal->is_holiday($later_dt), 0, 'bz-8966 (1/2) Apply is_holiday for the next test' );
|
||||
cmp_ok( $later_dt, 'eq', '2012-09-17T17:30:00', 'bz-8966 (2/2) Date should be the same after is_holiday' );
|
||||
}
|
||||
|
||||
{ # Bugzilla #8800 - is_holiday should use truncated date for 'contains' call
|
||||
{ # Bugzilla #8800 - is_holiday should use truncated date for 'contains' call
|
||||
my $single_holiday_time = DateTime->new(
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 1,
|
||||
hour => 11,
|
||||
minute => 2
|
||||
year => 2011,
|
||||
month => 6,
|
||||
day => 1,
|
||||
hour => 11,
|
||||
minute => 2
|
||||
);
|
||||
|
||||
is( $cal->is_holiday($single_holiday_time),
|
||||
$cal->is_holiday($single_holiday) ,
|
||||
'bz-8800 is_holiday should truncate the date for holiday validation' );
|
||||
is(
|
||||
$cal->is_holiday($single_holiday_time),
|
||||
$cal->is_holiday($single_holiday),
|
||||
'bz-8800 is_holiday should truncate the date for holiday validation'
|
||||
);
|
||||
}
|
||||
|
||||
my $one_day_dur = DateTime::Duration->new( days => 1 );
|
||||
my $two_day_dur = DateTime::Duration->new( days => 2 );
|
||||
my $seven_day_dur = DateTime::Duration->new( days => 7 );
|
||||
my $one_day_dur = DateTime::Duration->new( days => 1 );
|
||||
my $two_day_dur = DateTime::Duration->new( days => 2 );
|
||||
my $seven_day_dur = DateTime::Duration->new( days => 7 );
|
||||
|
||||
my $dt = dt_from_string( '2012-07-03','iso' ); #tuesday
|
||||
my $dt = dt_from_string( '2012-07-03', 'iso' ); #tuesday
|
||||
|
||||
my $test_dt = DateTime->new( # Monday
|
||||
year => 2012,
|
||||
month => 7,
|
||||
day => 23,
|
||||
hour => 11,
|
||||
minute => 53,
|
||||
);
|
||||
my $test_dt = DateTime->new( # Monday
|
||||
year => 2012,
|
||||
month => 7,
|
||||
day => 23,
|
||||
hour => 11,
|
||||
minute => 53,
|
||||
);
|
||||
|
||||
my $later_dt = DateTime->new( # Monday
|
||||
year => 2012,
|
||||
month => 9,
|
||||
day => 17,
|
||||
hour => 17,
|
||||
minute => 30,
|
||||
time_zone => 'Europe/London',
|
||||
);
|
||||
my $later_dt = DateTime->new( # Monday
|
||||
year => 2012,
|
||||
month => 9,
|
||||
day => 17,
|
||||
hour => 17,
|
||||
minute => 30,
|
||||
time_zone => 'Europe/London',
|
||||
);
|
||||
|
||||
{ ## 'Datedue' tests
|
||||
{ ## 'Datedue' tests
|
||||
|
||||
$cal = Koha::Calendar->new( branchcode => $mpl, days_mode => 'Datedue' );
|
||||
|
||||
is($cal->addDuration( $dt, $one_day_dur, 'days' ), # tuesday
|
||||
dt_from_string('2012-07-05','iso'),
|
||||
'Single day add (Datedue, matches holiday, shift)' );
|
||||
is(
|
||||
$cal->addDuration( $dt, $one_day_dur, 'days' ), # tuesday
|
||||
dt_from_string( '2012-07-05', 'iso' ),
|
||||
'Single day add (Datedue, matches holiday, shift)'
|
||||
);
|
||||
|
||||
is($cal->addDuration( $dt, $two_day_dur, 'days' ),
|
||||
dt_from_string('2012-07-05','iso'),
|
||||
'Two days add, skips holiday (Datedue)' );
|
||||
is(
|
||||
$cal->addDuration( $dt, $two_day_dur, 'days' ),
|
||||
dt_from_string( '2012-07-05', 'iso' ),
|
||||
'Two days add, skips holiday (Datedue)'
|
||||
);
|
||||
|
||||
cmp_ok($cal->addDuration( $test_dt, $seven_day_dur, 'days' ), 'eq',
|
||||
cmp_ok(
|
||||
$cal->addDuration( $test_dt, $seven_day_dur, 'days' ), 'eq',
|
||||
'2012-07-30T11:53:00',
|
||||
'Add 7 days (Datedue)' );
|
||||
'Add 7 days (Datedue)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 1,
|
||||
'addDuration skips closed Sunday (Datedue)' );
|
||||
is(
|
||||
$cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 1,
|
||||
'addDuration skips closed Sunday (Datedue)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration($day_after_christmas, -1, 'days')->ymd(), '2012-12-24',
|
||||
'Negative call to addDuration (Datedue)' );
|
||||
is(
|
||||
$cal->addDuration( $day_after_christmas, -1, 'days' )->ymd(), '2012-12-24',
|
||||
'Negative call to addDuration (Datedue)'
|
||||
);
|
||||
|
||||
## Note that the days_between API says closed days are not considered.
|
||||
## This tests are here as an API test.
|
||||
cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Days)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Days)'
|
||||
);
|
||||
|
||||
cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Days)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Days)'
|
||||
);
|
||||
}
|
||||
|
||||
{ ## 'Calendar' tests'
|
||||
{ ## 'Calendar' tests'
|
||||
|
||||
$cal = Koha::Calendar->new( branchcode => $mpl, days_mode => 'Calendar' );
|
||||
|
||||
$dt = dt_from_string('2012-07-03','iso');
|
||||
$dt = dt_from_string( '2012-07-03', 'iso' );
|
||||
|
||||
is($cal->addDuration( $dt, $one_day_dur, 'days' ),
|
||||
dt_from_string('2012-07-05','iso'),
|
||||
'Single day add (Calendar)' );
|
||||
is(
|
||||
$cal->addDuration( $dt, $one_day_dur, 'days' ),
|
||||
dt_from_string( '2012-07-05', 'iso' ),
|
||||
'Single day add (Calendar)'
|
||||
);
|
||||
|
||||
cmp_ok($cal->addDuration( $test_dt, $seven_day_dur, 'days' ), 'eq',
|
||||
'2012-08-01T11:53:00',
|
||||
'Add 7 days (Calendar)' );
|
||||
cmp_ok(
|
||||
$cal->addDuration( $test_dt, $seven_day_dur, 'days' ), 'eq',
|
||||
'2012-08-01T11:53:00',
|
||||
'Add 7 days (Calendar)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 1,
|
||||
'addDuration skips closed Sunday (Calendar)' );
|
||||
is(
|
||||
$cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 1,
|
||||
'addDuration skips closed Sunday (Calendar)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration($day_after_christmas, -1, 'days')->ymd(), '2012-12-24',
|
||||
'Negative call to addDuration (Calendar)' );
|
||||
is(
|
||||
$cal->addDuration( $day_after_christmas, -1, 'days' )->ymd(), '2012-12-24',
|
||||
'Negative call to addDuration (Calendar)'
|
||||
);
|
||||
|
||||
cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Calendar)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Calendar)'
|
||||
);
|
||||
|
||||
cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Calendar)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Calendar)'
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
{ ## 'Days' tests
|
||||
{ ## 'Days' tests
|
||||
|
||||
$cal = Koha::Calendar->new( branchcode => $mpl, days_mode => 'Days' );
|
||||
|
||||
$dt = dt_from_string('2012-07-03','iso');
|
||||
$dt = dt_from_string( '2012-07-03', 'iso' );
|
||||
|
||||
is($cal->addDuration( $dt, $one_day_dur, 'days' ),
|
||||
dt_from_string('2012-07-04','iso'),
|
||||
'Single day add (Days)' );
|
||||
is(
|
||||
$cal->addDuration( $dt, $one_day_dur, 'days' ),
|
||||
dt_from_string( '2012-07-04', 'iso' ),
|
||||
'Single day add (Days)'
|
||||
);
|
||||
|
||||
cmp_ok($cal->addDuration( $test_dt, $seven_day_dur, 'days' ),'eq',
|
||||
cmp_ok(
|
||||
$cal->addDuration( $test_dt, $seven_day_dur, 'days' ), 'eq',
|
||||
'2012-07-30T11:53:00',
|
||||
'Add 7 days (Days)' );
|
||||
'Add 7 days (Days)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 7,
|
||||
'addDuration doesn\'t skip closed Sunday (Days)' );
|
||||
is(
|
||||
$cal->addDuration( $saturday, $one_day_dur, 'days' )->day_of_week, 7,
|
||||
'addDuration doesn\'t skip closed Sunday (Days)'
|
||||
);
|
||||
|
||||
is( $cal->addDuration($day_after_christmas, -1, 'days')->ymd(), '2012-12-25',
|
||||
'Negative call to addDuration (Days)' );
|
||||
is(
|
||||
$cal->addDuration( $day_after_christmas, -1, 'days' )->ymd(), '2012-12-25',
|
||||
'Negative call to addDuration (Days)'
|
||||
);
|
||||
|
||||
## Note that the days_between API says closed days are not considered.
|
||||
## This tests are here as an API test.
|
||||
cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Days)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $test_dt, $later_dt )->in_units('days'),
|
||||
'==', 40, 'days_between calculates correctly (Days)'
|
||||
);
|
||||
|
||||
cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Days)' );
|
||||
cmp_ok(
|
||||
$cal->days_between( $later_dt, $test_dt )->in_units('days'),
|
||||
'==', 40, 'Test parameter order not relevant (Days)'
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
$cal = Koha::Calendar->new( branchcode => $cpl );
|
||||
is ( $cal->is_holiday($single_holiday), 0, 'Single holiday for MPL, not CPL' );
|
||||
is ( $cal->is_holiday($holiday_for_another_branch), 1, 'Holiday defined for CPL should be defined as an holiday' );
|
||||
is( $cal->is_holiday($single_holiday), 0, 'Single holiday for MPL, not CPL' );
|
||||
is(
|
||||
$cal->is_holiday($holiday_for_another_branch), 1,
|
||||
'Holiday defined for CPL should be defined as an holiday'
|
||||
);
|
||||
}
|
||||
|
||||
subtest 'days_mode parameter' => sub {
|
||||
plan tests => 1;
|
||||
|
||||
t::lib::Mocks::mock_preference('useDaysMode', 'Days');
|
||||
t::lib::Mocks::mock_preference( 'useDaysMode', 'Days' );
|
||||
|
||||
$cal = Koha::Calendar->new( branchcode => $cpl, days_mode => 'Calendar' );
|
||||
is( $cal->{days_mode}, 'Calendar', q|If set, days_mode is correctly set|);
|
||||
is( $cal->{days_mode}, 'Calendar', q|If set, days_mode is correctly set| );
|
||||
};
|
||||
|
||||
$cache->clear_from_cache( $mpl.'_holidays' );
|
||||
$cache->clear_from_cache( $cpl.'_holidays' );
|
||||
$cache->clear_from_cache( $mpl . '_holidays' );
|
||||
$cache->clear_from_cache( $cpl . '_holidays' );
|
||||
};
|
||||
|
||||
my $library = $builder->build_object({ class => 'Koha::Libraries' });
|
||||
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
|
||||
my $calendar = Koha::Calendar->new( branchcode => $library->branchcode, days_mode => 'Calendar' );
|
||||
my $holiday = $builder->build(
|
||||
my $holiday = $builder->build(
|
||||
{
|
||||
source => 'SpecialHoliday',
|
||||
value => {
|
||||
|
@ -338,12 +383,14 @@ subtest 'days_forward' => sub {
|
|||
plan tests => 4;
|
||||
|
||||
my $forwarded_dt = $calendar->days_forward( $today, 2 );
|
||||
my $expected = $today->clone->add( days => 2 );
|
||||
my $expected = $today->clone->add( days => 2 );
|
||||
is( $forwarded_dt->ymd, $expected->ymd, 'With no holiday on the perioddays_forward should add 2 days' );
|
||||
|
||||
$forwarded_dt = $calendar->days_forward( $today, 5 );
|
||||
$expected = $today->clone->add( days => 6 );
|
||||
is( $forwarded_dt->ymd, $expected->ymd, 'With holiday on the perioddays_forward should add 5 days + 1 day for holiday'
|
||||
$expected = $today->clone->add( days => 6 );
|
||||
is(
|
||||
$forwarded_dt->ymd, $expected->ymd,
|
||||
'With holiday on the perioddays_forward should add 5 days + 1 day for holiday'
|
||||
);
|
||||
|
||||
$forwarded_dt = $calendar->days_forward( $today, 0 );
|
||||
|
@ -357,9 +404,9 @@ subtest 'crossing_DST' => sub {
|
|||
|
||||
plan tests => 3;
|
||||
|
||||
my $tz = DateTime::TimeZone->new( name => 'America/New_York' );
|
||||
my $start_date = dt_from_string( "2016-03-09 02:29:00", undef, $tz );
|
||||
my $end_date = dt_from_string( "2017-01-01 00:00:00", undef, $tz );
|
||||
my $tz = DateTime::TimeZone->new( name => 'America/New_York' );
|
||||
my $start_date = dt_from_string( "2016-03-09 02:29:00", undef, $tz );
|
||||
my $end_date = dt_from_string( "2017-01-01 00:00:00", undef, $tz );
|
||||
my $days_between = $calendar->days_between( $start_date, $end_date );
|
||||
is( $days_between->delta_days, 298, "Days calculated correctly" );
|
||||
$days_between = $calendar->days_between( $end_date, $start_date );
|
||||
|
@ -384,19 +431,19 @@ subtest 'hours_between | days_between' => sub {
|
|||
# 17 18 19 20 21 22 23
|
||||
# 24 25 26 27 28 29 30
|
||||
|
||||
my $now = dt_from_string('2019-11-05 12:34:56'); # Today is 2019 Nov 5th
|
||||
my $now = dt_from_string('2019-11-05 12:34:56'); # Today is 2019 Nov 5th
|
||||
my $nov_6 = dt_from_string('2019-11-06 12:34:56');
|
||||
my $nov_7 = dt_from_string('2019-11-07 12:34:56');
|
||||
my $nov_12 = dt_from_string('2019-11-12 12:34:56');
|
||||
my $nov_13 = dt_from_string('2019-11-13 12:34:56');
|
||||
my $nov_15 = dt_from_string('2019-11-15 12:34:56');
|
||||
Time::Fake->offset($now->epoch);
|
||||
Time::Fake->offset( $now->epoch );
|
||||
|
||||
subtest 'No holiday' => sub {
|
||||
|
||||
plan tests => 2;
|
||||
|
||||
my $library = $builder->build_object({ class => 'Koha::Libraries' });
|
||||
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
|
||||
my $calendar = Koha::Calendar->new( branchcode => $library->branchcode );
|
||||
|
||||
subtest 'Same hours' => sub {
|
||||
|
@ -433,33 +480,33 @@ subtest 'hours_between | days_between' => sub {
|
|||
plan tests => 10;
|
||||
|
||||
# Between 5th and 5th (Same day short hours loan)
|
||||
my $diff_hours = $calendar->hours_between( $now, $now->clone->add(hours => 3) )->hours;
|
||||
my $diff_hours = $calendar->hours_between( $now, $now->clone->add( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 3, 'hours: 3 hours, no holidays' );
|
||||
my $diff_days = $calendar->days_between( $now, $now->clone->add(hours => 3) )->delta_days;
|
||||
my $diff_days = $calendar->days_between( $now, $now->clone->add( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 0, 'days: 3 hours, no holidays' );
|
||||
|
||||
# Between 5th and 6th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_6->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_6->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 1 * 24 - 3, 'hours: 21 hours, no holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_6->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_6->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 1, 'days: 21 hours, no holidays' );
|
||||
|
||||
# Between 5th and 7th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_7->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_7->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 2 * 24 - 3, 'hours: 45 hours, no holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_7->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_7->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 2, 'days: 45 hours, no holidays' );
|
||||
|
||||
# Between 5th and 12th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_12->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_12->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 7 * 24 - 3, 'hours: 165 hours, no holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_12->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_12->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 7, 'days: 165 hours, no holidays' );
|
||||
|
||||
# Between 5th and 15th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_15->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_15->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 10 * 24 - 3, 'hours: 237 hours, no holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_15->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_15->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 10, 'days: 237 hours, no holidays' );
|
||||
};
|
||||
};
|
||||
|
@ -467,14 +514,16 @@ subtest 'hours_between | days_between' => sub {
|
|||
subtest 'With holiday' => sub {
|
||||
plan tests => 2;
|
||||
|
||||
my $library = $builder->build_object({ class => 'Koha::Libraries' });
|
||||
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
|
||||
|
||||
# Wednesdays are closed
|
||||
my $dbh = C4::Context->dbh;
|
||||
$dbh->do(q|
|
||||
$dbh->do(
|
||||
q|
|
||||
INSERT INTO repeatable_holidays (branchcode,weekday,day,month,title,description)
|
||||
VALUES ( ?, ?, NULL, NULL, ?, '' )
|
||||
|, undef, $library->branchcode, 3, 'Closed on Wednesday');
|
||||
|, undef, $library->branchcode, 3, 'Closed on Wednesday'
|
||||
);
|
||||
|
||||
my $calendar = Koha::Calendar->new( branchcode => $library->branchcode );
|
||||
|
||||
|
@ -485,15 +534,15 @@ subtest 'hours_between | days_between' => sub {
|
|||
|
||||
# Between 5th and 6th (This case should never happen in real code, one cannot return on a closed day)
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_6 )->hours;
|
||||
is( $diff_hours, 0 * 24, 'hours: 1 day, end_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
$diff_days = $calendar->days_between( $now, $nov_6)->delta_days;
|
||||
is( $diff_days, 0, 'days: 1 day, end_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
is( $diff_hours, 0 * 24, 'hours: 1 day, end_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
$diff_days = $calendar->days_between( $now, $nov_6 )->delta_days;
|
||||
is( $diff_days, 0, 'days: 1 day, end_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
|
||||
# Between 6th and 7th (This case should never happen in real code, one cannot issue on a closed day)
|
||||
$diff_hours = $calendar->hours_between( $nov_6, $nov_7 )->hours;
|
||||
is( $diff_hours, 0 * 24, 'hours: 1 day, start_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
is( $diff_hours, 0 * 24, 'hours: 1 day, start_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
$diff_days = $calendar->days_between( $nov_6, $nov_7 )->delta_days;
|
||||
is( $diff_days, 0, 'days: 1 day, start_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
is( $diff_days, 0, 'days: 1 day, start_dt = holiday' ); # FIXME Is this really should be 0?
|
||||
|
||||
# Between 5th and 7th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_7 )->hours;
|
||||
|
@ -504,19 +553,19 @@ subtest 'hours_between | days_between' => sub {
|
|||
# Between 5th and 12th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_12 )->hours;
|
||||
is( $diff_hours, 7 * 24 - 1 * 24, 'hours: 7 days, 1 holiday' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_12)->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_12 )->delta_days;
|
||||
is( $diff_days, 7 - 1, 'day: 7 days, 1 holiday' );
|
||||
|
||||
# Between 5th and 13th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_13 )->hours;
|
||||
is( $diff_hours, 8 * 24 - 2 * 24, 'hours: 8 days, 2 holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_13)->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_13 )->delta_days;
|
||||
is( $diff_days, 8 - 2, 'days: 8 days, 2 holidays' );
|
||||
|
||||
# Between 5th and 15th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_15 )->hours;
|
||||
is( $diff_hours, 10 * 24 - 2 * 24, 'hours: 10 days, 2 holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_15)->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_15 )->delta_days;
|
||||
is( $diff_days, 10 - 2, 'days: 10 days, 2 holidays' );
|
||||
};
|
||||
|
||||
|
@ -529,41 +578,45 @@ subtest 'hours_between | days_between' => sub {
|
|||
# No test - Tested above as 5th is an open day
|
||||
|
||||
# Between 5th and 6th (This case should never happen in real code, one cannot return on a closed day)
|
||||
my $duration = $calendar->hours_between( $now, $nov_6->clone->subtract(hours => 3) );
|
||||
is( $duration->hours, abs(0 * 24 - 3), 'hours: 21 hours, end_dt = holiday' ); # FIXME $duration->hours always return a abs
|
||||
is( $duration->is_negative, 1, '? is negative ?' ); # FIXME Do really test for that case in our calls to hours_between?
|
||||
$duration = $calendar->days_between( $now, $nov_6->clone->subtract(hours => 3) );
|
||||
is( $duration->hours, abs(0), 'days: 21 hours, end_dt = holiday' ); # FIXME Is this correct?
|
||||
my $duration = $calendar->hours_between( $now, $nov_6->clone->subtract( hours => 3 ) );
|
||||
is( $duration->hours, abs( 0 * 24 - 3 ), 'hours: 21 hours, end_dt = holiday' )
|
||||
; # FIXME $duration->hours always return a abs
|
||||
is( $duration->is_negative, 1, '? is negative ?' )
|
||||
; # FIXME Do really test for that case in our calls to hours_between?
|
||||
$duration = $calendar->days_between( $now, $nov_6->clone->subtract( hours => 3 ) );
|
||||
is( $duration->hours, abs(0), 'days: 21 hours, end_dt = holiday' ); # FIXME Is this correct?
|
||||
|
||||
# Between 6th and 7th (This case should never happen in real code, one cannot issue on a closed day)
|
||||
$duration = $calendar->hours_between( $nov_6, $nov_7->clone->subtract(hours => 3) );
|
||||
is( $duration->hours, abs(0 * 24 - 3), 'hours: 21 hours, start_dt = holiday' ); # FIXME $duration->hours always return a abs
|
||||
is( $duration->is_negative, 1, '? is negative ?' ); # FIXME Do really test for that case in our calls to hours_between?
|
||||
$duration = $calendar->days_between( $nov_6, $nov_7->clone->subtract(hours => 3) );
|
||||
is( $duration->hours, abs(0), 'days: 21 hours, start_dt = holiday' ); # FIXME Is this correct?
|
||||
$duration = $calendar->hours_between( $nov_6, $nov_7->clone->subtract( hours => 3 ) );
|
||||
is( $duration->hours, abs( 0 * 24 - 3 ), 'hours: 21 hours, start_dt = holiday' )
|
||||
; # FIXME $duration->hours always return a abs
|
||||
is( $duration->is_negative, 1, '? is negative ?' )
|
||||
; # FIXME Do really test for that case in our calls to hours_between?
|
||||
$duration = $calendar->days_between( $nov_6, $nov_7->clone->subtract( hours => 3 ) );
|
||||
is( $duration->hours, abs(0), 'days: 21 hours, start_dt = holiday' ); # FIXME Is this correct?
|
||||
|
||||
# Between 5th and 7th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_7->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_7->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 2 * 24 - 1 * 24 - 3, 'hours: 45 hours, 1 holiday' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_7->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_7->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 2 - 1, 'days: 45 hours, 1 holiday' );
|
||||
|
||||
# Between 5th and 12th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_12->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_12->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 7 * 24 - 1 * 24 - 3, 'hours: 165 hours, 1 holiday' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_12->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_12->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 7 - 1, 'days: 165 hours, 1 holiday' );
|
||||
|
||||
# Between 5th and 13th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_13->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_13->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 8 * 24 - 2 * 24 - 3, 'hours: 289 hours, 2 holidays ' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_13->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_13->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 8 - 1, 'days: 289 hours, 2 holidays' );
|
||||
|
||||
# Between 5th and 15th
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_15->clone->subtract(hours => 3) )->hours;
|
||||
$diff_hours = $calendar->hours_between( $now, $nov_15->clone->subtract( hours => 3 ) )->hours;
|
||||
is( $diff_hours, 10 * 24 - 2 * 24 - 3, 'hours: 237 hours, 2 holidays' );
|
||||
$diff_days = $calendar->days_between( $now, $nov_15->clone->subtract(hours => 3) )->delta_days;
|
||||
$diff_days = $calendar->days_between( $now, $nov_15->clone->subtract( hours => 3 ) )->delta_days;
|
||||
is( $diff_days, 10 - 2, 'days: 237 hours, 2 holidays' );
|
||||
};
|
||||
|
||||
|
@ -594,20 +647,17 @@ subtest 'is_holiday' => sub {
|
|||
);
|
||||
|
||||
# Iterate 7 days
|
||||
my $sth = $dbh->prepare(
|
||||
"UPDATE repeatable_holidays SET weekday = ? WHERE branchcode = ? AND title = 'TEST'"
|
||||
);
|
||||
my $sth = $dbh->prepare("UPDATE repeatable_holidays SET weekday = ? WHERE branchcode = ? AND title = 'TEST'");
|
||||
for my $i ( 0 .. 6 ) {
|
||||
my $calendar =
|
||||
Koha::Calendar->new( branchcode => $library->branchcode );
|
||||
my $calendar = Koha::Calendar->new( branchcode => $library->branchcode );
|
||||
|
||||
is( $calendar->is_holiday($day), 1, $day->day_name() ." works as a repeatable holiday");
|
||||
is( $calendar->is_holiday($day), 1, $day->day_name() . " works as a repeatable holiday" );
|
||||
|
||||
# Increment the date and holiday day
|
||||
$day->add( days => 1 );
|
||||
$dow++;
|
||||
$dow = 0 if $dow == 7;
|
||||
$sth->execute($dow, $library->branchcode);
|
||||
$sth->execute( $dow, $library->branchcode );
|
||||
}
|
||||
};
|
||||
};
|
||||
|
@ -615,7 +665,7 @@ subtest 'is_holiday' => sub {
|
|||
subtest 'get_push_amt' => sub {
|
||||
plan tests => 1;
|
||||
|
||||
t::lib::Mocks::mock_preference('useDaysMode', 'Dayweek');
|
||||
t::lib::Mocks::mock_preference( 'useDaysMode', 'Dayweek' );
|
||||
|
||||
subtest 'weekday holidays' => sub {
|
||||
plan tests => 7;
|
||||
|
@ -636,12 +686,9 @@ subtest 'get_push_amt' => sub {
|
|||
);
|
||||
|
||||
# Iterate 7 days
|
||||
my $sth = $dbh->prepare(
|
||||
"UPDATE repeatable_holidays SET weekday = ? WHERE branchcode = ? AND title = 'TEST'"
|
||||
);
|
||||
my $sth = $dbh->prepare("UPDATE repeatable_holidays SET weekday = ? WHERE branchcode = ? AND title = 'TEST'");
|
||||
for my $i ( 0 .. 6 ) {
|
||||
my $calendar =
|
||||
Koha::Calendar->new( branchcode => $library->branchcode, days_mode => 'Dayweek' );
|
||||
my $calendar = Koha::Calendar->new( branchcode => $library->branchcode, days_mode => 'Dayweek' );
|
||||
|
||||
my $npa;
|
||||
eval {
|
||||
|
@ -651,12 +698,11 @@ subtest 'get_push_amt' => sub {
|
|||
alarm 0;
|
||||
};
|
||||
if ($@) {
|
||||
die unless $@ eq "alarm\n"; # propagate unexpected errors
|
||||
# timed out
|
||||
ok(0, "next_push_amt succeeded for ".$day->day_name()." weekday holiday");
|
||||
}
|
||||
else {
|
||||
ok($npa, "next_push_amt succeeded for ".$day->day_name()." weekday holiday");
|
||||
die unless $@ eq "alarm\n"; # propagate unexpected errors
|
||||
# timed out
|
||||
ok( 0, "next_push_amt succeeded for " . $day->day_name() . " weekday holiday" );
|
||||
} else {
|
||||
ok( $npa, "next_push_amt succeeded for " . $day->day_name() . " weekday holiday" );
|
||||
}
|
||||
|
||||
# Increment the date and holiday day
|
||||
|
|
Loading…
Reference in a new issue