Bug 16609: Catch warning from Koha::Hold in Hold.t

[koha.git] / t / db_dependent / MungeMarcPrice.t

diff --git a/t/db_dependent/MungeMarcPrice.t b/t/db_dependent/MungeMarcPrice.t
index 830f5c0..78a599f 100755 (executable)
--- a/t/db_dependent/MungeMarcPrice.t
+++ b/t/db_dependent/MungeMarcPrice.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use C4::Biblio;
-use C4::Budgets;
+use Koha::Acquisition::Currencies;
 use Test::More;
 use utf8;
 
@@ -30,7 +30,7 @@ my @prices2test=( { string => '25,5 £, $34,55, $LD35',       expected => '34.55
                   { string => '5.99 (7.75 CAN)',             expected => '5.99' },
                 );
 
-plan tests => scalar  @prices2test;
+plan tests => 2 * scalar @prices2test;
 
 # set active currency test data
 my $CURRENCY = 'TEST';
@@ -39,19 +39,36 @@ my $ISOCODE = 'USD';
 my $RATE= 1;
 
 # disables existing active currency if necessary.
-my $active_currency = C4::Budgets->GetCurrency();
+my $active_currency = Koha::Acquisition::Currencies->get_active;
 my $curr;
 if ($active_currency) {
-    $curr = $active_currency->{'currency'};
+    $curr = $active_currency->currency;
     $dbh->do("UPDATE currency set active = 0 where currency = '$curr'");
 }
 
 $dbh->do("INSERT INTO currency ( currency,symbol,isocode,rate,active )
           VALUES ('$CURRENCY','$SYMBOL','$ISOCODE','$RATE',1)");
 foreach my $price (@prices2test) {
-    my $mungemarcprice=MungeMarcPrice($price->{'string'});
-    my $expected=$price->{'expected'};
-    ok ($mungemarcprice eq $expected, "must return $price->{'expected'} from initial string : $price->{'string'}");
+    is(
+        MungeMarcPrice($price->{'string'}),
+        $price->{'expected'},
+        "got expected price from $price->{'string'} (using currency.isocode)",
+    );
 }
+
+# run tests again, but fall back to currency name
+$dbh->do('DELETE FROM aqbasket');
+$dbh->do('DELETE FROM currency');
+$dbh->do("INSERT INTO currency ( currency, symbol, rate, active )
+          VALUES ('$ISOCODE', '$SYMBOL', '$RATE', 1)");
+
+foreach my $price (@prices2test) {
+    is(
+        MungeMarcPrice($price->{'string'}),
+        $price->{'expected'},
+        "got expected price from $price->{'string'} (using ISO code as currency name)",
+    );
+}
+
 # Cleanup
 $dbh->rollback;