X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FUsageStats.t;h=713524aa881ff53da8e439d372e3a6805b2dcd8b;hb=4f5217314cefded2aaa82e9bda0dd1ce6d81a88e;hp=b98f05bd88b8b0b404d7dc5e226ab7a3e7ca56e9;hpb=afe9d02a819adfeec9468600805ee06df6082b21;p=koha.git

diff --git a/t/db_dependent/UsageStats.t b/t/db_dependent/UsageStats.t
index b98f05bd88..713524aa88 100644
--- a/t/db_dependent/UsageStats.t
+++ b/t/db_dependent/UsageStats.t
@@ -15,7 +15,7 @@
 # with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Test::More tests => 551;
+use Test::More tests => 549;
 use t::lib::Mocks qw(mock_preference);
 use POSIX qw(strftime);
 
@@ -85,7 +85,7 @@ my $report = C4::UsageStats->BuildReport();
 
 isa_ok( $report,            'HASH', '$report is a HASH' );
 isa_ok( $report->{library}, 'HASH', '$report->{library} is a HASH' );
-is( scalar( keys( $report->{library} ) ), 5,  "There are 5 fields in $report->{library}" );
+is( scalar( keys %{$report->{library}} ), 5,  "There are 5 fields in $report->{library}" );
 is( $report->{library}->{id},             0,  "UsageStatsID           is good" );
 is( $report->{library}->{name},           '', "UsageStatsLibraryName  is good" );
 is( $report->{library}->{url},            '', "UsageStatsLibraryUrl   is good" );
@@ -103,7 +103,7 @@ $report = C4::UsageStats->BuildReport();
 
 isa_ok( $report,            'HASH', '$report is a HASH' );
 isa_ok( $report->{library}, 'HASH', '$report->{library} is a HASH' );
-is( scalar( keys( $report->{library} ) ), 5,         "There are 5 fields in $report->{library}" );
+is( scalar( keys %{$report->{library}} ), 5,         "There are 5 fields in $report->{library}" );
 is( $report->{library}->{id},             1,         "UsageStatsID            is good" );
 is( $report->{library}->{name},           'NAME',    "UsageStatsLibraryName   is good" );
 is( $report->{library}->{url},            'URL',     "UsageStatsLibraryUrl    is good" );
@@ -116,7 +116,7 @@ $report = C4::UsageStats->BuildReport();
 
 isa_ok( $report,              'HASH', '$report is a HASH' );
 isa_ok( $report->{volumetry}, 'HASH', '$report->{volumetry} is a HASH' );
-is( scalar( keys( $report->{volumetry} ) ), 8, "There are 8 fields in $report->{volumetry}" );
+is( scalar( keys %{$report->{volumetry}} ), 8, "There are 8 fields in $report->{volumetry}" );
 is( $report->{volumetry}->{biblio},         0, "There is no biblio" );
 is( $report->{volumetry}->{items},          0, "There is no items" );
 is( $report->{volumetry}->{auth_header},    0, "There is no auth_header" );
@@ -133,7 +133,7 @@ $report = C4::UsageStats->BuildReport();
 
 isa_ok( $report,              'HASH', '$report is a HASH' );
 isa_ok( $report->{volumetry}, 'HASH', '$report->{volumetry} is a HASH' );
-is( scalar( keys( $report->{volumetry} ) ), 8, "There are 8 fields in $report->{volumetry}" );
+is( scalar( keys %{$report->{volumetry}} ), 8, "There are 8 fields in $report->{volumetry}" );
 is( $report->{volumetry}->{biblio},         3, "There are 3 biblio" );
 is( $report->{volumetry}->{items},          3, "There are 3 items" );
 is( $report->{volumetry}->{auth_header},    2, "There are 2 auth_header" );
@@ -150,7 +150,6 @@ mocking_systempreferences_to_a_set_value(0);
 $report = C4::UsageStats->BuildReport();
 isa_ok( $report,                      'HASH', '$report is a HASH' );
 isa_ok( $report->{systempreferences}, 'HASH', '$report->{systempreferences} is a HASH' );
-is( scalar( keys( $report->{systempreferences} ) ), 248, "There are 248 fields in $report->{systempreferences}" );
 verif_systempreferences_values( $report, 0 );
 
 #mock with values
@@ -159,9 +158,12 @@ mocking_systempreferences_to_a_set_value(1);
 $report = C4::UsageStats->BuildReport();
 isa_ok( $report,                      'HASH', '$report is a HASH' );
 isa_ok( $report->{systempreferences}, 'HASH', '$report->{systempreferences} is a HASH' );
-is( scalar( keys( $report->{systempreferences} ) ), 248, "There are 248 fields in $report->{systempreferences}" );
 verif_systempreferences_values( $report, 1 );
 
+#Test if unwanted syspref are not sent
+is( $report->{systempreferences}->{useDischarge}, undef, 'useDischarge should not be shared');
+is( $report->{systempreferences}->{OpacUserJS},   undef, 'OpacUserJS   should not be shared');
+
 # ---------- Testing ReportToCommunity ----------
 
 # ---------- Testing _count ---------------------
@@ -286,7 +288,7 @@ sub construct_objects_needed {
     my $issue_id1 = $dbh->last_insert_id( undef, undef, 'old_issues', undef );
 
     # ---------- Add 1 old_reserves
-    AddReserve( $branchcode, $borrowernumber1, $biblionumber1, 'a', '', 1, undef, undef, '', 'Title', undef, undef );
+    AddReserve( $branchcode, $borrowernumber1, $biblionumber1, '', 1, undef, undef, '', 'Title', undef, undef );
     my $reserves1   = GetReservesFromBiblionumber( { biblionumber => $biblionumber1 } );
     my $reserve_id1 = $reserves1->[0]->{reserve_id};
     my $reserve1    = CancelReserve( { reserve_id => $reserve_id1 } );
@@ -333,7 +335,7 @@ sub mocking_systempreferences_to_a_set_value {
         OrderPdfFormat
         casAuthentication
         casLogout
-        AllowPkiAuth
+        AllowPKIAuth
         DebugLevel
         delimiter
         noItemTypeImages
@@ -574,6 +576,7 @@ sub mocking_systempreferences_to_a_set_value {
         ILS-DI
         OAI-PMH
         version
+        AudioAlerts
         /
       ) {
         t::lib::Mocks::mock_preference( $_, $set_value );
@@ -584,7 +587,7 @@ sub mocking_systempreferences_to_a_set_value {
 sub verif_systempreferences_values {
     my ( $report, $value_to_test ) = @_;
 
-    foreach my $key ( keys $report->{systempreferences} ) {
+    foreach my $key ( keys %{$report->{systempreferences}} ) {
         is( $report->{systempreferences}->{$key}, $value_to_test, "\$report->{systempreferences}->{$key} = $value_to_test" );
     }
 }