X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05components.t;h=459524008b6dbd68932dbfe3ba1c2ec58c32dfe2;hb=f54428abf9cc7d7e5604745335694eaf558f6820;hp=303f0285876b693ec573c927a8aa52f8f3c91112;hpb=fe0e9f6788cd319d430b447d31912f739097705e;p=dbsrgits%2FDBIx-Class.git diff --git a/t/05components.t b/t/05components.t index 303f028..4595240 100644 --- a/t/05components.t +++ b/t/05components.t @@ -1,5 +1,3 @@ -#!/usr/bin/perl - use strict; use warnings; use Test::More; @@ -7,8 +5,6 @@ use Test::More; use lib qw(t/lib); use DBICTest::ForeignComponent; -plan tests => 6; - # Tests if foreign component was loaded by calling foreign's method ok( DBICTest::ForeignComponent->foreign_test_method, 'foreign component' ); @@ -35,32 +31,7 @@ is_deeply( \@DBICTest::_InjectBaseTest::ISA, 'inject_base filters duplicates' ); -# Test for a warning with incorrect order in load_components -my @warnings = (); -{ - package A::Test; - our @ISA = 'DBIx::Class'; - { - local $SIG{__WARN__} = sub { push @warnings, shift}; - __PACKAGE__->load_components(qw(Core UTF8Columns)); - } -} -like( $warnings[0], qr/Core loaded before UTF8Columns/, - 'warning issued for incorrect order in load_components()' ); -is( scalar @warnings, 1, - 'only one warning issued for incorrect load_components call' ); - -# Test that no warning is issued for the correct order in load_components -{ - @warnings = (); - package B::Test; - our @ISA = 'DBIx::Class'; - { - local $SIG{__WARN__} = sub { push @warnings, shift }; - __PACKAGE__->load_components(qw(UTF8Columns Core)); - } -} -is( scalar @warnings, 0, - 'warning not issued for correct order in load_components()' ); - use_ok('DBIx::Class::AccessorGroup'); +use_ok('DBIx::Class::Componentised'); + +done_testing;