Index: openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl 25 Jul 2018 13:42:48 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/test/openacs-kernel-procs.tcl 3 Nov 2018 11:15:16 -0000 1.5 @@ -10,33 +10,33 @@ Test block execution for rows in a csv file. } { aa_run_with_teardown -test_code { - - # Create cvs file - set file_loc "/tmp/test.csv" - set file_id [open $file_loc w] - puts $file_id "first_name,last_name,instrument" - puts $file_id "Charles,Mingus,Bass" - puts $file_id "Miles,Davis,Trumpet" - puts $file_id "Jhon,Coltrane,Saxo" - puts $file_id "Charlie,Parker,Saxo" - puts $file_id "Thelonius,Monk,Piano" - close $file_id - - set csv_data "\nfirst_name,last_name,instrument\nCharles,Mingus,Bass\nMiles,Davis,Trumpet\nJhon,Coltrane,Saxo\nCharlie,Parker,Saxo\nThelonius,Monk,Piano" - aa_log "CSV file created with artists data:\n $csv_data" + # Create cvs file + set file_loc "/tmp/test.csv" + set file_id [open $file_loc w] + puts $file_id "first_name,last_name,instrument" + puts $file_id "Charles,Mingus,Bass" + puts $file_id "Miles,Davis,Trumpet" + puts $file_id "Jhon,Coltrane,Saxo" + puts $file_id "Charlie,Parker,Saxo" + puts $file_id "Thelonius,Monk,Piano" + close $file_id - set artist_list {} - oacs_util::csv_foreach -file $file_loc -array_name row { + set csv_data "\nfirst_name,last_name,instrument\nCharles,Mingus,Bass\nMiles,Davis,Trumpet\nJhon,Coltrane,Saxo\nCharlie,Parker,Saxo\nThelonius,Monk,Piano" + + aa_log "CSV file created with artists data:\n $csv_data" + + set artist_list {} + oacs_util::csv_foreach -file $file_loc -array_name row { lappend artist_list "$row(first_name) $row(last_name) - $row(instrument)" } - aa_equals "Getting artists from csv file" $artist_list {{Charles Mingus - Bass}\ + aa_equals "Getting artists from csv file" $artist_list {{Charles Mingus - Bass}\ {Miles Davis - Trumpet}\ {Jhon Coltrane - Saxo}\ {Charlie Parker - Saxo}\ {Thelonius Monk - Piano}} - } -teardown_code { - file delete -force -- $file_loc + } -teardown_code { + file delete -force -- $file_loc } } @@ -60,20 +60,20 @@ puts $file_id "cparker@foo.bar,Charlie,Parker" close $file_id - set csv_data "\nemail,first_names,last_name\ncmingus@foo.bar,Charles,Mingus\nmdavis@foo.bar,Miles,Davis\ncparker@foo.bar,Charlie,Parker" + set csv_data "\nemail,first_names,last_name\ncmingus@foo.bar,Charles,Mingus\nmdavis@foo.bar,Miles,Davis\ncparker@foo.bar,Charlie,Parker" aa_log "CSV file for \"person\" objects creation with data:\n $csv_data" - set person_ids [oacs_util::process_objects_csv -object_type "person" -file $file_loc] + set person_ids [oacs_util::process_objects_csv -object_type "person" -file $file_loc] - aa_log "Persons id's created: $person_ids" + aa_log "Persons id's created: $person_ids" - set person_list {} + set person_list {} - foreach person_id $person_ids { - array set person_array [person::get -person_id $person_id] - lappend person_list "$person_array(first_names) $person_array(last_name)" - } - aa_equals "Getting persons from database table \"persons\"" $person_list {{Charles Mingus}\ + foreach person_id $person_ids { + array set person_array [person::get -person_id $person_id] + lappend person_list "$person_array(first_names) $person_array(last_name)" + } + aa_equals "Getting persons from database table \"persons\"" $person_list {{Charles Mingus}\ {Miles Davis}\ {Charlie Parker}} } -teardown_code {