X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fbasic.t;h=b5b08383f690197f94cd714cedf130d132591fa0;hb=8c394e1251fdfe38;hp=a6b0d14eefc66892b6cb2631d385c332261407cd;hpb=5a83b7cfbe04badf89f4f814c5657e3531538978;p=p5sagit%2FDevel-Size.git

diff --git a/t/basic.t b/t/basic.t
index a6b0d14..b5b0838 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,29 +1,17 @@
 #!/usr/bin/perl -w
 
-use Test::More;
+use Test::More tests => 15;
 use strict;
-   
-my $tests;
-
-BEGIN
-   {
-   chdir 't' if -d 't';
-   plan tests => 13;
-
-   use lib '../lib';
-   use lib '../blib/arch';
-   use_ok('Devel::Size');
-   }
+use Devel::Size qw(size total_size);
+use Scalar::Util qw(weaken);
 
 can_ok ('Devel::Size', qw/
   size
   total_size
   /);
 
-Devel::Size->import( qw(size total_size) );
-
 die ("Uhoh, test uses an outdated version of Devel::Size")
-  unless is ($Devel::Size::VERSION, '0.69', 'VERSION MATCHES');
+  unless is ($Devel::Size::VERSION, '0.73_50', 'VERSION MATCHES');
 
 #############################################################################
 # some basic checks:
@@ -34,9 +22,9 @@ $foo = "12";
 %foo = (a => 1, b => 2);
 
 my $x = "A string";
-my $y = "A much much longer string";		# need to be at least 7 bytes longer for 64 bit
-ok (size($x) < size($y), 'size() of strings');
-ok (total_size($x) < total_size($y), 'total_size() of strings');
+my $y = "A much much longer string";        # need to be at least 7 bytes longer for 64 bit
+cmp_ok(size($x), '<', size($y), 'size() of strings');
+cmp_ok(total_size($x), '<', total_size($y), 'total_size() of strings');
 
 my @x = (1..4);
 my @y = (1..200);
@@ -44,8 +32,7 @@ my @y = (1..200);
 my $size_1 = total_size(\@x);
 my $size_2 = total_size(\@y);
 
-ok ( $size_1 < $size_2, 'size() of array refs');
-ok (total_size(\@x) < total_size(\@y), 'total_size() of array refs');
+cmp_ok($size_1, '<', $size_2, 'size() of array refs');
 
 # the arrays alone shouldn't be the same size
 $size_1 = size(\@x);
@@ -62,7 +49,7 @@ $y = 12; $y .= '';
 $size_1 = size($x);
 $size_2 = size($y);
 
-ok ($size_1 < $size_2, ' ."" makes string longer');
+cmp_ok($size_1, '<', $size_2, ' ."" makes string longer');
 
 #############################################################################
 # check that the tracking_hash is working
@@ -71,8 +58,8 @@ my($a,$b) = (1,2);
 my @ary1 = (\$a, \$a);
 my @ary2 = (\$a, \$b);
 
-isnt ( total_size(\@ary2) - total_size(\@ary1), 0,
-	'total_size(\@ary1) < total_size(\@ary2)');
+cmp_ok(total_size(\@ary1), '<', total_size(\@ary2),
+       'the tracking hash is working');
 
 #############################################################################
 # check that circular references don't mess things up
@@ -84,11 +71,32 @@ is (total_size($c1), total_size($c2), 'circular references');
 #############################################################################
 # GLOBS
 
-isnt (total_size(*foo), 0, 'total_size(*foo) > 0');
+cmp_ok(total_size(*foo), '>', 0, 'total_size(*foo) > 0');
 
 #############################################################################
 # CODE ref
 
 my $code = sub { '1' };
 
-isnt (total_size($code), 0, 'total_size($code) > 0');
+cmp_ok(total_size($code), '>', 0, 'total_size($code) > 0');
+
+##########################################################
+# RT#14849 (& RT#26781 and possibly RT#29238?)
+cmp_ok( total_size( sub{ do{ my $t=0 }; } ), '>', 0,
+	'total_size( sub{ my $t=0 } ) > 0' );
+
+# CPAN RT #58484 and #58485
+cmp_ok(total_size(\&total_size), '>', 0, 'total_size(\&total_size) > 0');
+
+use constant LARGE => 'N' x 8192;
+
+cmp_ok (total_size(\&LARGE), '>', 8192,
+        'total_size for a constant includes the constant');
+
+{
+    my $a = [];
+    my $b = \$a;
+    # making a weakref upgrades the target to PVMG and adds magic
+    is(total_size($a), total_size([]),
+       'Any intial reference is dereferenced and discarded');
+}