From 29b4f5d1283b802cd98229fd0e57a16260a29ebd Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 20 Oct 2015 12:44:55 +0100
Subject: [PATCH] Bug 14778: Install fixtures for t/Images.t

Note that this tests file were completely buggy before.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 C4/Images.pm |   2 +-
 t/Images.t   | 105 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 52 insertions(+), 55 deletions(-)
 rewrite t/Images.t (75%)

diff --git a/C4/Images.pm b/C4/Images.pm
index 74b7068ce9..936c4df787 100644
--- a/C4/Images.pm
+++ b/C4/Images.pm
@@ -102,7 +102,7 @@ sub RetrieveImage {
 
     my $dbh = C4::Context->dbh;
     my $query =
-'SELECT mimetype, imagefile, thumbnail FROM biblioimages WHERE imagenumber = ?';
+'SELECT imagenumber, mimetype, imagefile, thumbnail FROM biblioimages WHERE imagenumber = ?';
     my $sth = $dbh->prepare($query);
     $sth->execute($imagenumber);
     my $imagedata = $sth->fetchrow_hashref;
diff --git a/t/Images.t b/t/Images.t
dissimilarity index 75%
index c35d5bd443..274766bf9d 100644
--- a/t/Images.t
+++ b/t/Images.t
@@ -1,54 +1,51 @@
-#!/usr/bin/perl
-#
-#Testing C4 Images
-
-use strict;
-use warnings;
-use Test::More tests => 7;
-use Test::MockModule;
-
-BEGIN {
-    use_ok('C4::Images');
-}
-
-my $module = new Test::MockModule('C4::Context');
-$module->mock(
-    '_new_dbh',
-    sub {
-        my $dbh = DBI->connect( 'DBI:Mock:', '', '' )
-          || die "Cannot create handle: $DBI::errstr\n";
-        return $dbh;
-    }
-);
-my $images = [
-    [ 'imagenumber', 'biblionumber', 'mimetype', 'imagefile', 'thumbnail' ],
-    [ 1, 2, 'gif',  'red',  001, 000 ],
-    [ 3, 2, 'jpeg', 'blue', 111, 110 ]
-];
-my $dbh = C4::Context->dbh();
-
-$dbh->{mock_add_resultset} = $images;
-
-my $image = C4::Images::RetrieveImage();
-
-is( $image->{'imagenumber'}, 1, 'First imagenumber is 1' );
-
-is( $image->{'mimetype'}, 'gif', 'First mimetype is red' );
-
-is( $image->{'thumbnail'}, 001, 'First thumbnail is 001' );
-
-$image = C4::Images::RetrieveImage();
-
-$image = C4::Images::RetrieveImage();
-
-$dbh->{mock_add_resultset} = $images;
-
-my @imagenumbers = C4::Images::ListImagesForBiblio();
-
-is( $imagenumbers[0], 1, 'imagenumber is 1' );
-
-is( $imagenumbers[1], 3, 'imagenumber is 3' );
-
-$dbh->{mock_add_resultset} = $images;
-
-is( $imagenumbers[4], undef, 'imagenumber undef' );
+#!/usr/bin/perl
+#
+#Testing C4 Images
+
+use Modern::Perl;
+use Test::More tests => 8;
+use Test::MockModule;
+
+use_ok('C4::Images');
+
+use Test::DBIx::Class {
+    schema_class => 'Koha::Schema',
+    connect_info => ['dbi:SQLite:dbname=:memory:','',''],
+    connect_opts => { name_sep => '.', quote_char => '`', },
+    fixture_class => '::Populate',
+}, 'Biblioimage' ;
+
+# Make the code in the module use our mocked Koha::Schema/Koha::Database
+my $db = Test::MockModule->new('Koha::Database');
+$db->mock(
+    # Schema() gives us the DB connection set up by Test::DBIx::Class
+    _new_schema => sub { return Schema(); }
+);
+
+my $biblionumber = 2;
+my $images = [
+    [ 1, $biblionumber, 'gif',  'imagefile1', 'thumbnail1' ],
+    [ 3, $biblionumber, 'jpeg', 'imagefile3', 'thumbnail3' ],
+];
+fixtures_ok [
+    Biblioimage => [
+        [ 'imagenumber', 'biblionumber', 'mimetype', 'imagefile', 'thumbnail' ],
+        @$images,
+    ],
+], 'add fixtures';
+
+my $image = C4::Images::RetrieveImage(1);
+
+is( $image->{'imagenumber'}, 1, 'First imagenumber is 1' );
+
+is( $image->{'mimetype'}, 'gif', 'First mimetype is gif' );
+
+is( $image->{'thumbnail'}, 'thumbnail1', 'First thumbnail is correct' );
+
+my @imagenumbers = C4::Images::ListImagesForBiblio($biblionumber);
+
+is( $imagenumbers[0], 1, 'imagenumber is 1' );
+
+is( $imagenumbers[1], 3, 'imagenumber is 3' );
+
+is( $imagenumbers[4], undef, 'imagenumber undef' );
-- 
2.11.4.GIT