Fix, export and test cmp_ok()

diff --git a/MANIFEST b/MANIFEST
index c4a91c3b8103af64ae373c9a9f19befb0a6eb070..e5fbf16bc82d146fe01434416d9aaeebfec01a7f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -17,3 +17,4 @@ t/19-comments.t
 t/80-threads.t
 t/20-ok.t
 t/21-is.t
 t/80-threads.t
 t/20-ok.t
 t/21-is.t

+t/22-cmp_ok.t

diff --git a/lib/Test/Leaner.pm b/lib/Test/Leaner.pm
index c4c577d2dde61f0eeece12b0f6ccdf9c6ff1a721..5e2f0a5f227e488256aa9677155c20763fe12a78 100644 (file)
--- a/lib/Test/Leaner.pm
+++ b/lib/Test/Leaner.pm
@@ -122,6 +122,7 @@ our @EXPORT = qw<
  ok
  is
  isnt
  ok
  is
  isnt

+ cmp_ok

  like
  unlike
  diag
  like
  unlike
  diag


@@ -330,7 +331,7 @@ sub cmp_ok ($$$;$) {
  croak("Operator $op not supported") unless defined $name;
  @_ = ($x, $y, $desc);
  no strict 'refs';
  croak("Operator $op not supported") unless defined $name;
  @_ = ($x, $y, $desc);
  no strict 'refs';

- goto &{__PACKAGE__."is_$name"};
+ goto &{__PACKAGE__."::is_$name"};

 }
 
 sub _diag_fh {
 }
 
 sub _diag_fh {

diff --git a/t/01-import.t b/t/01-import.t
index 155dc43faf77feb7b0b9a309de3f2865872e745e..d612ed4ff607030258275327f90d2615b35186dc 100644 (file)
--- a/t/01-import.t
+++ b/t/01-import.t
@@ -7,7 +7,7 @@ use Test::More ();
 
 BEGIN { *tm_is = \&Test::More::is }
 
 
 BEGIN { *tm_is = \&Test::More::is }
 

-Test::More::plan(tests => 2 * 14);
+Test::More::plan(tests => 2 * 15);

 
 require Test::Leaner;
 
 
 require Test::Leaner;
 


@@ -21,6 +21,7 @@ my @syms = qw<
  ok
  is
  isnt
  ok
  is
  isnt

+ cmp_ok

  like
  unlike
  diag
  like
  unlike
  diag

diff --git a/t/22-cmp_ok.t b/t/22-cmp_ok.t
new file mode 100644 (file)
index 0000000..f26d687
--- /dev/null
+++ b/t/22-cmp_ok.t
@@ -0,0 +1,25 @@
+#!perl -T
+
+use strict;
+use warnings;
+
+use Test::Leaner tests => 4 * 8;
+
+my @num_tests = (
+ [ '1.0', '==', '1.0' ],
+ [ '1e0', '==', '1e0' ],
+ [ '1.0', '<=', '1.0' ],
+ [ '1.0', '>=', '1.0' ],
+ [ '1.0', '<=', '2.0' ],
+ [ '1.0', '<',  '2.0' ],
+ [ '2.0', '>=', '1.0' ],
+ [ '2.0', '>',  '1.0' ],
+);
+
+for my $t (@num_tests) {
+ my ($x, $op, $y) = @$t;
+ cmp_ok $x,      $op, $y;
+ cmp_ok int($x), $op, $y;
+ cmp_ok $x,      $op, int($y);
+ cmp_ok int($x), $op, int($y);
+}