X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F55namespaces_cleaned.t;h=176de5e79fbfdddf4fa878598f021c5d21e7967c;hb=4f6eb3d8d3e8db9dfe002c90c65b856a0a79d60b;hp=b7d81a839957fb17672a0c2ced06df5cc440549a;hpb=0d8817bcb744bb46adf787f359f34e49b092d42e;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/55namespaces_cleaned.t b/t/55namespaces_cleaned.t
index b7d81a8..176de5e 100644
--- a/t/55namespaces_cleaned.t
+++ b/t/55namespaces_cleaned.t
@@ -79,13 +79,17 @@ my $skip_idx = { map { $_ => 1 } (
   # this subclass is expected to inherit whatever crap comes
   # from the parent
   'DBIx::Class::ResultSet::Pager',
+
+  # utility classes, not part of the inheritance chain
+  'DBIx::Class::ResultSource::RowParser::Util',
+  'DBIx::Class::_Util',
 ) };
 
-my $has_cmop = eval { require Class::MOP };
+my $has_moose = eval { require Moose::Util };
 
 # can't use Class::Inspector for the mundane parts as it does not
 # distinguish imports from anything else, what a crock of...
-# Class::MOP is not always available either - hence just do it ourselves
+# Moose is not always available either - hence just do it ourselves
 
 my $seen; #inheritance means we will see the same method multiple times
 
@@ -101,7 +105,7 @@ for my $mod (@modules) {
     my %parents = map { $_ => 1 } @{mro::get_linear_isa($mod)};
 
     my %roles;
-    if ($has_cmop and my $mc = Class::MOP::class_of($mod)) {
+    if ($has_moose and my $mc = Moose::Util::find_meta($mod)) {
       if ($mc->can('calculate_all_roles_with_inheritance')) {
         $roles{$_->name} = 1 for ($mc->calculate_all_roles_with_inheritance);
       }
@@ -109,25 +113,16 @@ for my $mod (@modules) {
 
     for my $name (keys %all_method_like) {
 
-      next if ( DBIx::Class::_ENV_::BROKEN_NAMESPACE_CLEAN and $name =~ /^carp(?:_unique|_once)?$/ );
-
       # 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;
-        if ($name =~ /^__CAG_/) {
-          $TODO = 'CAG does not clean its BEGIN constants';
-        }
-
-        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}"}++;
 
@@ -154,8 +149,6 @@ for my $mod (@modules) {
       }
     }
 
-    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/) {
       if ($mod->can($f)) {