Reverted accidental 'svk pull' from inside mirrored checkout.

[dbsrgits/DBIx-Class.git] / t / cdbi-t / 02-Film.t

diff --git a/t/cdbi-t/02-Film.t b/t/cdbi-t/02-Film.t
index b31ea5f..d303f35 100644 (file)
--- 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 => 96);
+  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; };
@@ -226,7 +232,10 @@ 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);
@@ -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);
 }