Bug 18925: (QA follow-up) Remove weird 'Null' values for integer column

[koha.git] / t / Calendar.t

diff --git a/t/Calendar.t b/t/Calendar.t
index 37f11f4..e390696 100755 (executable)
--- a/t/Calendar.t
+++ b/t/Calendar.t
@@ -22,14 +22,16 @@ use Test::MockModule;
 
 use DateTime;
 use DateTime::Duration;
-use Koha::Cache;
+use Koha::Caches;
 use Koha::DateUtils;
 
+use t::lib::Mocks;
+
 use Module::Load::Conditional qw/check_install/;
 
 BEGIN {
     if ( check_install( module => 'Test::DBIx::Class' ) ) {
-        plan tests => 35;
+        plan tests => 39;
     } else {
         plan skip_all => "Need Test::DBIx::Class"
     }
@@ -37,22 +39,7 @@ BEGIN {
 
 use_ok('Koha::Calendar');
 
-use Test::DBIx::Class {
-    schema_class => 'Koha::Schema',
-    connect_info => ['dbi:SQLite:dbname=:memory:','',''],
-    connect_opts => { name_sep => '.', quote_char => '`', },
-    fixture_class => '::Populate',
-}, 'Biblio' ;
-
-sub fixtures {
-    my ( $data ) = @_;
-    fixtures_ok [
-        Biblio => [
-            [ qw/ biblionumber datecreated timestamp  / ],
-            @$data,
-        ],
-    ], 'add fixtures';
-}
+use Test::DBIx::Class;
 
 my $db = Test::MockModule->new('Koha::Database');
 $db->mock(
@@ -85,11 +72,13 @@ fixtures_ok [
         [ 'MPL', 11, 11, 2012, '', '', 1 ],    # sunday exception
         [ 'MPL', 1,  6,  2011, '', '', 0 ],
         [ 'MPL', 4,  7,  2012, '', '', 0 ],
+        [ 'CPL', 6,  8,  2012, '', '', 0 ],
       ],
 ], "add fixtures";
 
-my $cache = Koha::Cache->get_instance();
-$cache->clear_from_cache( 'single_holidays') ;
+my $cache = Koha::Caches->get_instance();
+$cache->clear_from_cache( 'single_holidays' ) ;
+$cache->clear_from_cache( 'exception_holidays' ) ;
 
 # 'MPL' branch is arbitrary, is not used at all but is needed for initialization
 my $cal = Koha::Calendar->new( branchcode => 'MPL' );
@@ -144,6 +133,12 @@ my $day_after_christmas = DateTime->new(
     day     => 26
 );  # for testing negative addDate
 
+my $holiday_for_another_branch = DateTime->new(
+    year => 2012,
+    month => 8,
+    day => 6, # This is a monday
+);
+
 {   # 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)');
@@ -155,6 +150,7 @@ my $day_after_christmas = DateTime->new(
     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' );
 }
 
 {   # Bugzilla #8966 - is_holiday truncates referenced date
@@ -321,4 +317,24 @@ my $day_after_christmas = DateTime->new(
 
 }
 
-1;
+{
+    $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' );
+}
+
+subtest 'days_mode parameter' => sub {
+    plan tests => 2;
+
+    t::lib::Mocks::mock_preference('useDaysMode', 'Days');
+    my $cal = Koha::Calendar->new( branchcode => 'CPL' );
+    is( $cal->{days_mode}, 'Days', q|If not set, days_mode defaults to syspref's value|);
+
+    $cal = Koha::Calendar->new( branchcode => 'CPL', days_mode => 'Calendar' );
+    is( $cal->{days_mode}, 'Calendar', q|If set, days_mode is correctly set|);
+};
+
+END {
+    $cache->clear_from_cache( 'single_holidays' ) ;
+    $cache->clear_from_cache( 'exception_holidays' ) ;
+};