[Bast-commits] r5434 - in SQL-Abstract/1.x/branches/1.50_RC: . t

[norbi at dev.catalyst.perl.org]

Author: norbi
Date: 2009-02-09 21:29:41 +0000 (Mon, 09 Feb 2009)
New Revision: 5434

Modified:
   SQL-Abstract/1.x/branches/1.50_RC/
   SQL-Abstract/1.x/branches/1.50_RC/Makefile.PL
   SQL-Abstract/1.x/branches/1.50_RC/t/01generate.t
Log:
 r5536 at vger:  mendel | 2009-02-09 22:24:03 +0100
  * Added test for an expected warning.



Property changes on: SQL-Abstract/1.x/branches/1.50_RC
___________________________________________________________________
Name: svk:merge
   - 4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC:5505
4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC-extraparens:5308
   + 4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC:5536
4d5fae46-8e6a-4e08-abee-817e9fb894a2:/local/bast/SQL-Abstract/1.x/branches/1.50_RC-extraparens:5308

Modified: SQL-Abstract/1.x/branches/1.50_RC/Makefile.PL
===================================================================
--- SQL-Abstract/1.x/branches/1.50_RC/Makefile.PL	2009-02-09 21:21:13 UTC (rev 5433)
+++ SQL-Abstract/1.x/branches/1.50_RC/Makefile.PL	2009-02-09 21:29:41 UTC (rev 5434)
@@ -11,6 +11,7 @@
       "Test::Builder" => 0,
       "Test::More" => 0,
       "Test::Exception" => 0,
+      "Test::Warn" => 0,
       "Test::Deep" => 0,
       "Data::Dumper" => 0,
      }, # e.g., Module::Name => 1.1

Modified: SQL-Abstract/1.x/branches/1.50_RC/t/01generate.t
===================================================================
--- SQL-Abstract/1.x/branches/1.50_RC/t/01generate.t	2009-02-09 21:21:13 UTC (rev 5433)
+++ SQL-Abstract/1.x/branches/1.50_RC/t/01generate.t	2009-02-09 21:29:41 UTC (rev 5434)
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Warn;
 
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
@@ -367,29 +368,52 @@
               stmt   => 'INSERT INTO test (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)',
               stmt_q => 'INSERT INTO `test` (`a`, `b`, `c`, `d`, `e`) VALUES (?, ?, ?, ?, ?)',
               bind   => [qw/1 2 3 4/, { answer => 42}],
+              warning_like => qr/HASH ref as bind value in insert is not supported/i,
       },             
 );
 
 
-plan tests => scalar(@tests) * 2;
+plan tests => scalar(grep { !$_->{warning_like} } @tests) * 2
+            + scalar(grep { $_->{warning_like} } @tests) * 4;
 
 for (@tests) {
   local $"=', ';
 
   my $new = $_->{new} || {};
   $new->{debug} = $ENV{DEBUG} || 0;
-  my $sql = SQL::Abstract->new(%$new);
 
-  #print "testing with args (@{$_->{args}}): ";
-  my $func = $_->{func};
-  my($stmt, @bind) = $sql->$func(@{$_->{args}});
-  is_same_sql_bind($stmt, \@bind, $_->{stmt}, $_->{bind});
+  # test without quoting labels
+  {
+    my $sql = SQL::Abstract->new(%$new);
 
+    my $func = $_->{func};
+    my($stmt, @bind);
+    my $test = sub {
+      ($stmt, @bind) = $sql->$func(@{$_->{args}})
+    };
+    if ($_->{warning_like}) {
+      warning_like { &$test } $_->{warning_like}, "throws the expected warning ($_->{warning_like})";
+    } else {
+      &$test;
+    }
+    is_same_sql_bind($stmt, \@bind, $_->{stmt}, $_->{bind});
+  }
+
   # test with quoted labels
-  my $sql_q = SQL::Abstract->new(%$new, quote_char => '`', name_sep => '.');
+  {
+    my $sql_q = SQL::Abstract->new(%$new, quote_char => '`', name_sep => '.');
 
-  my $func_q = $_->{func};
-  my($stmt_q, @bind_q) = $sql_q->$func_q(@{$_->{args}});
+    my $func_q = $_->{func};
+    my($stmt_q, @bind_q);
+    my $test = sub {
+      ($stmt_q, @bind_q) = $sql_q->$func_q(@{$_->{args}})
+    };
+    if ($_->{warning_like}) {
+      warning_like { &$test } $_->{warning_like}, "throws the expected warning ($_->{warning_like})";
+    } else {
+      &$test;
+    }
 
-  is_same_sql_bind($stmt_q, \@bind_q, $_->{stmt_q}, $_->{bind});
+    is_same_sql_bind($stmt_q, \@bind_q, $_->{stmt_q}, $_->{bind});
+  }
 }