From f19307b54cfeb023d02231d7f7a05b65a67808b1 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Wed, 6 Oct 2010 09:44:18 -0400
Subject: [PATCH] fix test plan for SQLHelper.t

Also removed incorrect comments about test case numbers - we should
just let Test::More number them.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 t/db_dependent/SQLHelper.t | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/t/db_dependent/SQLHelper.t b/t/db_dependent/SQLHelper.t
index 80c447882e..f7833938a2 100755
--- a/t/db_dependent/SQLHelper.t
+++ b/t/db_dependent/SQLHelper.t
@@ -10,12 +10,10 @@ use YAML;
 use C4::Debug;
 use C4::SQLHelper qw(:all);
 
-use Test::More tests => 19;
+use Test::More tests => 20;
+
+use_ok('C4::SQLHelper');
 
-#1
-BEGIN {
-    use_ok('C4::SQLHelper');
-}
 use C4::Category;
 use C4::Branch;
 my @categories=C4::Category->all;
@@ -28,24 +26,17 @@ ok($borrid=InsertInTable("borrowers",{firstname=>"Jean",surname=>"Valjean",city=
 $borrtmp=InsertInTable("borrowers",{firstname=>"Jean",surname=>"cocteau",city=>" ",zipcode=>" ",email=>"email",categorycode=>$categories[0]->{categorycode}, branchcode=>$branchcodes[0]});
 ok(my $status=UpdateInTable("borrowers",{borrowernumber=>$borrid,firstname=>"Jean",surname=>"Valjean",city=>"Dampierre",zipcode=>" ",email=>"email", branchcode=>$branchcodes[1]}),"Update In Table");
 my $borrowers=SearchInTable("borrowers");
-#4
 ok(@$borrowers>0, "Search In Table All values");
 $borrowers=SearchInTable("borrowers",{borrowernumber=>$borrid});
-#5
 ok(@$borrowers==1, "Search In Table by primary key on table");
 $borrowers=SearchInTable("borrowers",{firstname=>"Jean"});
-#6
 ok(@$borrowers>0, "Search In Table hashref");
 $borrowers=SearchInTable("borrowers",{firstname=>"Jean"},[{firstname=>1},{borrowernumber=>1}],undef, [qw(borrowernumber)]);
-#7
 ok(($$borrowers[0]{borrowernumber} + 0) > ($$borrowers[1]{borrowernumber} + 0), "Search In Table Order");
 $borrowers=SearchInTable("borrowers",{firstname=>"Jean"},[{surname=>0},{firstname=>1}], undef, [qw(firstname surname)]);
-#8
 ok(uc($$borrowers[0]{surname}) lt uc($$borrowers[1]{surname}), "Search In Table Order");
 $borrowers=SearchInTable("borrowers","Jean");
-#9
 ok(@$borrowers>0, "Search In Table string");
-#10
 #FIXME : When searching on All the fields of the table, seems to return Junk
 eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,[qw(firstname surname borrowernumber cardnumber)],"start_with")};
 #eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,undef,"start_with")};
@@ -54,31 +45,22 @@ eval{$borrowers=SearchInTable("borrowers","Jean Valjean",undef,undef,undef,[qw(f
 $debug && warn Dump(@$borrowers);
 ok(scalar(@$borrowers)==1 && !($@), "Search In Table does an implicit AND of all the words in strings");
 $borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}]);
-#11
 ok(@$borrowers>0, "Search In Table arrayref");
 $borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)]);
-#12
 ok(keys %{$$borrowers[0]} ==1, "Search In Table columns out limit");
 $borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname surname title)]);
-#13
 ok(@$borrowers>0, "Search In Table columns out limit to borrowernumber AND filter firstname surname title");
 $borrowers=SearchInTable("borrowers",["Valjean",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname title)]);
-#14
 ok(@$borrowers==0, "Search In Table columns filter firstname title limit Valjean not in other fields than surname ");
 $borrowers=SearchInTable("borrowers",["Val",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(surname)],"start_with");
-#15
 ok(@$borrowers>0, "Search In Table columns filter surname  Val on a wide search found ");
 $borrowers=SearchInTable("borrowers",["Val",{firstname=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(surname)],"exact");
-#16
 ok(@$borrowers==0, "Search In Table columns filter surname  Val in exact search not found ");
 $borrowers=eval{SearchInTable("borrowers",["Val",{member=>"Jean"}],undef,undef,[qw(borrowernumber)],[qw(firstname title)],"exact")};
-#17
 ok(@$borrowers==0 && !($@), "Search In Table fails gracefully when no correct field passed in hash");
-#18
 $borrowers=eval{SearchInTable("borrowers",["Jea"],undef,undef,undef,[qw(firstname surname borrowernumber)],"start_with")};
 ok(@$borrowers>0 && !($@), "Search on simple value in firstname");
 
 $status=DeleteInTable("borrowers",{borrowernumber=>$borrid});
-#19
 ok($status>0 && !($@), "DeleteInTable OK");
 $status=DeleteInTable("borrowers",{borrowernumber=>$borrtmp});
-- 
2.39.2