X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi%2Fcolumns_as_hashes.t;h=9731ae37069932f1a67e7bd9faefc44c5e04249d;hb=83eef5621cc3a7b77a280b4b01f1175e9935fff6;hp=5e2d83c8e7b67acae8e40a87ff8a47d6b9b75e7c;hpb=8273e845426f0187b4ad6c4a1b42286fa09a648f;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi/columns_as_hashes.t b/t/cdbi/columns_as_hashes.t
index 5e2d83c..9731ae3 100644
--- a/t/cdbi/columns_as_hashes.t
+++ b/t/cdbi/columns_as_hashes.t
@@ -1,12 +1,11 @@
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'cdbicompat';
+
 use strict;
+use warnings;
+
 use Test::More;
 use Test::Warn;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@" if $@;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -90,11 +89,8 @@ warning_is {
 
 # Emulate that Class::DBI inflates immediately
 SKIP: {
-    unless (eval { require MyFoo }) {
-      my ($err) = $@ =~ /([^\n]+)/;
-      skip $err, 3
-    }
-
+    DBIx::Class::Optional::Dependencies->skip_without([qw( Date::Simple>=3.03 test_rdbms_mysql )]);
+    require MyFoo;
     my $foo = MyFoo->insert({
         name    => 'Whatever',
         tdate   => '1949-02-01',