@@ -, +, @@ connection --- t/db_dependent/VirtualShelves.t | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) --- a/t/db_dependent/VirtualShelves.t +++ a/t/db_dependent/VirtualShelves.t @@ -6,14 +6,18 @@ # use Modern::Perl; -use Test::More tests => 82; +use Test::More tests => 72; use MARC::Record; use C4::Biblio qw( AddBiblio DelBiblio ); use C4::Context; -# Getting some borrowers from database. +# Start transaction my $dbh = C4::Context->dbh; +$dbh->{RaiseError} = 1; +$dbh->{AutoCommit} = 0; + +# Getting some borrowers from database. my $query = q{ SELECT borrowernumber FROM borrowers @@ -34,7 +38,6 @@ foreach(0..9) { push @biblionumbers, $biblionumber; } -# FIXME Why are you deleting my shelves? See bug 10386. my $delete_virtualshelf = q{ DELETE FROM virtualshelves WHERE 1 }; @@ -42,10 +45,8 @@ my $delete_virtualshelfcontent = q{ DELETE FROM virtualshelfcontents WHERE 1 }; -$sth = $dbh->prepare($delete_virtualshelf); -$sth->execute; -$sth = $dbh->prepare($delete_virtualshelfcontent); -$sth->execute; +$dbh->do($delete_virtualshelf); +$dbh->do($delete_virtualshelfcontent); # --- #----------------------------------------------------------------------# @@ -61,7 +62,7 @@ use_ok('C4::VirtualShelves'); # creating 10 good shelves. my @shelves; -for(my $i=0; $i<10;$i++){ +for my $i(0..9){ my $ShelfNumber = AddShelf( {shelfname=>"Shelf_".$i, category=>int(rand(2))+1 }, $borrowers[$i] ); die "test Not ok, remove some shelves before" if ($ShelfNumber == -1); @@ -72,7 +73,7 @@ for(my $i=0; $i<10;$i++){ ok(10 == scalar @shelves, 'created 10 lists'); # 10 shelves in @shelves; # try to create some shelf which already exists. -for(my $i=0;$i<10;$i++){ +for my $i(0..9){ my @shlf=GetShelf($shelves[$i]); # FIXME This test still needs some attention @@ -95,7 +96,7 @@ for(my $i=0;$i<10;$i++){ # usage : $biblist = GetShelfContents($shelfnumber); my %used = (); -for(my $i=0; $i<10;$i++){ +for my $i(0..9){ my $bib = $biblionumbers[int(rand(9))]; my $shelfnumber = $shelves[int(rand(9))]; @@ -125,8 +126,7 @@ for(my $i=0; $i<10;$i++){ #-----------------------TEST ModShelf & GetShelf functions------------------------# # usage : ModShelf($shelfnumber, $shelfname, $owner, $category ) # usage : (shelfnumber,shelfname,owner,category) = GetShelf($shelfnumber); - -for(my $i=0; $i<10;$i++){ +for my $i(0..9){ my $rand = int(rand(9)); my $numA = $shelves[$rand]; my $shelf = { shelfname => "NewName_".$rand, @@ -140,14 +140,4 @@ for(my $i=0; $i<10;$i++){ ok($shelf->{category} eq $categoryB, '... and category change took'); } -#-----------------------TEST DelShelf & DelFromShelf functions------------------------# -# usage : ($status) = &DelShelf($shelfnumber); - -for(my $i=0; $i<10;$i++){ - my $shelfnumber = $shelves[$i]; - my $status = DelShelf($shelfnumber); - ok(1 == $status, "deleted shelf $shelfnumber and its contents"); -} - -#----------------------- CLEANUP ----------------------------------------------# -DelBiblio($_) for @biblionumbers; +$dbh->rollback; --