? cr-tests.diff
Index: content-folder-test-procs.tcl
===================================================================
RCS file: /cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-folder-test-procs.tcl,v
retrieving revision 1.3
diff -u -r1.3 content-folder-test-procs.tcl
--- content-folder-test-procs.tcl	4 Jun 2006 00:45:23 -0000	1.3
+++ content-folder-test-procs.tcl	29 Jan 2007 22:57:14 -0000
@@ -10,6 +10,33 @@
     @cvs-id $Id: content-folder-test-procs.tcl,v 1.3 2006/06/04 00:45:23 donb Exp $
 }
 
+ad_proc object_exists {
+    -id:required
+} {
+    @author Jim Lynch <jim@jam.sessionsnet.org>
+    @creation-date 2007-01-26
+
+    @param id
+
+    @return true if object whose id is $id exists
+} {
+    set id \
+        [db_string test_exists \
+	     "select 
+                  object_id 
+              from 
+                  acs_objects 
+              where 
+                  object_id = :id" \
+	    -default "NULL"]
+
+    set exists 0
+
+    if {$id ne "NULL"} {set exists 1}
+
+    return $exists
+}
+
 aa_register_case content_folder {
     content folder test
 } {
@@ -65,6 +92,24 @@
                                   -folder_id $child_folder_id \
                                   -target_folder_id $first_folder_id]
             aa_true "Parent is not subfolder of child" [string equal "f" $is_subfolder]            
-            
+
+	    ########################################################
+	    # delete child folder
+ 	    ########################################################
+	    content::folder::delete -folder_id $child_folder_id
+		
+	    aa_true \
+		"Child gone" \
+		[expr [object_exists -id $child_folder_id] == 0]
+
+	    ########################################################
+	    # delete parent folder
+ 	    ########################################################
+	    content::folder::delete -folder_id $first_folder_id
+		
+	    aa_true \
+		"Parent gone" \
+		[expr [object_exists -id $first_folder_id] == 0]
+
         }
 }
\ No newline at end of file
Index: content-item-test-procs.tcl
===================================================================
RCS file: /cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-item-test-procs.tcl,v
retrieving revision 1.6
diff -u -r1.6 content-item-test-procs.tcl
--- content-item-test-procs.tcl	4 Jun 2006 00:45:23 -0000	1.6
+++ content-item-test-procs.tcl	29 Jan 2007 22:57:14 -0000
@@ -259,6 +259,26 @@
             content::folder::delete \
                 -folder_id $first_folder_id \
                 -cascade_p "t"
+
+	    set an_f_exists \
+		[expr \
+		     [object_exists -id $first_folder_id] \
+		     || \
+		     [object_exists -id $first_folder_id]]
+
+	    aa_true \
+		"Folders gone" \
+		[expr ! $an_f_exists]
+
+	    set an_item_exists \
+		[expr \
+		     [object_exists -id $new_type_item_id] \
+		     || \
+		     [object_exists -id $tmp_item_id]]
+
+	    aa_true \
+		"items gone (were in first folder)" \
+		[expr ! $an_item_exists]
         }
 
 }
Index: content-revision-test-procs.tcl
===================================================================
RCS file: /cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl,v
retrieving revision 1.4
diff -u -r1.4 content-revision-test-procs.tcl
--- content-revision-test-procs.tcl	14 Feb 2005 18:17:32 -0000	1.4
+++ content-revision-test-procs.tcl	29 Jan 2007 22:57:14 -0000
@@ -8,6 +8,33 @@
 }
 
 
+ad_proc object_exists {
+    -id:required
+} {
+    @author Jim Lynch <jim@jam.sessionsnet.org>
+    @creation-date 2007-01-26
+
+    @param id
+
+    @return true if object whose id is $id exists
+} {
+    set id \
+        [db_string test_exists \
+	     "select 
+                  object_id 
+              from 
+                  acs_objects 
+              where 
+                  object_id = :id" \
+	    -default "NULL"]
+
+    set exists 0
+
+    if {$id ne "NULL"} {set exists 1}
+
+    return $exists
+}
+
 aa_register_case content_revision {
     content revision test
 } {
@@ -18,10 +45,14 @@
 
             # create a cr_folder
             set first_folder_id [db_nextval "acs_object_id_seq"]
-            set returned_first_folder_id [content::folder::new \
-                                              -folder_id $first_folder_id \
-                                              -name "test_folder_${first_folder_id}"]
-            aa_true "Folder created" [expr $first_folder_id == $returned_first_folder_id]
+            set returned_first_folder_id \
+		[content::folder::new \
+		     -folder_id $first_folder_id \
+		     -name "test_folder_${first_folder_id}"]
+
+            aa_true \
+		"Folder created" \
+		[expr $first_folder_id == $returned_first_folder_id]
 
             content::folder::register_content_type \
                 -folder_id $first_folder_id \
@@ -35,7 +66,9 @@
                                             -parent_id $first_folder_id \
 	                                    -storage_type "text"]
 
-            aa_true "First item created $first_item_id" [expr $first_item_id == $returned_first_item_id]
+            aa_true \
+		"First item created $first_item_id" \
+		[expr $first_item_id == $returned_first_item_id]
 
             # create a revision
             set revision_id [db_nextval "acs_object_id_seq"]
@@ -46,21 +79,40 @@
                                           -title "Test Title" \
                                           -description "Test Description" \
                                           -content "Test Content"]
-            aa_true "Basic Revision created revision_id $revision_id returned_revision_id $returned_revision_id " [expr $revision_id == $returned_revision_id]
-
-	::item::get_content -revision_id $returned_revision_id -array revision_content
-	set revision_content(content) [cr_write_content -revision_id $returned_revision_id -string]
-        aa_true "Revision contains correct content" [expr \
-	    [string equal $revision_content(title) "Test Title"] \
-	    && [string equal $revision_content(content) "Test Content"] \
-	    && $revision_id == $revision_content(revision_id)]
+            aa_true \
+		"Basic Revision created revision_id $revision_id returned_revision_id $returned_revision_id " \
+		[expr $revision_id == $returned_revision_id]
+
+	    ::item::get_content \
+		-revision_id $returned_revision_id \
+		-array revision_content
+	    set revision_content(content) \
+		[cr_write_content -revision_id $returned_revision_id -string]
+	    aa_true "Revision contains correct content" \
+		[expr \
+		     [string equal \
+			  $revision_content(title) \
+			  "Test Title"] \
+		     && \
+		     [string equal \
+			  $revision_content(content) \
+			  "Test Content"] \
+		     && $revision_id == $revision_content(revision_id)]
 	    
-            content::item::delete -item_id $first_item_id
+	    content::item::delete -item_id $first_item_id
 
-            content::folder::unregister_content_type \
+	    aa_true \
+		"item gone" \
+		[expr [object_exists -id $first_item_id] == 0]
+	    
+	    content::folder::unregister_content_type \
                 -folder_id $first_folder_id \
                 -content_type "content_revision" \
 
-            content::folder::delete -folder_id $first_folder_id
-        }
+	    content::folder::delete -folder_id $first_folder_id
+
+	    aa_true \
+		"folder gone" \
+		[expr [object_exists -id $first_folder_id] == 0]
+	}
 }