X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi-t%2F21-iterator.t;h=d5244236bbcdab175990f6d52e3bef7fe0b01775;hb=2d7a4e4642b546553e33e6b780228258279594a7;hp=d029bab73281ecde243641e39c9a1a8b280ab5f1;hpb=525035fb51a62462fc675dcb2f25900dcb46f412;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/cdbi-t/21-iterator.t b/t/cdbi-t/21-iterator.t
index d029bab..d524423 100644
--- a/t/cdbi-t/21-iterator.t
+++ b/t/cdbi-t/21-iterator.t
@@ -2,14 +2,19 @@ use strict;
 use Test::More;
 
 BEGIN {
-	eval "use DBD::SQLite";
-	plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 33);
+  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 => 37);
 }
 
 use lib 't/testlib';
 use Film;
 
-my $it_class = "DBIx::Class::Cursor";
+my $it_class = "DBIx::Class::ResultSet";
 
 my @film  = (
 	Film->create({ Title => 'Film 1' }),
@@ -44,8 +49,6 @@ my @film  = (
 	is $it->next->title, "Film 2", "And 2 is still next";
 }
 
-SKIP: {
-  #skip "Iterator doesn't yet have slice support", 19;
 
 {
 	my $it = Film->retrieve_all;
@@ -80,4 +83,14 @@ SKIP: {
 	is $it->next->title, "Film 2", "And 2 is still next";
 }
 
-} # End SKIP
+{
+  my $it = Film->retrieve_all;
+  is $it, $it->count, "iterator returns count as a scalar";
+  ok $it, "iterator returns true when there are results";
+}
+
+{
+  my $it = Film->search( Title => "something which does not exist" );
+  is $it, 0;
+  ok !$it, "iterator returns false when no results";
+}