Bug 19489: (QA follow-up) Update test to use objects and module methods for creating...

[koha.git] / t / Images.t

diff --git a/t/Images.t b/t/Images.t
index 274766b..338a903 100644 (file)
--- a/t/Images.t
+++ b/t/Images.t
@@ -1,19 +1,38 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# 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.
 #
-#Testing C4 Images
+# 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>.
 
 use Modern::Perl;
-use Test::More tests => 8;
+
+use Test::More;
 use Test::MockModule;
 
+use Module::Load::Conditional qw/check_install/;
+
+BEGIN {
+    if ( check_install( module => 'Test::DBIx::Class' ) ) {
+        plan tests => 8;
+    } else {
+        plan skip_all => "Need Test::DBIx::Class"
+    }
+}
+
 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' ;
+use Test::DBIx::Class;
 
 # Make the code in the module use our mocked Koha::Schema/Koha::Database
 my $db = Test::MockModule->new('Koha::Database');
@@ -49,3 +68,4 @@ is( $imagenumbers[0], 1, 'imagenumber is 1' );
 is( $imagenumbers[1], 3, 'imagenumber is 3' );
 
 is( $imagenumbers[4], undef, 'imagenumber undef' );
+