Index: openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl 10 Jun 2004 01:14:26 -0000 1.1 +++ openacs-4/packages/acs-content-repository/tcl/test/content-revision-test-procs.tcl 1 Jul 2004 17:15:56 -0000 1.2 @@ -1,9 +1,6 @@ -# - ad_library { - Procedures to test content::revision tcl API - + @author Dave Bauer (dave@thedesignexperience.org) @creation-date 2004-06-05 @arch-tag: e8817de4-54e8-48f6-99bc-49c0a8d94691 @@ -16,45 +13,50 @@ } { aa_run_with_teardown \ - -rollback \ - -test_code { + -rollback \ + -test_code { - # 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}"] - content::folder::register_content_type \ - -folder_id $first_folder_id \ - -content_type "content_revision" \ - - aa_true "Folder created" [expr $first_folder_id == $returned_first_folder_id] + # 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] - # create a cr_item - set first_item_id [db_nextval "acs_object_id_seq"] - set returned_first_item_id [content::item::new \ - -name "test_item_one" \ - -item_id $first_item_id \ - -parent_id $first_folder_id] + content::folder::register_content_type \ + -folder_id $first_folder_id \ + -content_type "content_revision" \ - aa_true "First item created" [expr $first_item_id == $returned_first_item_id] - - # create a revision - set revision_id [db_nextval "acs_object_id_seq"] - - set returned_revision_id [content::revision::new \ - -revision_id $revision_id \ - -item_id $first_item_id \ - -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] + # create a cr_item + set first_item_id [db_nextval "acs_object_id_seq"] + set returned_first_item_id [content::item::new \ + -name "test_item_one" \ + -item_id $first_item_id \ + -parent_id $first_folder_id] - set r [db_string get_r {select revision_id from cr_revisions - where item_id=:first_item_id and title='Test Title' and - description='Test Description' and content='Test Content'} -default ""] - aa_true "Revision contains correct content" [expr $revision_id == $returned_revision_id] - content::item::delete -item_id $first_item_id - content::folder::delete -folder_id $first_folder_id - } + aa_true "First item created" [expr $first_item_id == $returned_first_item_id] + + # create a revision + set revision_id [db_nextval "acs_object_id_seq"] + + set returned_revision_id [content::revision::new \ + -revision_id $revision_id \ + -item_id $first_item_id \ + -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] + + set r [db_string get_r {select revision_id from cr_revisions + where item_id=:first_item_id and title='Test Title' and + description='Test Description' and content='Test Content'} -default ""] + aa_true "Revision contains correct content" [expr $revision_id == $returned_revision_id] + content::item::delete -item_id $first_item_id + + content::folder::unregister_content_type \ + -folder_id $first_folder_id \ + -content_type "content_revision" \ + + content::folder::delete -folder_id $first_folder_id + } }