X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xt%2Fextra%2Finternals%2Fnamespaces_cleaned.t;h=b0a7cdb62c6e372e3140e36d45ccbdfe381f0be4;hb=497d0451;hp=3f702628a5447955f764e2ae656ad3318f9b35ae;hpb=817ac9e927cd8e29d1bf553714379e54df5dbef7;p=dbsrgits%2FDBIx-Class.git

diff --git a/xt/extra/internals/namespaces_cleaned.t b/xt/extra/internals/namespaces_cleaned.t
index 3f70262..b0a7cdb 100644
--- a/xt/extra/internals/namespaces_cleaned.t
+++ b/xt/extra/internals/namespaces_cleaned.t
@@ -39,16 +39,14 @@ use Test::More;
 
 use DBICTest;
 use File::Find;
-use File::Spec;
-use B qw/svref_2object/;
-use Package::Stash;
+use DBIx::Class::_Util qw( get_subname describe_class_methods );
 
 # makes sure we can load at least something
 use DBIx::Class;
 use DBIx::Class::Carp;
 
 my @modules = grep {
-  my ($mod) = $_ =~ /(.+)/;
+  my $mod = $_;
 
   # not all modules are loadable at all times
   do {
@@ -65,8 +63,7 @@ my @modules = grep {
 # have an exception table for old and/or weird code we are not sure
 # we *want* to clean in the first place
 my $skip_idx = { map { $_ => 1 } (
-  (grep { /^DBIx::Class::CDBICompat/ } @modules), # too crufty to touch
-  'SQL::Translator::Producer::DBIx::Class::File', # ditto
+  'SQL::Translator::Producer::DBIx::Class::File', # too crufty to touch
 
   # not sure how to handle type libraries
   'DBIx::Class::Storage::DBI::Replicated::Types',
@@ -83,23 +80,25 @@ my $skip_idx = { map { $_ => 1 } (
   # utility classes, not part of the inheritance chain
   'DBIx::Class::Optional::Dependencies',
   'DBIx::Class::ResultSource::RowParser::Util',
+  'DBIx::Class::SQLMaker::Util',
   'DBIx::Class::_Util',
 ) };
 
 my $has_moose = eval { require Moose::Util };
 
-Sub::Defer::undefer_all();
-
 my $seen; #inheritance means we will see the same method multiple times
 
 for my $mod (@modules) {
   SKIP: {
     skip "$mod exempt from namespace checks",1 if $skip_idx->{$mod};
 
-    my %all_method_like = (map
-      { %{Package::Stash->new($_)->get_all_symbols('CODE')} }
-      (reverse @{mro::get_linear_isa($mod)})
-    );
+    my %all_method_like =
+      map
+        { $_->[0]{name} => $mod->can( $_->[0]{name} ) }
+        grep
+          { $_->[0]{via_class} ne 'UNIVERSAL' }
+          values %{ describe_class_methods($mod)->{methods} }
+    ;
 
     my %parents = map { $_ => 1 } @{mro::get_linear_isa($mod)};
 
@@ -115,15 +114,14 @@ for my $mod (@modules) {
       # 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;
+      my ($origin, $cv_name) = get_subname($all_method_like{$name});
 
-      is ($gv->NAME, $name, "Properly named $name method at $origin" . ($origin eq $mod
+      is ($cv_name, $name, "Properly named $name method at $origin" . ($origin eq $mod
         ? ''
         : " (inherited by $mod)"
       ));
 
-      next if $seen->{"${origin}:${name}"}++;
+      next if $seen->{"${origin}::${name}"}++;
 
       if ($origin eq $mod) {
         pass ("$name is a native $mod method");
@@ -146,6 +144,9 @@ for my $mod (@modules) {
         # exception time
         if (
           ( $name eq 'import' and $via = 'Exporter' )
+            or
+          # jesus christ nobody had any idea how to design an interface back then
+          ( $name =~ /_trigger/ and $via = 'Class::Trigger' )
         ) {
           pass("${mod}::${name} is a valid uncleaned import from ${name}");
         }
@@ -184,9 +185,11 @@ sub find_modules {
   find( {
     wanted => sub {
       -f $_ or return;
+      $_ =~ m|lib/DBIx/Class/_TempExtlib| and return;
       s/\.pm$// or return;
       s/^ (?: lib | blib . (?:lib|arch) ) . //x;
-      push @modules, join ('::', File::Spec->splitdir($_));
+      s/[\/\\]/::/g;
+      push @modules, ( $_ =~ /(.+)/ );
     },
     no_chdir => 1,
   }, (