Index: openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl	19 Jul 2018 12:16:20 -0000	1.4
+++ openacs-4/packages/acs-content-repository/tcl/test/content-keyword-test-procs.tcl	20 Jul 2018 08:41:29 -0000	1.5
@@ -10,33 +10,41 @@
     @cvs-id $Id$
 }
 
-aa_register_case content_keyword {
-    content_keyword test
-} {
-    aa_run_with_teardown \
-        -rollback \
-        -test_code {
+aa_register_case \
+    -cats {api db} \
+    -procs {
+        content::keyword::delete
+        content::keyword::get_description
+        content::keyword::get_heading
+        content::keyword::new
+    } \
+    content_keyword {
+        content_keyword test
+    } {
+        aa_run_with_teardown \
+            -rollback \
+            -test_code {
 
-            # create a keyword
-            set assigned_keyword_id [db_nextval "acs_object_id_seq"]
-            set keyword_id [content::keyword::new \
-                                -heading "--test_keyword" \
-                                -description "--test_description" \
-                                -keyword_id $assigned_keyword_id]
-            # check that keyword_id, heading, description
-            # are set correctly
-            aa_true "Keyword_id assigned" \
-                {$assigned_keyword_id == $keyword_id}
-            aa_true "Keyword heading set" \
-                [string equal "--test_keyword" [content::keyword::get_heading -keyword_id $keyword_id]]
-            aa_true "Keyword description set" \
-                     [string equal "--test_description" [content::keyword::get_description -keyword_id $keyword_id]]
-            # delete it
-            content::keyword::delete -keyword_id $keyword_id
-            aa_true "Keyword deleted" \
-                [string equal [db_string confirm_delete "" -default ""] ""]
-     }
-}
+                # create a keyword
+                set assigned_keyword_id [db_nextval "acs_object_id_seq"]
+                set keyword_id [content::keyword::new \
+                                    -heading "--test_keyword" \
+                                    -description "--test_description" \
+                                    -keyword_id $assigned_keyword_id]
+                # check that keyword_id, heading, description
+                # are set correctly
+                aa_true "Keyword_id assigned" \
+                    {$assigned_keyword_id == $keyword_id}
+                aa_equals "Keyword heading set" \
+                    [content::keyword::get_heading -keyword_id $keyword_id] "--test_keyword" 
+                aa_equals "Keyword description set" \
+                    [content::keyword::get_description -keyword_id $keyword_id] "--test_description" 
+                # delete it
+                content::keyword::delete -keyword_id $keyword_id
+                aa_equals "Keyword deleted" [db_string confirm_delete "" -default ""] ""
+            }
+    }
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4