[Bast-commits] r4582 - in branches/DBIx-Class-Schema-Loader/current: . t/lib

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2008-07-16 17:46:52 +0100 (Wed, 16 Jul 2008)
New Revision: 4582

Modified:
   branches/DBIx-Class-Schema-Loader/current/Changes
   branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm
Log:
Handle ResultSetManager deprecation warning in common tests

Modified: branches/DBIx-Class-Schema-Loader/current/Changes
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Changes	2008-07-16 16:41:52 UTC (rev 4581)
+++ branches/DBIx-Class-Schema-Loader/current/Changes	2008-07-16 16:46:52 UTC (rev 4582)
@@ -8,6 +8,7 @@
           directory if the user didn't specify one
         - Fix Oracle constraint and auto-increment detection for non-owned schemas
           (RT #35732)
+	- Handle ResultSetManager deprecation warning in common tests
 
 0.04999_05 Mon Apr 14, 2008
         - Fix limiting table list to the specified schema for DB2

Modified: branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm	2008-07-16 16:41:52 UTC (rev 4581)
+++ branches/DBIx-Class-Schema-Loader/current/t/lib/dbixcsl_common_tests.pm	2008-07-16 16:46:52 UTC (rev 4582)
@@ -109,17 +109,22 @@
         };
 
         ok(!$@, "Loader initialization") or diag $@;
+
+       my $warn_count = 2;
+       $warn_count++ if grep /ResultSetManager/, @loader_warnings;
+
         if($self->{skip_rels}) {
             SKIP: {
-                is(scalar(@loader_warnings), 2, "No loader warnings")
+                is(scalar(@loader_warnings), $warn_count, "No loader warnings")
                     or diag @loader_warnings;
                 skip "No missing PK warnings without rels", 1;
             }
         }
         else {
-            is(scalar(@loader_warnings), 3, "Expected loader warning")
+	    $warn_count++;
+            is(scalar(@loader_warnings), $warn_count, "Expected loader warning")
                 or diag @loader_warnings;
-            like($loader_warnings[0], qr/loader_test9 has no primary key/i,
+            is(grep(/loader_test9 has no primary key/, @loader_warnings), 1,
                  "Missing PK warning");
         }
     }