From: Gordon Irving Date: Fri, 15 Jan 2010 18:10:42 +0000 (+0000) Subject: remove Module::Load from test suite X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fd9c9ced46ee84ae55e368b479109c8e9a0da854;p=dbsrgits%2FDBIx-Class-Historic.git remove Module::Load from test suite --- diff --git a/t/admin/02ddl.t b/t/admin/02ddl.t index 22b6cf8..873f24d 100644 --- a/t/admin/02ddl.t +++ b/t/admin/02ddl.t @@ -23,16 +23,16 @@ use Test::Exception; BEGIN { + use FindBin qw($Bin); + use File::Spec::Functions qw(catdir); + use lib catdir($Bin,'..', '..','lib'); + use lib catdir($Bin,'..', 'lib'); + eval "use DBIx::Class::Admin"; plan skip_all => "Deps not installed: $@" if $@; } use Path::Class; -use FindBin qw($Bin); -use Module::Load; - -use lib dir($Bin,'..', '..','lib')->stringify; -use lib dir($Bin,'..', 'lib')->stringify; use ok 'DBIx::Class::Admin'; @@ -69,7 +69,7 @@ my @connect_info = DBICTest->_database( #); clean_dir($sql_dir); - load 'DBICVersionOrig'; + require DBICVersionOrig; my $admin = DBIx::Class::Admin->new( schema_class => 'DBICVersion::Schema', @@ -88,7 +88,7 @@ my @connect_info = DBICTest->_database( is($schema->get_db_version, $DBICVersion::Schema::VERSION, 'Schema deployed and versions match'); - load 'DBICVersionNew'; + require DBICVersionNew; $admin = DBIx::Class::Admin->new( schema_class => 'DBICVersion::Schema', diff --git a/t/admin/03data.t b/t/admin/03data.t index 02785af..b7f697d 100644 --- a/t/admin/03data.t +++ b/t/admin/03data.t @@ -23,15 +23,16 @@ use Test::Exception; use Test::Deep; BEGIN { + + use FindBin qw($Bin); + use File::Spec::Functions qw(catdir); + use lib catdir($Bin,'..', '..','lib'); + use lib catdir($Bin,'..', 'lib'); eval "use DBIx::Class::Admin"; plan skip_all => "Deps not installed: $@" if $@; } use Path::Class; -use FindBin qw($Bin); - -use lib dir($Bin,'..', '..','lib')->stringify; -use lib dir($Bin,'..', 'lib')->stringify; use ok 'DBIx::Class::Admin';