X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F55namespaces_cleaned.t;h=30795a77d1995f61e5d7b6f6c9be6ebaf1d2fc2c;hb=1b5ddf236a7911b6686be06602ffd657372523c2;hp=17f8750788a930d90a4f0937467c2f83209ace72;hpb=90cfe42b94a798be8ee5498fd57e2e76adff5156;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/55namespaces_cleaned.t b/t/55namespaces_cleaned.t
index 17f8750..30795a7 100644
--- a/t/55namespaces_cleaned.t
+++ b/t/55namespaces_cleaned.t
@@ -1,8 +1,43 @@
+BEGIN {
+  if ($] < 5.010) {
+
+    # Pre-5.10 perls pollute %INC on unsuccesfull module
+    # require, making it appear as if the module is already
+    # loaded on subsequent require()s
+    # Can't seem to find the exact RT/perldelta entry
+    #
+    # The reason we can't just use a sane, clean loader, is because
+    # if a Module require()s another module the %INC will still
+    # get filled with crap and we are back to square one. A global
+    # fix is really the only way for this test, as we try to load
+    # each available module separately, and have no control (nor
+    # knowledge) over their common dependencies.
+    #
+    # we want to do this here, in the very beginning, before even
+    # warnings/strict are loaded
+
+    unshift @INC, 't/lib';
+    require DBICTest::Util::OverrideRequire;
+
+    DBICTest::Util::OverrideRequire::override_global_require( sub {
+      my $res = eval { $_[0]->() };
+      if ($@ ne '') {
+        delete $INC{$_[1]};
+        die $@;
+      }
+      return $res;
+    } );
+  }
+}
+
 use strict;
 use warnings;
 
 use Test::More;
 
+use lib 't/lib';
+use DBICTest;
+
 use File::Find;
 use File::Spec;
 use B qw/svref_2object/;
@@ -13,18 +48,18 @@ use DBIx::Class;
 use DBIx::Class::Carp;
 
 my @modules = grep {
-  my $mod = $_;
-
-  # trap deprecation warnings and whatnot
-  local $SIG{__WARN__} = sub {};
+  my ($mod) = $_ =~ /(.+)/;
 
   # not all modules are loadable at all times
-  eval "require $mod" ? $mod : do {
-    SKIP: { skip "Failed require of $mod: $@", 1 };
-    ();
+  do {
+    # trap deprecation warnings and whatnot
+    local $SIG{__WARN__} = sub {};
+    eval "require $mod";
+  } ? $mod : do {
+    SKIP: { skip "Failed require of $mod: " . ($@ =~ /^(.+?)$/m)[0], 1 };
+    (); # empty RV for @modules
   };
 
-
 } find_modules();
 
 # have an exception table for old and/or weird code we are not sure
@@ -41,8 +76,12 @@ my $skip_idx = { map { $_ => 1 } (
   'DBIx::Class::Admin::Descriptive',
   'DBIx::Class::Admin::Usage',
 
-  # exempt due to the __BROKEN_NC constant
-  'DBIx::Class::Carp',
+  # this subclass is expected to inherit whatever crap comes
+  # from the parent
+  'DBIx::Class::ResultSet::Pager',
+
+  # a utility class, not part of the inheritance chain
+  'DBIx::Class::ResultSource::RowParser::Util',
 ) };
 
 my $has_cmop = eval { require Class::MOP };
@@ -73,21 +112,18 @@ for my $mod (@modules) {
 
     for my $name (keys %all_method_like) {
 
-      next if ( DBIx::Class::Carp::__BROKEN_NC() and $name =~ /^carp(?:_unique|_once)?$/ );
+      next if ( DBIx::Class::_ENV_::BROKEN_NAMESPACE_CLEAN and $name =~ /^carp(?:_unique|_once)?$/ );
 
-      # overload is a funky thing - it is neither cleaned, and its imports are named funny
+      # overload is a funky thing - it is not cleaned, and its imports are named funny
       next if $name =~ /^\(/;
 
       my $gv = svref_2object($all_method_like{$name})->GV;
       my $origin = $gv->STASH->NAME;
 
-      TODO: {
-        local $TODO = 'CAG does not clean its BEGIN constants' if $name =~ /^__CAG_/;
-        is ($gv->NAME, $name, "Properly named $name method at $origin" . ($origin eq $mod
-          ? ''
-          : " (inherited by $mod)"
-        ));
-      }
+      is ($gv->NAME, $name, "Properly named $name method at $origin" . ($origin eq $mod
+        ? ''
+        : " (inherited by $mod)"
+      ));
 
       next if $seen->{"${origin}:${name}"}++;
 
@@ -114,7 +150,7 @@ for my $mod (@modules) {
       }
     }
 
-    next if DBIx::Class::Carp::__BROKEN_NC();
+    next if DBIx::Class::_ENV_::BROKEN_NAMESPACE_CLEAN;
 
     # some common import names (these should never ever be methods)
     for my $f (qw/carp carp_once carp_unique croak confess cluck try catch finally/) {
@@ -153,5 +189,4 @@ sub find_modules {
   return sort @modules;
 }
 
-
 done_testing;