use Test::More;
+use lib 't/lib';
+use DBICTest;
+
use File::Find;
use File::Spec;
use B qw/svref_2object/;
use DBIx::Class::Carp;
my @modules = grep {
- my $mod = $_;
+ my ($mod) = $_ =~ /(.+)/;
# not all modules are loadable at all times
do {
# from the parent
'DBIx::Class::ResultSet::Pager',
- # Moo does not name its generated methods, fix pending
- 'DBIx::Class::Storage::BlockRunner',
+ # 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
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);
}
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}"}++;
}
}
- 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)) {