From d13f6fc65aa543a9774ae1106e9539ba8586cb29 Mon Sep 17 00:00:00 2001
From: Chris Nighswonger <cnighswonger@foundations.edu>
Date: Mon, 7 May 2012 14:53:50 -0400
Subject: [PATCH] Adding Daily Quotes Tests to Koha.t test suite; also fixing sort order on quote selection SQL
Content-Type: text/plain; charset="utf-8"

http://bugs.koha-community.org/show_bug.cgi?id=7977
---
 C4/Koha.pm            |    2 +-
 t/db_dependent/Koha.t |  114 ++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 36c158e..9edd1ac 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1344,7 +1344,7 @@ sub GetDailyQuote {
         # Fall through... we also return a random quote as a catch-all if all else fails
     }
     else {
-        $query = 'SELECT * FROM quotes WHERE timestamp LIKE CONCAT(CURRENT_DATE,\'%\') ORDER BY timestamp LIMIT 0,1';
+        $query = 'SELECT * FROM quotes WHERE timestamp LIKE CONCAT(CURRENT_DATE,\'%\') ORDER BY timestamp DESC LIMIT 0,1';
         $sth = $dbh->prepare($query);
         $sth->execute();
         $quote = $sth->fetchrow_hashref();
diff --git a/t/db_dependent/Koha.t b/t/db_dependent/Koha.t
index 378a0c1..6f16c87 100644
--- a/t/db_dependent/Koha.t
+++ b/t/db_dependent/Koha.t
@@ -7,51 +7,105 @@ use strict;
 use warnings;
 use C4::Context;
 
-use Test::More tests => 8;
+use Test::More tests => 4;
+use DateTime::Format::MySQL;
+
+eval {use Test::Deep;};
 
 BEGIN {
     use_ok('C4::Koha');
     use_ok('C4::Members');
 }
 
-my $data = {
-    category            => 'CATEGORY',
-    authorised_value    => 'AUTHORISED_VALUE',
-    lib                 => 'LIB',
-    lib_opac            => 'LIBOPAC',
-    imageurl            => 'IMAGEURL'
-};
-
 my $dbh = C4::Context->dbh;
 
+subtest 'Authorized Values Tests' => sub {
+    plan tests => 6;
+
+    my $data = {
+        category            => 'CATEGORY',
+        authorised_value    => 'AUTHORISED_VALUE',
+        lib                 => 'LIB',
+        lib_opac            => 'LIBOPAC',
+        imageurl            => 'IMAGEURL'
+    };
+
+
 # Insert an entry into authorised_value table
-my $query = "INSERT INTO authorised_values (category, authorised_value, lib, lib_opac, imageurl) VALUES (?,?,?,?,?);";
-my $sth = $dbh->prepare($query);
-my $insert_success = $sth->execute($data->{category}, $data->{authorised_value}, $data->{lib}, $data->{lib_opac}, $data->{imageurl});
-ok($insert_success, "Insert data in database");
+    my $query = "INSERT INTO authorised_values (category, authorised_value, lib, lib_opac, imageurl) VALUES (?,?,?,?,?);";
+    my $sth = $dbh->prepare($query);
+    my $insert_success = $sth->execute($data->{category}, $data->{authorised_value}, $data->{lib}, $data->{lib_opac}, $data->{imageurl});
+    ok($insert_success, "Insert data in database");
 
 
 # Tests
-SKIP: {
-    skip "INSERT failed", 5 unless $insert_success;
-    
-    is ( GetAuthorisedValueByCode($data->{category}, $data->{authorised_value}), $data->{lib}, "GetAuthorisedValueByCode" );
-    is ( GetKohaImageurlFromAuthorisedValues($data->{category}, $data->{lib}), $data->{imageurl}, "GetKohaImageurlFromAuthorisedValues" );
+    SKIP: {
+        skip "INSERT failed", 5 unless $insert_success;
 
-    my $sortdet=C4::Members::GetSortDetails("lost", "3");
-    is ($sortdet, "Lost and Paid For", "lost and paid works");
+        is ( GetAuthorisedValueByCode($data->{category}, $data->{authorised_value}), $data->{lib}, "GetAuthorisedValueByCode" );
+        is ( GetKohaImageurlFromAuthorisedValues($data->{category}, $data->{lib}), $data->{imageurl}, "GetKohaImageurlFromAuthorisedValues" );
 
-    my $sortdet2=C4::Members::GetSortDetails("loc", "child");
-    is ($sortdet2, "Children's Area", "Child area works");
+        my $sortdet=C4::Members::GetSortDetails("lost", "3");
+        is ($sortdet, "Lost and Paid For", "lost and paid works");
 
-    my $sortdet3=C4::Members::GetSortDetails("withdrawn", "1");
-    is ($sortdet3, "Withdrawn", "Withdrawn works");
-}
+        my $sortdet2=C4::Members::GetSortDetails("loc", "child");
+        is ($sortdet2, "Children's Area", "Child area works");
+
+        my $sortdet3=C4::Members::GetSortDetails("withdrawn", "1");
+        is ($sortdet3, "Withdrawn", "Withdrawn works");
+    }
 
 # Clean up
-if($insert_success){
-    $query = "DELETE FROM authorised_values WHERE category=? AND authorised_value=? AND lib=? AND lib_opac=? AND imageurl=?;";
-    $sth = $dbh->prepare($query);
-    $sth->execute($data->{category}, $data->{authorised_value}, $data->{lib}, $data->{lib_opac}, $data->{imageurl});
-}
+    if($insert_success){
+        $query = "DELETE FROM authorised_values WHERE category=? AND authorised_value=? AND lib=? AND lib_opac=? AND imageurl=?;";
+        $sth = $dbh->prepare($query);
+        $sth->execute($data->{category}, $data->{authorised_value}, $data->{lib}, $data->{lib_opac}, $data->{imageurl});
+    }
+};
+### test for C4::Koha->GetDailyQuote()
+SKIP:
+    {
+        skip "Test::Deep required to run the GetDailyQuote tests.", 1 if $@;
+
+        subtest 'Daily Quotes Test' => sub {
+            plan tests => 4;
+
+            SKIP: {
 
+                skip "C4::Koha can't \'GetDailyQuote\'!", 3 unless can_ok('C4::Koha','GetDailyQuote');
+
+                my $expected_quote = {
+                    id          => 3,
+                    source      => 'Abraham Lincoln',
+                    text        => 'Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.',
+                    timestamp   => re('\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}'),   #'0000-00-00 00:00:00',
+                };
+
+# test quote retrieval based on id
+
+                my $quote = C4::Koha->GetDailyQuote('id'=>3);
+                cmp_deeply ($quote, $expected_quote, "Got a quote based on id.") or
+                    diag('Be sure to run this test on a clean install of sample data.');
+
+# test random quote retrieval
+
+                $quote = C4::Koha->GetDailyQuote('random'=>1);
+                ok ($quote, "Got a random quote.");
+
+# test quote retrieval based on today's date
+
+                my $query = 'UPDATE quotes SET timestamp = ? WHERE id = ?';
+                my $sth = C4::Context->dbh->prepare($query);
+                $sth->execute(DateTime::Format::MySQL->format_datetime(DateTime->now), $expected_quote->{'id'});
+
+                DateTime::Format::MySQL->format_datetime(DateTime->now) =~ m/(\d{4}-\d{2}-\d{2})/;
+                $expected_quote->{'timestamp'} = re("^$1");
+
+#        $expected_quote->{'timestamp'} = DateTime::Format::MySQL->format_datetime(DateTime->now);   # update the timestamp of expected quote data
+
+                $quote = C4::Koha->GetDailyQuote(); # this is the "default" mode of selection
+                cmp_deeply ($quote, $expected_quote, "Got a quote based on today's date.") or
+                    diag('Be sure to run this test on a clean install of sample data.');
+            }
+        };
+}
-- 
1.7.0.4