X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F30dbicplain.t;h=736380eca6f29f87b559937699cadfefbfbdb695;hb=1f870d5a08fa1794734380d7c8bd6753cdcf8f6d;hp=9379e1ca9cd294b8a812df4c34d3f864fe976f59;hpb=f54428abf9cc7d7e5604745335694eaf558f6820;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/30dbicplain.t b/t/30dbicplain.t
index 9379e1c..736380e 100644
--- a/t/30dbicplain.t
+++ b/t/30dbicplain.t
@@ -1,19 +1,18 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Warn;
 
 use lib qw(t/lib);
 
-plan tests => 3;
+warnings_like { require DBICTest::Plain }
+  [
+    qr/compose_connection deprecated as of 0\.08000/,
+    qr/\QDBIx::Class::ResultSetProxy is DEPRECATED/,
+  ],
+  'no unexpected warnings'
+;
 
-my @warnings;
-
-{
-  local $SIG{__WARN__} = sub { push(@warnings, $_[0]); };
-  require DBICTest::Plain;
-}
-
-like($warnings[0], qr/compose_connection deprecated as of 0\.08000/,
-      'deprecation warning emitted ok');
-cmp_ok(@warnings, '==', 1, 'no unexpected warnings');
 cmp_ok(DBICTest::Plain->resultset('Test')->count, '>', 0, 'count is valid');
+
+done_testing;
\ No newline at end of file