X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fhelper%2Fcsv.t;h=63fc858c95d5cb3b8640d6b7fb34ffbf53f7542c;hb=e3d226231a8cec1c598cf7fbef6710672cd2b6bf;hp=e4a625430b6ce836ed06eebc7469716a7cb840c5;hpb=7d9888e3edac66a713dceae3e0bab34e788c039c;p=kivitendo-erp.git

diff --git a/t/helper/csv.t b/t/helper/csv.t
index e4a625430..63fc858c9 100644
--- a/t/helper/csv.t
+++ b/t/helper/csv.t
@@ -1,37 +1,36 @@
-use Test::More tests => 39;
-use SL::Dispatcher;
+use Test::More tests => 41;
+
+use lib 't';
+
 use Data::Dumper;
 use utf8;
 
+use_ok 'Support::TestSetup';
 use_ok 'SL::Helper::Csv';
-my $csv;
 
-$csv = SL::Helper::Csv->new(
+Support::TestSetup::login();
+
+my $csv = SL::Helper::Csv->new(
   file   => \"Kaffee\n",
   header => [ 'description' ],
+  class  => 'SL::DB::Part',
 );
 
-isa_ok $csv->_csv, 'Text::CSV';
+isa_ok $csv->_csv, 'Text::CSV_XS';
 isa_ok $csv->_io, 'IO::File';
 isa_ok $csv->parse, 'SL::Helper::Csv', 'parsing returns self';
 is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'simple case works';
 
-$csv->class('SL::DB::Part');
-
 is $csv->get_objects->[0]->description, 'Kaffee', 'get_object works';
 ####
 
-SL::Dispatcher::pre_startup_setup();
-
-$::form = Form->new;
 $::myconfig{numberformat} = '1.000,00';
 $::myconfig{dateformat} = 'dd.mm.yyyy';
-$::locale = Locale->new('de');
 
 $csv = SL::Helper::Csv->new(
   file   => \"Kaffee;0.12;12,2;1,5234\n",
   header => [ 'description', 'sellprice', 'lastcost_as_number', 'listprice' ],
-  dispatch => { listprice => 'listprice_as_number' },
+  profile => { listprice => 'listprice_as_number' },
   class  => 'SL::DB::Part',
 );
 $csv->parse;
@@ -50,7 +49,7 @@ Kaffee,0.12,'12,2','1,5234'
 EOL
   sep_char => ',',
   quote_char => "'",
-  dispatch => { listprice => 'listprice_as_number' },
+  profile => { listprice => 'listprice_as_number' },
   class  => 'SL::DB::Part',
 );
 $csv->parse;
@@ -202,7 +201,7 @@ $csv->parse;
 
 print Dumper($csv->errors);
 
-my @mm = $csv->get_objects->[0]->makemodel;
+@mm = $csv->get_objects->[0]->makemodel;
 is scalar @mm,  1, 'multiple one-to-many dispatch';
 is $csv->get_objects->[0]->makemodels->[0]->model, 'Chair 0815', '...check 1';
 is $csv->get_objects->[0]->makemodels->[0]->make, '213', '...check 2';
@@ -286,11 +285,21 @@ is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'case insensitive hea
 #####
 
 $csv = SL::Helper::Csv->new(
-  file   => \"Kaffee",
-  header => [ 'Description' ],
-  class  => 'SL::DB::Part',
+file   => \"Kaffee",
+header => [ 'Description' ],
+class  => 'SL::DB::Part',
 );
 $csv->parse;
 is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'case insensitive header as param works';
 
+#####
+
+$csv = SL::Helper::Csv->new(
+  file   => \"\x{FEFF}description\nKaffee",
+  class  => 'SL::DB::Part',
+  encoding => 'utf8',
+);
+$csv->parse;
+is_deeply $csv->get_data, [ { description => 'Kaffee' } ], 'utf8 BOM works (bug 1872)';
+
 # vim: ft=perl