Merge pull request Perl#7 from kappa/master

Test more rare edge cases
khwilliamson · Feb 3, 2017 · 0ce55c5 · 0ce55c5
2 parents b890d3a + 999b733
commit 0ce55c5
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 2 deletions.
diff --git a/Format.pm b/Format.pm
@@ -725,7 +725,7 @@ sub format_picture
     $self->_check_seps();
 
     # Handle negative numbers
-    my($neg_prefix) = $self->{neg_format} =~ /^([^x]+)/;
+    my($neg_prefix) = $self->{neg_format} =~ /^([^x]*)/;
     my($pic_prefix) = $picture            =~ /^([^\#]+)/;
     my $neg_pic = $self->{neg_format};
     (my $pos_pic = $self->{neg_format}) =~ s/[^x\s]/ /g;
@@ -857,7 +857,7 @@ sub format_price
     $curr_symbol = "" unless defined($curr_symbol);
 
     # Determine which value to use for frac digits
-    my $frac_digits = ($curr_symbol eq $self->{int_curr_symbol} ?
+    my $frac_digits = (defined $self->{int_curr_symbol} && $curr_symbol eq $self->{int_curr_symbol} ?
                        $self->{int_frac_digits} : $self->{frac_digits});
 
     # Determine precision for decimal portion

diff --git a/t/bigfloat.t b/t/bigfloat.t
@@ -14,6 +14,8 @@ SKIP:
     eval "use Math::BigFloat";
     skip "No Math::BigFloat installed" if $@;
 
+    is(round(Math::BigFloat->new(123.456), 2), '123.46', "round as sub");
+
     my $nf = Number::Format->new();
     is($nf->round(Math::BigFloat->new(123.456), 2), '123.46', "round");
     is($nf->format_number(Math::BigFloat->new(500.27), 2, 1), '500.27');

diff --git a/t/broken_locale.t b/t/broken_locale.t
@@ -0,0 +1,25 @@
+# -*- CPerl -*-
+
+use Test::More qw(no_plan);
+use strict;
+
+use POSIX;
+setlocale(&LC_ALL, 'C');
+
+BEGIN { use_ok('Number::Format') }
+
+sub Number::Format::localeconv {
+    return {
+        p_sign_posn => -1,
+        n_sign_posn => 42,
+        decimal_point => ',',
+        # no thousands_sep
+    };
+}
+
+my $fmt = Number::Format->new;
+
+is($fmt->{n_sign_posn}, 42, 'mocked locale in use');
+isnt($fmt->{p_sign_posn}, -1, '-1 fixed');
+
+is($fmt->{thousands_sep}, "", 'empty default thousand_sep on comma for decimal_point');
diff --git a/t/format_bytes.t b/t/format_bytes.t
@@ -34,6 +34,11 @@ is(format_bytes(1234567890.1, mode => "iec"), '1.15GiB',   'gibi');
 is(format_bytes(1048576,      mode => "iec",
                 unit => 'K'),                 '1,024KiB',  'iec unit');
 
+my $fmt = Number::Format->new(-decimal_digits => 1);
+is($fmt->format_bytes(12.345),   '12.3',    'default precision to decimal_digits');
+undef $fmt->{decimal_digits};
+is($fmt->format_bytes(12.345),   '12.35',    'hard default precision');
+
 {
     my @warnings;
     local $SIG{__WARN__} = sub { @warnings = @_ };

diff --git a/t/format_negative.t b/t/format_negative.t
@@ -10,6 +10,7 @@ setlocale(&LC_ALL, 'C');
 BEGIN { use_ok('Number::Format') }
 
 my $x = Number::Format->new;
+is($x->format_negative(123456.51, '[x]'),      '[123456.51]',   'negative with explicit format');
 $x->{neg_format}='-x';
 is($x->format_negative(123456.51),      '-123456.51',   'negative');
 is($x->format_number(-.509),            '-0.51',        'neg round');

diff --git a/t/format_number.t b/t/format_number.t
@@ -18,6 +18,11 @@ is(format_number('1.2300', 7, 1),  '1.2300000',      'extra zeroes');
 is(format_number(.23, 7, 1),       '0.2300000',      'leading zero');
 is(format_number(-100, 7, 1),      '-100.0000000',   'negative with zeros');
 
+is(format_number("0.000020000E+00", 7), '2e-05', 'scientific notation not processed');
+
+my $fmt = Number::Format->new(-thousands_sep => ""); # e.g. Russian locales
+is($fmt->format_number(12345678.509, 2),   '12345678.51',   'rounding, but no thousand sep');
+
 #
 # https://rt.cpan.org/Ticket/Display.html?id=40126
 # The test should fail because 20 digits is too big to correctly store

diff --git a/t/format_picture.t b/t/format_picture.t
@@ -27,6 +27,13 @@ $pic = '#';
 is($x->format_picture(1, $pic), ' 1 ',  'one digit 1');
 is($x->format_picture(2, $pic), ' 2 ',  'one digit 2');
 
+is($x->format_picture(1, ''), '  ',  'empty picture');
+
+{
+    local $x->{neg_format} = 'x';
+    is($x->format_picture(1, ''), '',  'empty picture w/ trivial neg fmt');
+}
+
 {
     my @warnings;
     local $SIG{__WARN__} = sub { @warnings = @_ };

diff --git a/t/format_price.t b/t/format_price.t
@@ -137,6 +137,23 @@ foreach my $sep (0..2)
     }
 }
 
+$usd = Number::Format->new(
+                              -int_curr_symbol   => 'USD',
+                              -currency_symbol   => '$',
+                              -frac_digits       => 3,
+                              -decimal_digits    => 1,
+                             );
+is($usd->format_price(123456.51, undef, 'int_curr_symbol'),   'USD 123,456.51', 'same as default');
+is($usd->format_price(123456.511, undef, 'currency_symbol'),   '$ 123,456.511', 'use currency_symbol str');
+
+undef $usd->{int_curr_symbol};
+is($usd->format_price(123456.5111),   '$ 123,456.511', 'another default');
+undef $usd->{currency_symbol};
+is($usd->format_price(123456.5111),   '123,456.511', 'hard default');
+undef $usd->{frac_digits};
+is($usd->format_price(123456.5111),   '123,456.5', 'frac_digits undef default');
+undef $usd->{decimal_digits};
+is($usd->format_price(123456.5111),   '123,456.51', 'hard decimal default');
 
 my %prices = ( 1234    => "EUR 1.234,00",
                56      => "EUR 56,00",

diff --git a/t/object.t b/t/object.t
diff --git a/t/round.t b/t/round.t
@@ -30,6 +30,10 @@ ok(compare_numbers(round(123456.78951, -2), 123500),       'precision=-2' );
 # number math will result in 1 rather than 1.01 for this test.
 is(round(1.005, 2), 1.01, 'string-eq' );
 
+my $fmt = Number::Format->new;
+undef $fmt->{decimal_digits};
+ok(compare_numbers($fmt->round(123456.789), 123456.79), 'hard default precision');
+
 # Compare numbers within an epsilon value to avoid false negative
 # results due to floating point math
 sub compare_numbers