From b241555b0abe0ade8aa5fb088acdf2bc26cefe60 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 23 Feb 2018 09:15:55 +0100
Subject: [PATCH] Bug 13287: (QA follow-up) Prepare Suggestions.t for changes

Just rearranging some modules here.
Adding Koha::Database and schema calls.

Test plan:
Run t/db_dependent/Suggestions.t

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 t/db_dependent/Suggestions.t | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/t/db_dependent/Suggestions.t b/t/db_dependent/Suggestions.t
index 6eb7575409..5e9e5eda72 100644
--- a/t/db_dependent/Suggestions.t
+++ b/t/db_dependent/Suggestions.t
@@ -17,37 +17,34 @@
 
 use Modern::Perl;
 
+use DateTime::Duration;
+use Test::More tests => 102;
+use Test::Warn;
+
 use t::lib::Mocks;
+use t::lib::TestBuilder;
+
 use C4::Context;
 use C4::Members;
 use C4::Letters;
 use C4::Budgets qw( AddBudgetPeriod AddBudget );
-
+use Koha::Database;
 use Koha::DateUtils qw( dt_from_string );
 use Koha::Library;
 use Koha::Libraries;
 
-use t::lib::TestBuilder;
-
-use DateTime::Duration;
-use Test::More tests => 102;
-use Test::Warn;
-
 BEGIN {
     use_ok('C4::Suggestions');
 }
 
+my $schema  = Koha::Database->new->schema;
+$schema->storage->txn_begin;
 my $dbh = C4::Context->dbh;
-my $sql;
-
-# Start transaction
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
-
 my $builder = t::lib::TestBuilder->new;
+
 # Reset item types to only the default ones
 $dbh->do(q|DELETE FROM itemtypes;|);
-$sql = "
+my $sql = qq|
 INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES
 ('BK', 'Books',5,0,'bridge/book.gif',''),
 ('MX', 'Mixed Materials',5,0,'bridge/kit.gif',''),
@@ -56,7 +53,7 @@ INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl
 ('VM', 'Visual Materials',5,1,'bridge/dvd.gif',''),
 ('MU', 'Music',5,0,'bridge/sound.gif',''),
 ('CR', 'Continuing Resources',5,0,'bridge/periodical.gif',''),
-('REF', 'Reference',0,1,'bridge/reference.gif','');";
+('REF', 'Reference',0,1,'bridge/reference.gif','');|;
 $dbh->do($sql);
 $dbh->do(q|DELETE FROM suggestions|);
 $dbh->do(q|DELETE FROM issues|);
@@ -384,3 +381,5 @@ subtest 'GetUnprocessedSuggestions' => sub {
     $unprocessed_suggestions = C4::Suggestions::GetUnprocessedSuggestions(5);
     is( scalar(@$unprocessed_suggestions), 0, 'GetUnprocessedSuggestions should not return the suggestion, it has not been suggested 5 days ago' );
 };
+
+$schema->storage->txn_rollback;
-- 
2.20.1