X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fbasic.t;h=127cb396c7dc0bfac66a55e5a766436d9bbb69ab;hb=d6158a765909946609d49f5e09122a73ec923def;hp=79644ed7d401f6550e6d243246552d5c7e953709;hpb=d23820fdf91fac984bc56f42da183bed856e1efe;p=p5sagit%2FDevel-Size.git

diff --git a/t/basic.t b/t/basic.t
index 79644ed..127cb39 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,9 +1,8 @@
 #!/usr/bin/perl -w
 
-use Test::More tests => 15;
+use Test::More tests => 19;
 use strict;
 use Devel::Size qw(size total_size);
-use Scalar::Util qw(weaken);
 
 can_ok ('Devel::Size', qw/
   size
@@ -11,7 +10,7 @@ can_ok ('Devel::Size', qw/
   /);
 
 die ("Uhoh, test uses an outdated version of Devel::Size")
-    unless is ($Devel::Size::VERSION, '0.74', 'VERSION MATCHES');
+    unless is ($Devel::Size::VERSION, '0.75_52', 'VERSION MATCHES');
 
 #############################################################################
 # some basic checks:
@@ -68,18 +67,6 @@ my($c1,$c2); $c2 = \$c1; $c1 = \$c2;
 
 is (total_size($c1), total_size($c2), 'circular references');
 
-#############################################################################
-# GLOBS
-
-cmp_ok(total_size(*foo), '>', 0, 'total_size(*foo) > 0');
-
-#############################################################################
-# CODE ref
-
-my $code = sub { '1' };
-
-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,
@@ -96,7 +83,43 @@ cmp_ok (total_size(\&LARGE), '>', 8192,
 {
     my $a = [];
     my $b = \$a;
-    # making a weakref upgrades the target to PVMG and adds magic
+    # Scalar::Util isn't in the core before 5.7.something.
+    # The test isn't really testing anything without the weaken(), but it
+    # isn't counter-productive or harmful to run it anyway.
+    unless (eval {
+	require Scalar::Util;
+	# making a weakref upgrades the target to PVMG and adds magic
+	Scalar::Util::weaken($b);
+	1;
+    }) {
+	die $@ if $] >= 5.008;
+    }
+
     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');
+}