X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-good.t;h=f13521623f681f00ec5d434e426ff7a9047609fe;hb=b05f4291bec38d550b98e45a9e6f2320403905d3;hp=88d80603cbae021567a929cbc75fb85206526595;hpb=9856d89db33e335664cca6910de72b53e0e12763;p=perl%2Fmodules%2Findirect.git

diff --git a/t/20-good.t b/t/20-good.t
index 88d8060..f135216 100644
--- a/t/20-good.t
+++ b/t/20-good.t
@@ -1,6 +1,6 @@
 #!perl -T
 
-package Dongs;
+package NotEmpty;
 
 sub new;
 
@@ -9,11 +9,26 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 56 * 4;
+use Test::More tests => 119 * 8 + 10;
+
+BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
 my ($obj, $pkg, $cb, $x, @a);
-our $y;
+our ($y, $meth);
 sub meh;
+sub zap (&);
+
+my @warns;
+
+sub try {
+ my ($code) = @_;
+
+ @warns = ();
+ {
+  local $SIG{__WARN__} = sub { push @warns, @_ };
+  eval $code;
+ }
+}
 
 {
  local $/ = "####";
@@ -28,60 +43,162 @@ sub meh;
 
 SKIP:
   {
-   skip "$_: $skip" => 4 if eval $skip;
+   skip "$_: $skip" => 8 if eval $skip;
 
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+   {
+    local $_ = $_;
+    s/Pkg/Empty/g;
 
-   eval "die qq{ok\\n}; $prefix; use indirect; $_";
-   is($@, "ok\n", "use indirect: $_");
+    try "return; $prefix; use indirect; $_";
+    is $@,     '', "use indirect: $_";
+    is @warns, 0,  'no reports';
 
-   eval "die qq{ok\n}; $prefix; no indirect; $_";
-   is($@, "ok\n", "no indirect: $_");
+    try "return; $prefix; no indirect; $_";
+    is $@,     '', "no indirect: $_";
+    is @warns, 0,  'no reports';
+   }
 
-   s/Hlagh/Dongs/g;
+   {
+    local $_ = $_;
+    s/Pkg/NotEmpty/g;
 
-   eval "die qq{ok\\n}; $prefix; use indirect; $_";
-   is($@, "ok\n", "use indirect, defined: $_");
+    try "return; $prefix; use indirect; $_";
+    is $@,     '', "use indirect, defined: $_";
+    is @warns, 0,  'no reports';
 
-   eval "die qq{ok\\n}; $prefix; no indirect; $_";
-   is($@, "ok\n", "no indirect, defined: $_");
+    try "return; $prefix; no indirect; $_";
+    is $@,     '', "no indirect, defined: $_";
+    is @warns, 0,  'no reports';
+   }
   }
  }
 }
 
+# These tests must be run outside of eval to be meaningful.
+{
+ sub Zlott::Owww::new { }
+
+ my (@warns, $hook, $desc, $id);
+ BEGIN {
+  $hook = sub { push @warns, indirect::msg(@_) };
+  $desc = "test sort and line endings %d: no indirect construct";
+  $id   = 1;
+ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+          ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+               ->new;
+ };
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                 ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                  ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                   ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                     ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                       ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                          ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                            ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+
+ BEGIN { @warns = () }
+ {
+  no indirect hook => $hook;
+  my @stuff = sort Zlott::Owww
+                             ->new;
+ }
+ BEGIN { is_deeply \@warns, [ ], sprintf $desc, $id++ }
+}
+
 __DATA__
 
-$obj = Hlagh->new;
+$obj = Pkg->new;
 ####
-$obj = Hlagh->new();
+$obj = Pkg->new();
 ####
-$obj = Hlagh->new(1);
+$obj = Pkg->new(1);
 ####
-$obj = Hlagh->new(q{foo}, bar => $obj);
+$obj = Pkg->new(q{foo}, bar => $obj);
 ####
-$obj = Hlagh   ->   new   ;
+$obj = Pkg   ->   new   ;
 ####
-$obj = Hlagh   ->   new   (   )   ;
+$obj = Pkg   ->   new   (   )   ;
 ####
