X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi-t%2F02-Film.t;h=d303f35e3482e67d015e6bad7bf4f2b3b5e9ebcf;hb=e9188247f020a63ab8b6280c9dcdcb0df5b5f0c1;hp=ca0a00448a39e44eea92e400985d0f9fb61d99cc;hpb=8b445e337a0dbacf4ccb827211002f8d691ad671;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi-t/02-Film.t b/t/cdbi-t/02-Film.t
index ca0a004..d303f35 100644
--- a/t/cdbi-t/02-Film.t
+++ b/t/cdbi-t/02-Film.t
@@ -3,8 +3,13 @@ use Test::More;
 $| = 1;
 
 BEGIN {
-	eval "use DBD::SQLite";
-	plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 95);
+  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 => 96);
 }
 
 INIT {
@@ -28,7 +33,8 @@ is(Film->__driver, "SQLite", "Driver set correctly");
 
 {
 	eval { my $id = Film->title };
-	like $@, qr/class method/, "Can't get title with no object";
+	#like $@, qr/class method/, "Can't get title with no object";
+	ok $@, "Can't get title with no object";
 } 
 
 eval { my $duh = Film->create; };
@@ -80,6 +86,9 @@ $gone->update;
 	cmp_ok(@films, '==', 2, "We have 2 films in total");
 }
 
+# EXTRA TEST: added by mst to check a bug found by Numa
+cmp_ok(Film->count_all, '==', 2, "count_all confirms 2 films");
+
 my $gone_copy = Film->retrieve('Gone With The Wind');
 ok($gone->NumExplodingSheep == 5, 'update()');
 ok($gone->Rating eq 'NC-17', 'update() again');
@@ -223,15 +232,15 @@ is($btaste->Director, 'Lenny Bruce', 'set new Director');
 $btaste->discard_changes;
 is($btaste->Director, $orig_director, 'discard_changes()');
 
-{
+SKIP: {
+	skip "ActiveState perl produces additional warnings", 3
+          if ($^O eq 'MSWin32');
+
 	Film->autoupdate(1);
 	my $btaste2 = Film->retrieve($btaste->id);
 	$btaste->NumExplodingSheep(18);
 	my @warnings;
-	local $SIG{__WARN__} = sub {
-          unless ($_[0] =~ m/ContextualFetch/) {
-            push(@warnings, @_);
-          } };
+	local $SIG{__WARN__} = sub { push(@warnings, @_); };
 	{
 
 		# unhook from live object cache, so next one is not from cache
@@ -243,7 +252,6 @@ is($btaste->Director, $orig_director, 'discard_changes()');
 		$btaste3->NumExplodingSheep(13);
 	}
 	is @warnings, 1, "DESTROY without update warns";
-print join("\n", @warnings);
 	Film->autoupdate(0);
 }