X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F24loader_subclass.t;h=2d3b595283cd844114e65dfafeccb5b6bd09fcfc;hb=b32f8189f71d9a756c645c7288f74d4f9f61b74d;hp=66d24df9c685e61d189caf3f024a696adebb3cab;hpb=8b7749d600f77eea279318a0df10a8aaa9fab66b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/24loader_subclass.t b/t/24loader_subclass.t index 66d24df..2d3b595 100644 --- a/t/24loader_subclass.t +++ b/t/24loader_subclass.t @@ -4,14 +4,17 @@ use Test::More; use lib qw(t/lib); use make_dbictest_db; -my %loader_class = ( 'TestLoaderSubclass' => 'TestLoaderSubclass', - '::DBI::SQLite' => 'DBIx::Class::Schema::Loader::DBI::SQLite' - ); +my %loader_class = ( + 'TestLoaderSubclass' => 'TestLoaderSubclass', + 'TestLoaderSubclass_NoRebless' => 'TestLoaderSubclass_NoRebless', + '::DBI::SQLite' => 'DBIx::Class::Schema::Loader::DBI::SQLite' +); my %invocations = ( loader_class => sub { package DBICTest::Schema::1; use base qw/ DBIx::Class::Schema::Loader /; + __PACKAGE__->_loader_invoked(0); __PACKAGE__->naming('current'); __PACKAGE__->loader_class(shift); __PACKAGE__->connect($make_dbictest_db::dsn); @@ -19,6 +22,7 @@ my %invocations = ( connect_info => sub { package DBICTeset::Schema::2; use base qw/ DBIx::Class::Schema::Loader /; + __PACKAGE__->_loader_invoked(0); __PACKAGE__->naming('current'); __PACKAGE__->connect($make_dbictest_db::dsn, { loader_class => shift }); }, @@ -39,6 +43,6 @@ while (my ($style,$subref) = each %invocations) { while (my ($arg, $class) = each %loader_class) { my $schema = $subref->($arg); $schema = $schema->clone unless ref $schema; - isa_ok($schema->_loader, $class, "$style($arg)"); + isa_ok($schema->loader, $class, "$style($arg)"); } }