-$obj = Hlagh   ->   new   (   1   )   ;
+$obj = Pkg   ->   new   (   1   )   ;
 ####
-$obj = Hlagh   ->   new   (   'foo'   ,   bar =>   $obj   );
+$obj = Pkg   ->   new   (   'foo'   ,   bar =>   $obj   );
 ####
-$obj = Hlagh
+$obj = Pkg
             ->
                           new   ;
 ####
-$obj = Hlagh  
+$obj = Pkg  
 
       ->   
 new   ( 
  )   ;
 ####
-$obj = Hlagh
+$obj = Pkg
                                        ->   new   ( 
                1   )   ;
 ####
-$obj = Hlagh   ->
+$obj = Pkg   ->
                               new   (   "foo"
   ,    bar     
                =>        $obj       );
@@ -94,13 +211,19 @@ $obj = new->newnew;
 ####
 $obj = newnew->new;
 ####
-$obj = Hlagh->$cb;
+$obj = Pkg->$cb;
 ####
-$obj = Hlagh->$cb();
+$obj = Pkg->$cb();
 ####
-$obj = Hlagh->$cb($pkg);
+$obj = Pkg->$cb($pkg);
 ####
-$obj = Hlagh->$cb(sub { 'foo' },  bar => $obj);
+$obj = Pkg->$cb(sub { 'foo' },  bar => $obj);
+####
+$obj = Pkg->$meth;
+####
+$obj =   Pkg
+   -> 
+          $meth   ( 1,   2   );
 ####
 $obj = $pkg->new   ;
 ####
@@ -127,22 +250,31 @@ $obj = $pkg    ->   ($cb)   ();
 ####
 $obj = $pkg->$cb( $obj  );
 ####
-$obj = $pkg->$cb(qw/foo bar baz/);
+$obj = $pkg->$cb(qw<foo bar baz>);
 ####
-$obj = new { $x };
+$obj = $pkg->$meth;
 ####
-$obj = new
-  {
-     $x  }
-  ();
+$obj 
+ =
+    $pkg
+          ->
+              $meth
+  ( 1 .. 10 );
 ####
-$obj = new {
-  $x  } qq/foo/;
+$obj = $y->$cb;
 ####
-$obj = new
-   {
-      $x
-    }(qw/bar baz/);
+$obj =  $y
+  ->          $cb   (
+  'foo', 1, 2, 'bar'
+);
+####
+$obj = $y->$meth;
+####
+$obj =
+  $y->
+      $meth   (
+ qr(hello),
+);
 ####
 meh;
 ####
@@ -155,9 +287,9 @@ meh $x, 1, 2;
 meh $y;
 ####
 meh $y, 1, 2;
-#### $] < 5.010 # use feature 'state'; state $z
+#### "$]" < 5.010 # use feature 'state'; state $z
 meh $z;
-#### $] < 5.010 # use feature 'state'; state $z
+#### "$]" < 5.010 # use feature 'state'; state $z
 meh $z, 1, 2;
 ####
 print;
@@ -170,19 +302,93 @@ print $x "oh hai\n";
 ####
 print $y;
 ####
-print $y "dongs\n";
-#### $] < 5.010 # use feature 'state'; state $z
+print $y "hello thar\n";
+#### "$]" < 5.010 # use feature 'state'; state $z
 print $z;
-#### $] < 5.010 # use feature 'state'; state $z
-print $z "hlagh\n";
+#### "$]" < 5.010 # use feature 'state'; state $z
+print $z "lolno\n";
 ####
 print STDOUT "bananananananana\n";
 ####
 $x->foo($pkg->$cb)
 ####
-$obj = "apple ${\(new Hlagh)} pear"
+$obj = "apple ${\($x->new)} pear"
+####
+$obj = "apple @{[$x->new]} pear"
+####
+$obj = "apple ${\($y->new)} pear"
+####
+$obj = "apple @{[$y->new]} pear"
 ####
