From: Peter Rabbitson Date: Sun, 29 Mar 2009 08:49:32 +0000 (+0000) Subject: detabify X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=624e2bc24f18d1bab9efc2c7ea2934a325439ee2;p=dbsrgits%2FDBIx-Class-Historic.git detabify --- diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t index 3f037a8..fbd723b 100644 --- a/t/39load_namespaces_rt41083.t +++ b/t/39load_namespaces_rt41083.t @@ -6,7 +6,7 @@ use Test::More; use lib 't/lib'; -plan tests => 6; +plan tests => 8; sub _chk_warning { defined $_[0]? @@ -19,33 +19,48 @@ sub _chk_extra_sources_warning { defined $_[0]? $_[0] !~ /$p/ : 1; } -my $warnings; -eval { - local $SIG{__WARN__} = sub { $warnings .= shift }; - package DBICNSTest::RtBug41083; - use base 'DBIx::Class::Schema'; - __PACKAGE__->load_namespaces( - result_namespace => 'Schema_A', - resultset_namespace => 'ResultSet_A', - default_resultset_class => 'ResultSet' - ); -}; -ok(!$@) or diag $@; -ok(_chk_warning($warnings), 'expected no resultset complaint'); -ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings); -undef $warnings; - -eval { - local $SIG{__WARN__} = sub { $warnings .= shift }; - package DBICNSTest::RtBug41083; - use base 'DBIx::Class::Schema'; - __PACKAGE__->load_namespaces( - result_namespace => 'Schema', - resultset_namespace => 'ResultSet', - default_resultset_class => 'ResultSet' - ); -}; -ok(!$@) or diag $@; -ok(_chk_warning($warnings), 'expected no resultset complaint') or diag $warnings; -ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings); -undef $warnings; +{ + my $warnings; + eval { + local $SIG{__WARN__} = sub { $warnings .= shift }; + package DBICNSTest::RtBug41083; + use base 'DBIx::Class::Schema'; + __PACKAGE__->load_namespaces( + result_namespace => 'Schema_A', + resultset_namespace => 'ResultSet_A', + default_resultset_class => 'ResultSet' + ); + }; + + ok(!$@) or diag $@; + ok(_chk_warning($warnings), 'expected no resultset complaint'); + ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings); +} + +is_deeply ( + [ DBICNSTest::RtBug41083->sources ], + [qw/ /], +); + +{ + my $warnings; + eval { + local $SIG{__WARN__} = sub { $warnings .= shift }; + package DBICNSTest::RtBug41083; + use base 'DBIx::Class::Schema'; + __PACKAGE__->load_namespaces( + result_namespace => 'Schema', + resultset_namespace => 'ResultSet', + default_resultset_class => 'ResultSet' + ); + }; + ok(!$@) or diag $@; + ok(_chk_warning($warnings), 'expected no resultset complaint') or diag $warnings; + ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings); +} + +is_deeply ( + [ DBICNSTest::RtBug41083->sources ], + [qw/ /], +); +