From 39acd694cafab8cacd36df329b8a9cda89ed6bd9 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 6 Jul 2018 11:20:47 +0200 Subject: [PATCH] Bug 19915: (QA follow-up) Tidy up GetItemsForInventory.t Standard edits like modules, schema, Koha objects instead of DBIC. Removing unneeded autoflush. Moving initial test to a first subtest. No need to clear issues if you clear items. Adding a FIXME for OldWay; would be nice to remove that code.. Signed-off-by: Marcel de Rooy https://bugs.koha-community.org/show_bug.cgi?id=19905 Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c345d30cc8284f690f375faa140de49e62358709) Signed-off-by: Martin Renvoize --- t/db_dependent/Items/GetItemsForInventory.t | 30 ++++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/t/db_dependent/Items/GetItemsForInventory.t b/t/db_dependent/Items/GetItemsForInventory.t index d2ddd2e6d0..c8d2594484 100755 --- a/t/db_dependent/Items/GetItemsForInventory.t +++ b/t/db_dependent/Items/GetItemsForInventory.t @@ -60,7 +60,6 @@ subtest 'Old version is unchanged' => sub { $schema->storage->txn_rollback; }; -<<<<<<< HEAD subtest 'Skip items with waiting holds' => sub { plan tests => 6; @@ -127,18 +126,24 @@ subtest 'Skip items with waiting holds' => sub { 'Item on hold skipped, no one matches' ); $schema->storage->txn_rollback; -======= -$dbh->rollback; -$dbh->{AutoCommit} = 1; +}; -subtest 'Use cn_sort rather than callnumber to determine correct location' => sub { +subtest 'Verify results with OldWay' => sub { + $schema->storage->txn_begin; + plan tests => 1; + my ($oldResults, $oldCount) = OldWay(); + my ($newResults, $newCount) = GetItemsForInventory(); + is_deeply($newResults,$oldResults,"Inventory results unchanged."); + $schema->storage->txn_rollback; +}; + +subtest 'Use cn_sort rather than callnumber to determine correct location' => sub { + $schema->storage->txn_begin; plan tests => 1; + my $builder = t::lib::TestBuilder->new; - my $schema = Koha::Database->new->schema; - $schema->storage->txn_begin; - $builder->schema->resultset( 'Issue' )->delete_all; - $builder->schema->resultset( 'Item' )->delete_all; + Koha::Items->delete; my $class_rule = $builder->build({ source => 'ClassSortRule', @@ -166,12 +171,11 @@ subtest 'Use cn_sort rather than callnumber to determine correct location' => su is($item_count,1,"We should return GT95 as between GT90 and GT100"); $schema->storage->txn_rollback; ->>>>>>> Bug 19915: Add unit test to GetItemsForInventory.t }; -sub OldWay { - my ($tdbh) = @_; - my $ldbh = $tdbh; +sub OldWay { # FIXME Do we really still need so much code to check results ?? + my $ldbh = C4::Context->dbh; + my $minlocation = ''; my $maxlocation = ''; my $location = ''; -- 2.39.5