Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/Attic/xowiki-test-procs.tcl,v
diff -u -N -r1.1.2.40 -r1.1.2.41
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	16 Feb 2021 14:19:51 -0000	1.1.2.40
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	16 Feb 2021 17:22:19 -0000	1.1.2.41
@@ -25,13 +25,10 @@
             "::site_node::delete"
             "::site_node::get_node_id"
             "::site_node::unmount"
+            "::xo::PackageMgr instproc initialize"
             "::xo::db::CrClass proc get_instance_from_db"
-            "::xo::db::CrItem instproc update_attribute_from_slot"
-            "::xowiki::Page instproc find_slot"
             "::xowiki::test::require_folder"
             "::xowiki::test::require_page"
-            "::xo::PackageMgr instproc initialize"
-            "::xowiki::FormPage instproc update_attribute_from_slot"
 
             "::acs::root_of_host"
             "::ad_host"
@@ -43,7 +40,10 @@
             "::xo::Context instproc export_vars"
             "::xo::Context instproc original_url_and_query"
             "::xo::db::Class proc object_type_to_class"
+            "::xo::db::CrItem instproc update_attribute_from_slot"
             "::xo::db::DB-postgresql instproc dml"
+            "::xowiki::FormPage instproc update_attribute_from_slot"
+            "::xowiki::Page instproc find_slot"
             "::xowiki::Page proc find_slot"
         } \
         slot_interactions {
@@ -142,16 +142,10 @@
             "::site_node::delete"
             "::site_node::get_node_id"
             "::site_node::unmount"
+            "::xo::PackageMgr instproc initialize"
             "::xo::db::CrClass proc get_instance_from_db"
-            "::xo::db::CrClass proc lookup"
-            "::xowiki::Package instproc item_info_from_url"
-            "::xowiki::Package instproc item_ref"
-            "::xowiki::Package instproc lookup"
-            "::xowiki::Package instproc resolve_page"
-            "::xowiki::Page instproc create_link"
             "::xowiki::test::require_folder"
             "::xowiki::test::require_page"
-            "::xo::PackageMgr instproc initialize"
 
             "::acs::root_of_host"
             "::ad_host"
@@ -166,7 +160,15 @@
             "::xo::Page proc requireCSS"
             "::xo::Page proc requireJS"
             "::xo::db::Class proc object_type_to_class"
+            "::xo::db::CrClass proc lookup"
             "::xo::db::DB-postgresql instproc get_value"
+            "::xowiki::Package instproc item_info_from_url"
+            "::xowiki::Package instproc item_ref"
+            "::xowiki::Package instproc lookup"
+            "::xowiki::Package instproc resolve_page"
+            "::xowiki::Page instproc create_link"
+            "::xowiki::FormPage proc fetch_object"
+            "::xo::PackageMgr proc get_package_class_from_package_key"
         } \
         path_resolve {
             Test various forms of path resolving
@@ -358,55 +360,57 @@
         "::acs::test::require_package_instance"
         "::export_vars"
         "::lang::system::locale"
-        "::xo::Package instproc initialize"
-        "::xo::Package instproc reply_to_user"
-        "::xowiki::FormPage instproc set_property"
-        "::xowiki::Package instproc invoke"
-        "::xowiki::Page instproc get_form_data"
-        "::xowiki::Page instproc include"
-        "::xowiki::Page instproc www-create-new"
-        "::xowiki::Page instproc www-edit"
         "::xowiki::test::create_form"
         "::xowiki::test::create_form_page"
         "::xowiki::test::edit_form_page"
         "::xowiki::test::get_form_CSSclass"
         "::xowiki::test::get_object_name"
         "::xowiki::test::require_test_folder"
-        ::acs::test::form_get_fields
-        ::acs::test::form_reply
-        ::acs::test::form_set_fields
-        ::acs::test::get_form
-        ::acs::test::get_url_from_location
-        ::acs::test::xpath::get_form
-        ::acs::test::xpath::get_form_values
+        "::xowiki::Page instproc www-create-new"
+        "::xowiki::Page instproc www-edit"
 
-        "::xowiki::PageInstance instproc get_from_template"
-        "::xowiki::Package instproc get_parameter"
-        "::xowiki::Package instproc require_root_folder"
-        "::xo::tdom::AttributeManager instproc get_attributes"
-        "::xowiki::FormPage instproc set_form_data"
-        "::xowiki::FormPage instproc combine_data_and_form_field_default"
-        "::xowiki::Package instproc www-edit-new"
-        "::cookieconsent::CookieConsent instproc render_js"
-        "::xo::db::CrItem instproc rename"
         "::ad_log"
         "::ad_return_complaint"
         "::ad_script_abort"
         "::ad_text_to_html"
         "::ad_urlencode_query"
+        "::cookieconsent::CookieConsent instproc render_js"
         "::template::util::lpop"
         "::xo::ConnectionContext instproc get_all_form_parameter"
         "::xo::ConnectionContext instproc user_id"
         "::xo::Context instproc invoke_object"
+        "::xo::Package instproc initialize"
+        "::xo::Package instproc reply_to_user"
         "::xo::PackageMgr instproc first_instance"
         "::xo::PackageMgr instproc initialize"
         "::xo::PackageMgr instproc require"
         "::xo::Page proc get_property"
         "::xo::Page proc set_property"
-        "::xo::db::CrClass instproc get_instance_from_db"
-        "::xowiki::Includelet proc html_encode"
         "::xo::Table instproc column_names"
+        "::xo::db::CrClass instproc get_instance_from_db"
         "::xo::db::CrClass instproc get_instances_from_db"
+        "::xo::db::CrItem instproc rename"
+        "::xo::tdom::AttributeManager instproc get_attributes"
+        "::xowiki::FormPage instproc combine_data_and_form_field_default"
+        "::xowiki::FormPage instproc set_form_data"
+        "::xowiki::FormPage instproc set_property"
+        "::xowiki::Includelet proc html_encode"
+        "::xowiki::Package instproc get_parameter"
+        "::xowiki::Package instproc invoke"
+        "::xowiki::Package instproc require_root_folder"
+        "::xowiki::Package instproc www-edit-new"
+        "::xowiki::Page instproc get_form_data"
+        "::xowiki::Page instproc include"
+        "::xowiki::PageInstance instproc get_from_template"
+        ::acs::test::form_get_fields
+        ::acs::test::form_reply
+        ::acs::test::form_set_fields
+        ::acs::test::get_form
+        ::acs::test::get_url_from_location
+        ::acs::test::xpath::get_form
+        ::acs::test::xpath::get_form_values
+        "::xo::PackageMgr proc get_package_class_from_package_key"
+        "::xowiki::utility proc formCSSclass"
     } create_form_with_form_instance {
 
         Create an xowiki form and an instance of this form.  Here we