Reorganize CDBICompat tests - centralize prereq checks in one place

[dbsrgits/DBIx-Class.git] / t / cdbi / DeepAbstractSearch / 01_search.t

diff --git a/t/cdbi/DeepAbstractSearch/01_search.t b/t/cdbi/DeepAbstractSearch/01_search.t
old mode 100755 (executable)
new mode 100644 (file)
index 3db333e..7346138
--- a/t/cdbi/DeepAbstractSearch/01_search.t
+++ b/t/cdbi/DeepAbstractSearch/01_search.t
@@ -1,24 +1,19 @@
 use strict;
 use Test::More;
 
+use lib 't/cdbi/testlib';
+use DBIC::Test::SQLite (); # this will issue the necessary SKIPs on missing reqs
+
 BEGIN {
-    eval "use DBIx::Class::CDBICompat;";
-    if ($@) {
-        plan (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@");
-        next;
-    }
-
-    plan skip_all => 'needs DBD::SQLite for testing'
-        unless eval { require DBD::SQLite };
-    
-    plan skip_all => 'needs Class::DBI::Plugin::DeepAbstractSearch'
-        unless eval { require Class::DBI::Plugin::DeepAbstractSearch };
-    
-    plan tests => 19;
+  eval { require Class::DBI::Plugin::DeepAbstractSearch }
+    or plan skip_all => 'Class::DBI::Plugin::DeepAbstractSearch required for this test';
 }
 
-my $DB  = "t/var/cdbi_testdb";
-unlink $DB if -e $DB;
+my $DB = DBICTest->_sqlite_dbname(sqlite_use_file => 1);;
+
+# not usre why this test needs an AutoCommit => 0 and a commit further
+# down - EDONOTCARE
+$ENV{DBIC_UNSAFE_AUTOCOMMIT_OK} = 1;
 
 my @DSN = ("dbi:SQLite:dbname=$DB", '', '', { AutoCommit => 0 });
 
@@ -297,5 +292,7 @@ package main;
             "CDs from Sony or Supraphon";
 }
 
+done_testing;
+
 END { unlink $DB if -e $DB }