From 8b07d0acaa56d49a14238506371ed52e65982c20 Mon Sep 17 00:00:00 2001 From: "G. Richardson" Date: Fri, 11 Nov 2016 08:20:42 +0100 Subject: [PATCH] t/part/assortment.t --- t/part/assortment.t | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/t/part/assortment.t b/t/part/assortment.t index 8ad7e4310..540d0f716 100644 --- a/t/part/assortment.t +++ b/t/part/assortment.t @@ -19,9 +19,9 @@ is( SL::DB::Manager::Part->get_all_count(), 3, "total number of parts created i my $assortment = SL::DB::Manager::Part->find_by( partnumber => 'as1' ); is($assortment->part_type, 'assortment', 'assortment has correct part_type'); -is(scalar @{$assortment->assortment_items}, 2, 'assortment has two parts'); -is($assortment->assortment_sellprice_sum, 19.98, 'assortment sellprice sum ok'); -is($assortment->assortment_lastcost_sum, 13.32, 'assortment lastcost sum ok'); +is(scalar @{$assortment->assortment_items}, 2, 'assortment has two parts'); +is($assortment->items_sellprice_sum, 19.98, 'assortment sellprice sum ok'); +is($assortment->items_lastcost_sum, 13.32, 'assortment lastcost sum ok'); my $assortment_item = $assortment->assortment_items->[0]; is( $assortment_item->assortment->partnumber, 'as1', "assortment_item links back to correct assortment"); @@ -32,13 +32,11 @@ done_testing; sub reset_state { my %params = @_; - my ($part1, $part2, $unit); - # SL::DB::Manager::AssortmentItem->delete_all(all => 1); # SL::DB::Manager::Part->delete_all(all => 1); my ($part1, $part2, $unit, $assortment_part, $assortment_1, $assortment_2); - my $unit = SL::DB::Manager::Unit->find_by(name => 'Stck') || die "Can't find unit 'Stck'"; + $unit = SL::DB::Manager::Unit->find_by(name => 'Stck') || die "Can't find unit 'Stck'"; $part1 = SL::DB::Part->new_part( partnumber => '7777', description => "assortment part 1", unit => $unit->name, @@ -50,12 +48,12 @@ sub reset_state { $part2->description( "assortment part 2" ); $part2->save; - my $assortment_part = SL::DB::Part->new_assortment( partnumber => 'as1', - description => 'assortment', - sellprice => '0', - unit => $unit->name); - my $assortment_1 = SL::DB::AssortmentItem->new( parts_id => $part1->id, qty => 3, unit => $part1->unit, position => 1); - my $assortment_2 = SL::DB::AssortmentItem->new( parts_id => $part2->id, qty => 3, unit => $part2->unit, position => 2); + $assortment_part = SL::DB::Part->new_assortment( partnumber => 'as1', + description => 'assortment', + sellprice => '0', + unit => $unit->name); + $assortment_1 = SL::DB::AssortmentItem->new( parts_id => $part1->id, qty => 3, unit => $part1->unit, position => 1); + $assortment_2 = SL::DB::AssortmentItem->new( parts_id => $part2->id, qty => 3, unit => $part2->unit, position => 2); $assortment_part->add_assortment_items($assortment_1, $assortment_2); $assortment_part->save or die "Couldn't save assortment"; -- 2.20.1