Reorganize CDBICompat tests - centralize prereq checks in one place

[dbsrgits/DBIx-Class.git] / t / cdbi / 22-deflate_order.t

diff --git a/t/cdbi/22-deflate_order.t b/t/cdbi/22-deflate_order.t
index 5267ae0..a318850 100644 (file)
--- a/t/cdbi/22-deflate_order.t
+++ b/t/cdbi/22-deflate_order.t
@@ -3,20 +3,13 @@ use strict;
 
 use Test::More;
 
-eval "use DBIx::Class::CDBICompat;";
-if ($@) {
-    plan (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@");
-    next;
-}
-
-eval { require Time::Piece::MySQL };
-plan skip_all => "Need Time::Piece::MySQL for this test" if $@;
-
 use lib 't/cdbi/testlib';
-eval { require 't/cdbi/testlib/Log.pm' };
-plan skip_all => "Need MySQL for this test" if $@;
+use DBIC::Test::SQLite (); # this will issue the necessary SKIPs on missing reqs
+
+eval { require Time::Piece::MySQL }
+  or plan skip_all => 'Time::Piece::MySQL required for this test';
 
-plan tests => 2;
+use_ok ('Log');
 
 package main;
 
@@ -29,3 +22,4 @@ $log->update;
 ok eval { $log->datetime_stamp }, "Have datetime after update";
 diag $@ if $@;
 
+done_testing;