Pod/comment fixes

[dbsrgits/DBIx-Class.git] / t / 55namespaces_cleaned.t

diff --git a/t/55namespaces_cleaned.t b/t/55namespaces_cleaned.t
index 5b147d4..176de5e 100644 (file)
--- a/t/55namespaces_cleaned.t
+++ b/t/55namespaces_cleaned.t
@@ -85,11 +85,11 @@ my $skip_idx = { map { $_ => 1 } (
   '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
 
@@ -105,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);
       }
@@ -113,8 +113,6 @@ 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 =~ /^\(/;
 
@@ -151,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)) {