From: Peter Rabbitson Date: Sun, 5 Jun 2016 10:00:43 +0000 (+0200) Subject: Base more tests on DBICTest::BaseSchema (needed further up) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a0216b74a2adae244ebc89beef5df673e0bb79a3;p=dbsrgits%2FDBIx-Class.git Base more tests on DBICTest::BaseSchema (needed further up) --- diff --git a/t/102load_classes.t b/t/102load_classes.t index ef99b3a..d391b34 100644 --- a/t/102load_classes.t +++ b/t/102load_classes.t @@ -11,7 +11,7 @@ my $warnings; eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICTest::Schema; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_classes; }; ok(!$@, 'Loaded all loadable classes') or diag $@; diff --git a/t/39load_namespaces_1.t b/t/39load_namespaces_1.t index c6355a7..f7fb08e 100644 --- a/t/39load_namespaces_1.t +++ b/t/39load_namespaces_1.t @@ -11,7 +11,7 @@ my $warnings; eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICNSTest; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_namespaces; }; ok(!$@, 'load_namespaces doesnt die') or diag $@; diff --git a/t/39load_namespaces_2.t b/t/39load_namespaces_2.t index e38dfd5..1e73c7f 100644 --- a/t/39load_namespaces_2.t +++ b/t/39load_namespaces_2.t @@ -13,7 +13,7 @@ my $warnings; eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICNSTest; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_namespaces( result_namespace => 'Rslt', resultset_namespace => 'RSet', diff --git a/t/39load_namespaces_3.t b/t/39load_namespaces_3.t index 144feb6..1b63baa 100644 --- a/t/39load_namespaces_3.t +++ b/t/39load_namespaces_3.t @@ -12,7 +12,7 @@ use DBICTest; # do not remove even though it is not used lives_ok (sub { warnings_exist ( sub { package DBICNSTestOther; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_namespaces( result_namespace => [ '+DBICNSTest::Rslt', '+DBICNSTest::OtherRslt' ], resultset_namespace => '+DBICNSTest::RSet', diff --git a/t/39load_namespaces_4.t b/t/39load_namespaces_4.t index d0e82ed..789ed50 100644 --- a/t/39load_namespaces_4.t +++ b/t/39load_namespaces_4.t @@ -13,7 +13,7 @@ my $warnings; eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICNSTest; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_namespaces( default_resultset_class => 'RSBase' ); }; ok(!$@) or diag $@; diff --git a/t/39load_namespaces_exception.t b/t/39load_namespaces_exception.t index e0d65ec..14bf342 100644 --- a/t/39load_namespaces_exception.t +++ b/t/39load_namespaces_exception.t @@ -11,7 +11,7 @@ plan tests => 1; eval { package DBICNSTest; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; __PACKAGE__->load_namespaces( result_namespace => 'Bogus', resultset_namespace => 'RSet', diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t index 0e33420..f59d597 100644 --- a/t/39load_namespaces_rt41083.t +++ b/t/39load_namespaces_rt41083.t @@ -32,7 +32,7 @@ sub _verify_sources { eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICNSTest::RtBug41083; - use base 'DBIx::Class::Schema'; + use base 'DBICTest::BaseSchema'; __PACKAGE__->load_namespaces( result_namespace => 'Result_A', resultset_namespace => 'ResultSet_A', @@ -52,7 +52,7 @@ sub _verify_sources { eval { local $SIG{__WARN__} = sub { $warnings .= shift }; package DBICNSTest::RtBug41083; - use base 'DBIx::Class::Schema'; + use base 'DBICTest::BaseSchema'; __PACKAGE__->load_namespaces( default_resultset_class => 'ResultSet' ); diff --git a/t/39load_namespaces_stress.t b/t/39load_namespaces_stress.t index ff64dbf..bfef360 100644 --- a/t/39load_namespaces_stress.t +++ b/t/39load_namespaces_stress.t @@ -27,7 +27,7 @@ EOM { package DBICTest::NS::Stress::Schema; - use base qw/DBIx::Class::Schema/; + use base qw/DBICTest::BaseSchema/; sub _findallmod { return $_[1] eq ( __PACKAGE__ . '::Result' ) diff --git a/t/row/inflate_result.t b/t/row/inflate_result.t index f2f6b80..9fa49ac 100644 --- a/t/row/inflate_result.t +++ b/t/row/inflate_result.t @@ -60,7 +60,7 @@ sub do_admin_stuff { package My::Schema; -use base qw/DBIx::Class::Schema/; +use base qw/DBICTest::BaseSchema/; My::Schema->register_class( Admin => 'My::Schema::Result::User::Admin' ); My::Schema->register_class( User => 'My::Schema::Result::User' );