Merge branch 'master' into topic/constructor_rewrite

[dbsrgits/DBIx-Class.git] / t / cdbi / set_vs_DateTime.t

diff --git a/t/cdbi/set_vs_DateTime.t b/t/cdbi/set_vs_DateTime.t
index 7dd17ce..72d69af 100644 (file)
--- a/t/cdbi/set_vs_DateTime.t
+++ b/t/cdbi/set_vs_DateTime.t
@@ -2,18 +2,18 @@ use strict;
 use Test::More;
 use Test::Exception;
 
+use lib 't/cdbi/testlib';
+use DBIC::Test::SQLite (); # this will issue the necessary SKIPs on missing reqs
+
 BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@"
-    if $@;
-  plan skip_all => "DateTime required" unless eval { require DateTime };
-  plan tests => 1;
+  eval { require DateTime; DateTime->VERSION(0.55) }
+    or plan skip_all => 'DateTime 0.55 required for this test';
 }
 
 {
     package Thing;
 
-    use base 'DBIx::Class::Test::SQLite';
+    use base 'DBIC::Test::SQLite';
 
     Thing->columns(All  => qw[thing_id this that date]);
 }
@@ -25,6 +25,6 @@ lives_ok {
   $thing->set( date => $date );
 };
 
-
-
 $thing->discard_changes;
+
+done_testing;