Index: openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl 7 Aug 2017 23:48:03 -0000 1.5 +++ openacs-4/packages/assessment/tcl/test/as-assessment-procs.tcl 19 Jul 2018 12:24:40 -0000 1.6 @@ -75,11 +75,11 @@ # get data array set assessment_data {} as::assessment::data -assessment_id $assessment_id - aa_true "assessment exists" [expr {$assessment_data(assessment_id) > 0}] + aa_true "assessment exists" {$assessment_data(assessment_id) > 0} # start a session set session_id [as::session::new -assessment_id $assessment_rev_id -subject_id $user_id -package_id $package_id] - aa_true "session exists" [expr {$session_id > 0}] + aa_true "session exists" {$session_id > 0} set section_list [as::assessment::sections -assessment_id $assessment_rev_id \ -session_id $session_id \ @@ -118,7 +118,7 @@ -label $folder_name \ -description $folder_name] aa_true "Folder_id is not null '${folder_id}'" \ - [expr {$folder_id ne ""}] + {$folder_id ne ""} content::folder::register_content_type \ -folder_id $folder_id \ -content_type as_assessments @@ -136,10 +136,10 @@ set assessment_id [ content::revision::item_id -revision_id $assessment_id ] as::assessment::data -assessment_id $assessment_id - aa_true "Item Created " [expr { $title eq $assessment_data(title)}] + aa_true "Item Created " { $title eq $assessment_data(title)} aa_log " $assessment_data(title) " - aa_true "Item Created " [expr { $assessment_data(creator_name) ne ""}] + aa_true "Item Created " { $assessment_data(creator_name) ne ""} aa_log " $assessment_data(creator_name) " } @@ -159,7 +159,7 @@ -label $folder_name \ -description $folder_name] aa_true "Folder_id is not null '${folder_id}'" \ - [expr {$folder_id ne ""}] + {$folder_id ne ""} content::folder::register_content_type \ -folder_id $folder_id \ -content_type as_assessments @@ -179,8 +179,8 @@ set new_revision_id [ as::assessment::edit -assessment_id $assessment_id -title $newtitle ] aa_true "New Title Created" [db_0or1row q "select title from cr_revisions where revision_id=:new_revision_id"] - aa_true "New Title Created - $title " [expr {$title eq $newtitle}] - aa_true "New Title Created - $title not equal to $vartitle" [expr {$title ne $vartitle}] + aa_true "New Title Created - $title " {$title eq $newtitle} + aa_true "New Title Created - $title not equal to $vartitle" {$title ne $vartitle} aa_log "new_revision_id - $new_revision_id" } @@ -201,7 +201,7 @@ -label $folder_name \ -description $folder_name] aa_true "Folder_id is not null '${folder_id}'" \ - [expr {$folder_id ne ""}] + {$folder_id ne ""} content::folder::register_content_type \ -folder_id $folder_id \ -content_type as_assessments @@ -218,7 +218,7 @@ aa_log "assessment_id - $assessment_id" set new_assessment_id [ as::assessment::copy -assessment_id $assessment_id] - aa_true "New Assessment created" [expr { $assessment_id ne $new_assessment_id }] + aa_true "New Assessment created" { $assessment_id ne $new_assessment_id } aa_log "new_assessment_id - $new_assessment_id" } } @@ -237,7 +237,7 @@ -label $folder_name \ -description $folder_name] aa_true "Folder_id is not null '${folder_id}'" \ - [expr {$folder_id ne ""}] + {$folder_id ne ""} content::folder::register_content_type \ -folder_id $folder_id \ -content_type as_assessments @@ -255,7 +255,7 @@ #aa_log "revision_id - $assessment_revision_id" set new_revision_id [ as::assessment::new_revision -assessment_id $assessment_id] - aa_true "New Assessment created" [expr { $assessment_id ne $new_revision_id }] + aa_true "New Assessment created" { $assessment_id ne $new_revision_id } aa_log "new_revision_id - $new_revision_id" } }