X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=t%2Fdb_dependent%2FLog.t;h=cd0acc07784b12a76bc017c927d99359d2d18428;hb=7d8b96803f664d86762a6afb966051f7d565c40e;hp=b110bae923c63df02c2baf2f00e55cc29a6f0f32;hpb=6b9fff61fb7e96902c8d6afac906285bc1f4bb80;p=srvgit

diff --git a/t/db_dependent/Log.t b/t/db_dependent/Log.t
index b110bae923..cd0acc0778 100644
--- a/t/db_dependent/Log.t
+++ b/t/db_dependent/Log.t
@@ -1,22 +1,45 @@
 #!/usr/bin/perl
 #
 # Copyright 2011 MJ Ray and software.coop
-# This Koha test module is a stub!  
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+# This Koha test module is a stub!
 # Add more tests here!!!
 
-use strict;
-use warnings;
-use Test::More tests => 5;
-use C4::Log;
+use Modern::Perl;
+use Test::More tests => 10;
+
+use C4::Context;
+use Koha::Database;
+use Koha::DateUtils;
+
+use t::lib::Mocks qw/mock_preference/; # to mock CronjobLog
+
+$| = 1;
 
 BEGIN {
 	use_ok('C4::Log');
 }
 my $success;
 
+# Make sure we can rollback.
+my $schema  = Koha::Database->new->schema;
+$schema->storage->txn_begin;
+my $dbh = C4::Context->dbh;
+
 eval {
     # FIXME: are we sure there is an member number 1?
-    # FIXME: can we remove this log entry somehow?
     logaction("MEMBERS","MODIFY",1,"test operation");
     $success = 1;
 } or do {
@@ -36,7 +59,8 @@ ok($success, "GetLogs returns results for an open search");
 
 eval {
     # FIXME: US formatted date hardcoded into test for now
-    $success = scalar(@{GetLogs("09/01/2011","10/01/2011","",undef,undef,"","")});
+    my $date = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
+    $success = scalar(@{GetLogs( $date, $date, "", undef, undef, "", "") } );
 } or do {
     diag($@);
     $success = 0;
@@ -50,3 +74,94 @@ eval {
     $success = 0;
 };
 ok($success, "GetLogs seemed to find ".$success." like our test record in a tighter search");
+
+# We want numbers to be the same between runs.
+$dbh->do("DELETE FROM action_logs;");
+
+t::lib::Mocks::mock_preference('CronjobLog',0);
+cronlogaction();
+my $cronJobCount = $dbh->selectrow_array("SELECT COUNT(*) FROM action_logs WHERE module='CRONJOBS';",{});
+is($cronJobCount,0,"Cronjob not logged as expected.");
+
+t::lib::Mocks::mock_preference('CronjobLog',1);
+cronlogaction();
+$cronJobCount = $dbh->selectrow_array("SELECT COUNT(*) FROM action_logs WHERE module='CRONJOBS';",{});
+is($cronJobCount,1,"Cronjob logged as expected.");
+
+subtest "GetLogs should return all logs if dates are not set" => sub {
+    plan tests => 2;
+    my $today = dt_from_string->add(minutes => -1);
+    my $yesterday = dt_from_string->add( days => -1 );
+    $dbh->do(q|
+        INSERT INTO action_logs (timestamp, user, module, action, object, info)
+        VALUES
+        (?, 42, 'CATALOGUING', 'MODIFY', 4242, 'Record 42 has been modified by patron 4242 yesterday'),
+        (?, 43, 'CATALOGUING', 'MODIFY', 4242, 'Record 43 has been modified by patron 4242 today')
+    |, undef, output_pref({dt =>$yesterday, dateformat => 'iso'}), output_pref({dt => $today, dateformat => 'iso'}));
+    my $logs = GetLogs( undef, undef, undef, ['CATALOGUING'], ['MODIFY'], 4242 );
+    is( scalar(@$logs), 2, 'GetLogs should return all logs regardless the dates' );
+    $logs = GetLogs( output_pref($today), undef, undef, ['CATALOGUING'], ['MODIFY'], 4242 );
+    is( scalar(@$logs), 1, 'GetLogs should return the logs for today' );
+};
+
+subtest 'logaction(): interface is correctly logged' => sub {
+
+    plan tests => 4;
+
+    # No interface passed, using C4::Context->interface
+    $dbh->do("DELETE FROM action_logs;");
+    C4::Context->interface( 'commandline' );
+    logaction( "MEMBERS", "MODIFY", 1, "test operation");
+    my $logs = GetLogs();
+    is( @{$logs}[0]->{ interface }, 'commandline', 'Interface correctly deduced (commandline)');
+
+    # No interface passed, using C4::Context->interface
+    $dbh->do("DELETE FROM action_logs;");
+    C4::Context->interface( 'opac' );
+    logaction( "MEMBERS", "MODIFY", 1, "test operation");
+    $logs = GetLogs();
+    is( @{$logs}[0]->{ interface }, 'opac', 'Interface correctly deduced (opac)');
+
+    # Explicit interfaces
+    $dbh->do("DELETE FROM action_logs;");
+    C4::Context->interface( 'intranet' );
+    logaction( "MEMBERS", "MODIFY", 1, 'test info', 'intranet');
+    $logs = GetLogs();
+    is( @{$logs}[0]->{ interface }, 'intranet', 'Passed interface is respected (intranet)');
+
+    # Explicit interfaces
+    $dbh->do("DELETE FROM action_logs;");
+    C4::Context->interface( 'sip' );
+    logaction( "MEMBERS", "MODIFY", 1, 'test info', 'sip');
+    $logs = GetLogs();
+    is( @{$logs}[0]->{ interface }, 'sip', 'Passed interface is respected (sip)');
+};
+
+subtest 'GetLogs() respects interface filters' => sub {
+
+    plan tests => 5;
+
+    $dbh->do("DELETE FROM action_logs;");
+
+    logaction( 'MEMBERS', 'MODIFY', 1, 'opac info',        'opac');
+    logaction( 'MEMBERS', 'MODIFY', 1, 'sip info',         'sip');
+    logaction( 'MEMBERS', 'MODIFY', 1, 'intranet info',    'intranet');
+    logaction( 'MEMBERS', 'MODIFY', 1, 'commandline info', 'commandline');
+
+    my $logs = scalar @{ GetLogs() };
+    is( $logs, 4, 'If no filter on interfaces is passed, all logs are returned');
+
+    $logs = GetLogs(undef,undef,undef,undef,undef,undef,undef,['opac']);
+    is( @{$logs}[0]->{ interface }, 'opac', 'Interface correctly filtered (opac)');
+
+    $logs = GetLogs(undef,undef,undef,undef,undef,undef,undef,['sip']);
+    is( @{$logs}[0]->{ interface }, 'sip', 'Interface correctly filtered (sip)');
+
+    $logs = GetLogs(undef,undef,undef,undef,undef,undef,undef,['intranet']);
+    is( @{$logs}[0]->{ interface }, 'intranet', 'Interface correctly filtered (intranet)');
+
+    $logs = GetLogs(undef,undef,undef,undef,undef,undef,undef,['commandline']);
+    is( @{$logs}[0]->{ interface }, 'commandline', 'Interface correctly filtered (commandline)');
+};
+
+$schema->storage->txn_rollback;