X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fbasic.t;h=4166e2dbc1e315cc952cf21ad7856cec40b4be9d;hb=811a099c10b876edcc1167a58cf80bf42bc5eb4c;hp=42c3e227c50517bdd4b5bb82d485de565f459329;hpb=b1e5ad85e1c05c8f9a3822664645476e0924ec3e;p=p5sagit%2FDevel-Size.git

diff --git a/t/basic.t b/t/basic.t
index 42c3e22..4166e2d 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,29 +1,17 @@
 #!/usr/bin/perl -w
 
-use Test::More;
+use Test::More tests => 19;
 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 outdated version of Devel::Size")
-  unless is ($Devel::Size::VERSION, '0.67', 'VERSION MATCHES');
+die ("Uhoh, test uses an outdated version of Devel::Size")
+    unless is ($Devel::Size::VERSION, '0.75_52', '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
@@ -81,14 +68,49 @@ my($c1,$c2); $c2 = \$c1; $c1 = \$c2;
 
 is (total_size($c1), total_size($c2), 'circular references');
 
-#############################################################################
-# GLOBS
-
-isnt (total_size(*foo), 0, 'total_size(*foo) > 0');
-
-#############################################################################
-# CODE ref
-
-my $code = sub { '1' };
-
-isnt (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
+    weaken $b;
+    is(total_size($a), total_size([]),
+       'Any intial reference is dereferenced and discarded');
+}
+
+# Must call direct - avoid all copying:
+foreach(['undef', total_size(undef)],
+	['no', total_size(1 == 0)],
+	['yes', total_size(1 == 1)],
+       ) {
+    my ($name, $size) = @$_;
+    is($size, 0,
+       "PL_sv_$name is interpeter wide, so not counted as part of the structure's size");
+}
+
+{
+    # SvOOK stuff
+    my $uurk = "Perl Rules";
+    # This may upgrade the scalar:
+    $uurk =~ s/Perl//;
+    $uurk =~ s/^/Perl/;
+    my $before_size = total_size($uurk);
+    my $before_length = length $uurk;
+    cmp_ok($before_size, '>', $before_length, 'Size before is sane');
+    $uurk =~ s/Perl //;
+    is(total_size($uurk), $before_size,
+       "Size doesn't change because OOK is used");
+    cmp_ok(length $uurk, '<', $before_size, 'but string is shorter');
+}