X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F103many_to_many_warning.t;h=a8f790a5a154496821821b367d4f61b5514747f6;hb=b24d86a1fbeb89083bc2eeeeb286d590ffea702a;hp=de602d2ac5ff8556bdfd4acab551f40bf84074bb;hpb=89d1d25783ca743bbf77afb825d2c14edd0e6544;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/103many_to_many_warning.t b/t/103many_to_many_warning.t
index de602d2..a8f790a 100644
--- a/t/103many_to_many_warning.t
+++ b/t/103many_to_many_warning.t
@@ -3,39 +3,54 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
+use Data::Dumper;
 
+plan ( ($] >= 5.009000 and $] < 5.010001)
+  ? (skip_all => 'warnings::register broken under 5.10: http://rt.perl.org/rt3/Public/Bug/Display.html?id=62522')
+  : (tests => 4)
+);
 
-our $no_warn = "";
-our $suffix = "";
-
-plan tests => 2;
 {
-  local $@; 
-  local $SIG{__WARN__} = sub { die @_ };
-  eval "@{[code()]}";
-  like($@, qr/The many-to-many relationship bars/,
-       "Warning triggered without relevant 'no warnings'");
+  my @w; 
+  local $SIG{__WARN__} = sub { push @w, @_ };
+  my $code = gen_code ( suffix => 1 );
+  eval "$code";
+  ok (! $@, 'Eval code without warnings suppression')
+    || diag $@;
+
+  ok ( (grep { $_ =~ /The many-to-many relationship bars is trying to create/ } @w), "Warning triggered without relevant 'no warnings'");
 }
 
 {
+  my @w; 
+  local $SIG{__WARN__} = sub { push @w, @_ };
+
+  my $code = gen_code ( suffix => 2, no_warn => 1 );
+  eval "$code";
+  ok (! $@, 'Eval code with warnings suppression')
+    || diag $@;
 
-  $no_warn = "no warnings 'DBIx::Class::Relationship::ManyToMany';";
-  $suffix = "2";
-  local $SIG{__WARN__} = sub { die @_ };
-  eval "@{[code()]}";
-  unlike($@, qr/The many-to-many relationship bars.*?Bar2/s,
-         "No warning triggered with relevant 'no warnings'");
+  ok ( (not grep { $_ =~ /The many-to-many relationship bars is trying to create/ } @w), "No warning triggered with relevant 'no warnings'");
 }
 
-sub code {
-my $file = << "EOF";
+sub gen_code {
+
+  my $args = { @_ };
+  my $suffix = $args->{suffix};
+  my $no_warn = ( $args->{no_warn}
+    ? "no warnings 'DBIx::Class::Relationship::ManyToMany';"
+    : '',
+  );
+
+  return <<EOF;
 use strict;
 use warnings;
 
 {
   package #
-    DBICTest::Schema::Foo$suffix;
+    DBICTest::Schema::Foo${suffix};
   use base 'DBIx::Class::Core';
+
   __PACKAGE__->table('foo');
   __PACKAGE__->add_columns(
     'fooid' => {
@@ -46,13 +61,12 @@ use warnings;
   __PACKAGE__->set_primary_key('fooid');
 
 
-  __PACKAGE__->has_many('foo_to_bar' => 'DBICTest::Schema::FooToBar$main::suffix' => 'bar');
+  __PACKAGE__->has_many('foo_to_bar' => 'DBICTest::Schema::FooToBar${suffix}' => 'bar');
   __PACKAGE__->many_to_many( foos => foo_to_bar => 'bar' );
-
 }
 {
   package #
-    DBICTest::Schema::FooToBar$suffix;
+    DBICTest::Schema::FooToBar${suffix};
 
   use base 'DBIx::Class::Core';
   __PACKAGE__->table('foo_to_bar');
@@ -64,13 +78,15 @@ use warnings;
       data_type => 'integer',
     },
   );
-  __PACKAGE__->belongs_to('foo' => 'DBICTest::Schema::Foo$main::suffix');
-  __PACKAGE__->belongs_to('bar' => 'DBICTest::Schema::Foo$main::suffix');
+  __PACKAGE__->belongs_to('foo' => 'DBICTest::Schema::Foo${suffix}');
+  __PACKAGE__->belongs_to('bar' => 'DBICTest::Schema::Foo${suffix}');
 }
 {
   package #
-    DBICTest::Schema::Bar$suffix;
+    DBICTest::Schema::Bar${suffix};
+
   use base 'DBIx::Class::Core';
+
   __PACKAGE__->table('bar');
   __PACKAGE__->add_columns(
     'barid' => {
@@ -79,15 +95,14 @@ use warnings;
     },
   );
 
-  use DBIx::Class::Relationship::ManyToMany;
-  $main::no_warn
+  ${no_warn}
   __PACKAGE__->set_primary_key('barid');
-  __PACKAGE__->has_many('foo_to_bar' => 'DBICTest::Schema::FooToBar$main::suffix' => 'foo');
+  __PACKAGE__->has_many('foo_to_bar' => 'DBICTest::Schema::FooToBar${suffix}' => 'foo');
+
   __PACKAGE__->many_to_many( bars => foo_to_bar => 'foo' );
 
   sub add_to_bars {}
-  die $main::suffix;
 }
 EOF
-  return $file;
+
 }