From 775357858214d185a52094c66892b818abe695bc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Oct 2015 13:52:37 +0100 Subject: [PATCH] Bug 14778: Install fixtures for t/Matcher.t Signed-off-by: Martin Renvoize --- t/Matcher.t | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/t/Matcher.t b/t/Matcher.t index 484afe0..2a4246c 100755 --- a/t/Matcher.t +++ b/t/Matcher.t @@ -4,30 +4,30 @@ use strict; use warnings; -use Test::More tests => 10; +use Test::More tests => 11; use Test::MockModule; BEGIN { use_ok('C4::Matcher'); } -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 $matcher = [ - [ 'matcher_id', 'code', 'description', 'record_type', 'threshold' ], - [ 1, 'ISBN', 'ISBN', 'red', 1 ], - [ 2, 'ISSN', 'ISSN', 'blue', 0 ] -]; -my $dbh = C4::Context->dbh(); - -$dbh->{mock_add_resultset} = $matcher; +use Test::DBIx::Class { + schema_class => 'Koha::Schema', + connect_info => ['dbi:SQLite:dbname=:memory:','',''], + connect_opts => { name_sep => '.', quote_char => '`', }, + fixture_class => '::Populate', +}, 'MarcMatcher' ; + +fixtures_ok [ + MarcMatcher => [ + [ 'matcher_id', 'code', 'description', 'record_type', 'threshold' ], + [ 1, 'ISBN', 'ISBN', 'red', 1 ], + [ 2, 'ISSN', 'ISSN', 'blue', 0 ] + ], +], 'add fixtures'; + +my $db = Test::MockModule->new('Koha::Database'); +$db->mock( _new_schema => sub { return Schema(); } ); my @matchers = C4::Matcher::GetMatcherList(); @@ -35,8 +35,6 @@ is( $matchers[0]->{'matcher_id'}, 1, 'First matcher_id value is 1' ); is( $matchers[1]->{'matcher_id'}, 2, 'Second matcher_id value is 2' ); -$dbh->{mock_add_resultset} = $matcher; - my $matcher_id = C4::Matcher::GetMatcherId('ISBN'); is( $matcher_id, 1, 'testing getmatcherid' ); -- 2.1.4