Index: openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl	1 Mar 2005 00:01:22 -0000	1.3
+++ openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl	27 Oct 2014 16:39:12 -0000	1.4
@@ -21,22 +21,23 @@
             # so instead we have to create a child of another and then
             # retrieve the parent's child
 
-            set new_keyword_id [cr::keyword::new -heading $name]
-            aa_true "created a new cr_keyword" [exists_and_not_null new_keyword_id]
-            set new_keyword_id_2 [cr::keyword::new -heading $name_2 -parent_id $new_keyword_id]
-            aa_true "created a child cr_keyword" [exists_and_not_null new_keyword_id_2]
+            set new_keyword_id [content::keyword::new -heading $name]
+            aa_true "created a new content_keyword" [expr {[info exists new_keyword_id] && $new_keyword_id ne ""}]
 
-            set children [cr::keyword::get_children -parent_id $new_keyword_id ]
+            set new_keyword_id_2 [content::keyword::new -heading $name_2 -parent_id $new_keyword_id]
+            aa_true "created a child content_keyword" [expr {[info exists new_keyword_id_2] && $new_keyword_id_2 ne ""}]
+
+            set children [content::keyword::get_children -parent_id $new_keyword_id ]
             aa_true "child is returned" [string match "*$new_keyword_id_2*" $children]
 
             set delete_result [content::keyword::delete -keyword_id $new_keyword_id_2]
 
-            set children_after_delete [cr::keyword::get_children -parent_id $new_keyword_id ]
+            set children_after_delete [content::keyword::get_children -parent_id $new_keyword_id ]
             aa_true "child is not returned after deletion" ![string match "*$new_keyword_id_2*" $children_after_delete]
 
             # teardown doesn't seem to eliminate this:
             set delete_result [content::keyword::delete -keyword_id $new_keyword_id]
 
             # would test that delete works but there's no relevant function in the API 
         }
-}
\ No newline at end of file
+}