-$obj = "apple @{[new Hlagh]} pear"
+$obj = "apple ${\($x->$cb)} pear"
+####
+$obj = "apple @{[$x->$cb]} pear"
+####
+$obj = "apple ${\($y->$cb)} pear"
+####
+$obj = "apple @{[$y->$cb]} pear"
+####
+$obj = "apple ${\($x->$meth)} pear"
+####
+$obj = "apple @{[$x->$meth]} pear"
+####
+$obj = "apple ${\($y->$meth)} pear"
+####
+$obj = "apple @{[$y->$meth]} pear"
+#### # local $_ = "foo";
+s/foo/return; Pkg->new/e;
+#### # local $_ = "bar";
+s/foo/return; Pkg->new/e;
+#### # local $_ = "foo";
+s/foo/return; Pkg->$cb/e;
+#### # local $_ = "bar";
+s/foo/return; Pkg->$cb/e;
+#### # local $_ = "foo";
+s/foo/return; Pkg->$meth/e;
+#### # local $_ = "bar";
+s/foo/return; Pkg->$meth/e;
+#### # local $_ = "foo";
+s/foo/return; $x->new/e;
+#### # local $_ = "bar";
+s/foo/return; $x->new/e;
+#### # local $_ = "foo";
+s/foo/return; $x->$cb/e;
+#### # local $_ = "bar";
+s/foo/return; $x->$cb/e;
+#### # local $_ = "foo";
+s/foo/return; $x->$meth/e;
+#### # local $_ = "bar";
+s/foo/return; $x->$meth/e;
+#### # local $_ = "foo";
+s/foo/return; $y->new/e;
+#### # local $_ = "bar";
+s/foo/return; $y->new/e;
+#### # local $_ = "foo";
+s/foo/return; $y->$cb/e;
+#### # local $_ = "bar";
+s/foo/return; $y->$cb/e;
+#### # local $_ = "foo";
+s/foo/return; $y->$meth/e;
+#### # local $_ = "bar";
+s/foo/return; $y->$meth/e;
+####
+"foo" =~ /(?{Pkg->new})/;
+####
+"foo" =~ /(?{Pkg->$cb})/;
+####
+"foo" =~ /(?{Pkg->$meth})/;
+####
+"foo" =~ /(?{$x->new})/;
+####
+"foo" =~ /(?{$x->$cb})/;
+####
+"foo" =~ /(?{$x->$meth})/;
+####
+"foo" =~ /(?{$y->new})/;
+####
+"foo" =~ /(?{$y->$cb})/;
+####
+"foo" =~ /(?{$y->$meth})/;
 ####
 exec $x $x, @a;
 ####
@@ -191,3 +397,72 @@ exec { $a[0] } @a;
 system $x $x, @a;
 ####
 system { $a[0] } @a;
+####
+zap { };
+####
+zap { 1; };
+####
+zap { 1; 1; };
+####
+zap { zap { }; 1; };
+####
+my @stuff = sort Pkg
+     ->new;
+####
+my @stuff = sort Pkg
+              ->new;
+####
+my @stuff = sort Pkg
+               ->new;
+####
+my @stuff = sort Pkg
+                ->new;
+####
+my @stuff = sort Pkg
+                 ->new;
+####
+my @stuff = sort Pkg
+                   ->new;
+####
+my @stuff = sort Pkg
+                     ->new;
+####
+my @stuff = sort Pkg
+                        ->new;
+####
+sub {
+ my $self = shift;
+ return $self->new ? $self : undef;
+}
+####
+sub {
+ my $self = shift;
+ return $self ? $self->new : undef;
+}
+####
+sub {
+ my $self = shift;
+ return $_[0] ? undef : $self->new;
+}
+####
+package Hurp;
+__PACKAGE__->new;
+####
+package Hurp;
+__PACKAGE__->new # Hurp
+####
+package Hurp;
+__PACKAGE__->new;
+# Hurp
+####
+package __PACKAGE_;
+__PACKAGE__->new # __PACKAGE_
+####
+package __PACKAGE_;
+__PACKAGE_->new # __PACKAGE__
+####
+package __PACKAGE___;
+__PACKAGE__->new # __PACKAGE___
+####
+package __PACKAGE___;
+__PACKAGE___->new # __PACKAGE__