Bug 17600: Standardize our EXPORT_OK

[srvgit] / t / db_dependent / Holidays.t

diff --git a/t/db_dependent/Holidays.t b/t/db_dependent/Holidays.t
index 5b3ecb0..677c4cc 100755 (executable)
--- a/t/db_dependent/Holidays.t
+++ b/t/db_dependent/Holidays.t
@@ -17,7 +17,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 17;
+use Test::More tests => 12;
 
 use DateTime;
 use DateTime::TimeZone;
@@ -30,14 +30,14 @@ use Koha::DateUtils;
 
 BEGIN {
     use_ok('Koha::Calendar');
-    use_ok('C4::Calendar');
+    use_ok('C4::Calendar', qw( insert_exception_holiday insert_week_day_holiday insert_day_month_holiday insert_single_holiday copy_to_branch get_exception_holidays isHoliday ));
 }
 
 my $schema = Koha::Database->new->schema;
 my $dbh = C4::Context->dbh;
 my $builder = t::lib::TestBuilder->new;
 
-subtest 'exception_holidays() tests' => sub {
+subtest 'is_holiday timezone tests' => sub {
 
     plan tests => 1;
 
@@ -160,47 +160,6 @@ C4::Calendar->new( branchcode => $branch_2 )->insert_single_holiday(
 is( Koha::Calendar->new( branchcode => $branch_2 )->is_holiday( $today ), 1, "Today is a holiday for $branch_2" );
 is( Koha::Calendar->new( branchcode => $branch_1 )->is_holiday( $today ), 0, "Today is not a holiday for $branch_1");
 
-# Few tests for exception holidays
-my ( $diff, $cal, $special );
-$dbh->do("DELETE FROM special_holidays");
-_add_exception( $today, $branch_1, 'Today' );
-$cal = Koha::Calendar->new( branchcode => $branch_1 );
-$special = $cal->exception_holidays;
-is( keys %{$special}, 1, 'One exception holiday added' );
-
-my $tomorrow= dt_from_string();
-$tomorrow->add_duration( DateTime::Duration->new(days => 1) );
-_add_exception( $tomorrow, $branch_1, 'Tomorrow' );
-$cal = Koha::Calendar->new( branchcode => $branch_1 );
-$special = $cal->exception_holidays;
-is( keys %{$special}, 2, 'Set of exception holidays contains two dates' );
-
-$diff = $today->delta_days( $today )->in_units('days');
-is( $diff, 0, 'Lowest exception holiday is today' );
-$diff = $tomorrow->delta_days( $tomorrow )->in_units('days');
-is( $diff, 0, 'Highest exception holiday is tomorrow' );
-
-C4::Calendar->new( branchcode => $branch_1 )->delete_holiday(
-    weekday => $tomorrow->day_of_week,
-    day     => $tomorrow->day,
-    month   => $tomorrow->month,
-    year    => $tomorrow->year,
-);
-$cal = Koha::Calendar->new( branchcode => $branch_1 );
-$special = $cal->exception_holidays;
-is( keys %{$special}, 1, 'Set of exception holidays back to one' );
-
-sub _add_exception {
-    my ( $dt, $branch, $descr ) = @_;
-    C4::Calendar->new( branchcode => $branch )->insert_exception_holiday(
-        day         => $dt->day,
-        month       => $dt->month,
-        year        => $dt->year,
-        title       => $descr,
-        description => $descr,
-    );
-}
-
 $schema->storage->txn_rollback;
 
 subtest 'copy_to_branch' => sub {