fix for key => [] + tests + cleanup of 02where.t

[scpubgit/Q-Branch.git] / t / 05quotes.t

diff --git a/t/05quotes.t b/t/05quotes.t
index 105ee94..361038f 100644 (file)
--- a/t/05quotes.t
+++ b/t/05quotes.t
@@ -3,19 +3,13 @@ use warnings;
 
 use vars qw($TESTING);
 $TESTING = 1;
-use Test;
+use Test::More;
 
 # use a BEGIN block so we print our plan before SQL::Abstract is loaded
-BEGIN { plan tests => 4 }
+BEGIN { plan tests => 7 }
 
 use SQL::Abstract;
 
-sub is {
-    my ($got, $expect, $msg) = @_;
-    ok($got eq $expect) or
-        warn "got [${got}]\ninstead of [${expect}]\nfor test ${msg}\n\n";
-}
-
 my $sql_maker = SQL::Abstract->new;
 
 $sql_maker->{quote_char} = '`';
@@ -55,33 +49,34 @@ is($sql,
    q/SELECT COUNT( * ) FROM `cd` `me`  JOIN `artist` `artist` ON ( `artist`.`artistid` = `me`.`artist` ) WHERE ( `artist`.`name` = ? AND `me`.`year` = ? )/, 
    'got correct SQL for count query with quoting');
 
+
 ($sql,) = $sql_maker->select(
-          [
-            {
-              'me' => 'cd'
-            }
-          ],
-          [
-            'me.cdid',
-            'me.artist',
-            'me.title',
-            'me.year'
-          ],
-          undef,
-          [
-            'year DESC'
-          ],
-          undef,
-          undef
+      [
+        {
+          'me' => 'cd'
+        }
+      ],
+      [
+        'me.cdid',
+        'me.artist',
+        'me.title',
+        'me.year'
+      ],
+      undef,
+      [
+        { -desc => 'year' }
+      ],
+      undef,
+      undef
 );
 
-#TODO: {
-#    local $TODO = "order_by with quoting needs fixing (ash/castaway)";
-#
-#    is($sql, 
-#       q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC/, 
-#       'quoted ORDER BY with DESC okay');
-#}
+
+
+
+is($sql, 
+   q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC/, 
+   'quoted ORDER BY with DESC okay');
+
 
 ($sql,) = $sql_maker->select(
       [