From 2350a19d431a5a3c13cd4aec234be0c0e7d54a9b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Oct 2015 12:48:37 +0100 Subject: [PATCH] Bug 14778: Install fixtures for t/ItemType.t Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- t/ItemType.t | 67 ++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 42 deletions(-) diff --git a/t/ItemType.t b/t/ItemType.t index 238fe2ce6c..b10efdddec 100755 --- a/t/ItemType.t +++ b/t/ItemType.t @@ -1,59 +1,48 @@ #!/usr/bin/perl use Modern::Perl; -use DBI; -use Test::More tests => 27; -use Test::MockModule; +use Test::More tests => 25; +use t::lib::Mocks; -BEGIN { - use_ok('C4::ItemType'); +use_ok('C4::ItemType'); + +use Test::DBIx::Class { + schema_class => 'Koha::Schema', + connect_info => ['dbi:SQLite:dbname=:memory:','',''], + connect_opts => { name_sep => '.', quote_char => '`', }, + fixture_class => '::Populate', +}, 'Itemtype' ; + +sub fixtures { + my ( $data ) = @_; + fixtures_ok [ + Itemtype => [ + [ + 'itemtype', 'description', 'rentalcharge', 'notforloan', + 'imageurl', 'summary', 'checkinmsg' + ], + @$data, + ], + ], 'add fixtures'; } -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 $db = Test::MockModule->new('Koha::Database'); +$db->mock( _new_schema => sub { return Schema(); } ); # Mock data my $itemtypes = [ - [ - 'itemtype', 'description', 'rentalcharge', 'notforloan', - 'imageurl', 'summary', 'checkinmsg' - ], [ 'BK', 'Books', 0, 0, '', '', 'foo' ], [ 'CD', 'CDRom', 0, 0, '', '', 'bar' ] ]; -my $itemtypes_empty = [ - [ - 'itemtype', 'description', 'rentalcharge', 'notforloan', - 'imageurl', 'summary', 'checkinmsg' - ], -]; - -my $dbh = C4::Context->dbh(); -$dbh->{mock_add_resultset} = $itemtypes_empty; - my @itemtypes = C4::ItemType->all(); is( @itemtypes, 0, 'Testing all itemtypes is empty' ); -# This should run exactly one query so we can test -my $history = $dbh->{mock_all_history}; -is( scalar( @{$history} ), 1, 'Correct number of statements executed' ); - # Now lets mock some data -$dbh->{mock_add_resultset} = $itemtypes; +fixtures($itemtypes); @itemtypes = C4::ItemType->all(); -$history = $dbh->{mock_all_history}; -is( scalar( @{$history} ), 2, 'Correct number of statements executed' ); - is( @itemtypes, 2, 'ItemType->all should return an array with 2 elements' ); is( $itemtypes[0]->fish, undef, 'Calling a bad descriptor gives undef' ); @@ -82,15 +71,9 @@ is( $itemtypes[0]->checkinmsg, 'foo', 'first checkinmsg is foo' ); is( $itemtypes[1]->checkinmsg, 'bar', 'second checkinmsg is bar' ); -# Mock the data again -$dbh->{mock_add_resultset} = $itemtypes; - # Test get(), which should return one itemtype my $itemtype = C4::ItemType->get( 'BK' ); -$history = $dbh->{mock_all_history}; -is( scalar( @{$history} ), 3, 'Correct number of statements executed' ); - is( $itemtype->fish, undef, 'Calling a bad descriptor gives undef' ); is( $itemtype->itemtype, 'BK', 'itemtype is bk' );