Check for Module::Find as well..

[dbsrgits/DBIx-Class.git] / t / cdbi-t / 12-filter.t

diff --git a/t/cdbi-t/12-filter.t b/t/cdbi-t/12-filter.t
index bce6e6f..c161602 100644 (file)
--- a/t/cdbi-t/12-filter.t
+++ b/t/cdbi-t/12-filter.t
@@ -2,8 +2,13 @@ use strict;
 use Test::More;
 
 BEGIN {
-       eval "use DBD::SQLite";
-       plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 50);
+  eval "use DBIx::Class::CDBICompat;";
+  if ($@) {
+    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
+    next;
+  }
+  eval "use DBD::SQLite";
+  plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 50);
 }
 
 use lib 't/testlib';
@@ -93,7 +98,7 @@ is $@, '', "No errors";
 # Iterators
 #----------------------------------------------------------------------
 
-my $it_class = 'DBIx::Class::Cursor';
+my $it_class = 'DBIx::Class::ResultSet';
 
 sub test_normal_iterator {
        my $it = $film->actors;
@@ -125,7 +130,7 @@ test_normal_iterator;
 test_normal_iterator;
 
 SKIP: {
-  skip "dbic iterators don't support slice yet", 12;
+  #skip "dbic iterators don't support slice yet", 12;
 
 
 {
@@ -149,7 +154,9 @@ SKIP: {
 
 package Class::DBI::My::Iterator;
 
-use base 'Class::DBI::Iterator';
+use vars qw/@ISA/;
+
+@ISA = ($it_class);
 
 sub slice { qw/fred barney/ }