Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.170 -r1.171
--- openacs-4/packages/xowiki/xowiki.info	22 Jul 2018 08:12:20 -0000	1.170
+++ openacs-4/packages/xowiki/xowiki.info	23 Jul 2018 14:12:57 -0000	1.171
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d14" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d14.apm">
+    <version name="5.10.0d15" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d15.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d14"/>
+        <provides url="xowiki" version="5.10.0d15"/>
         <requires url="xotcl-core" version="5.10.0d11"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
@@ -66,6 +66,7 @@
         <requires url="categories" version="1.1.3"/>
         <requires url="file-storage" version="5.9.1"/>
         <requires url="general-comments" version="5.9.1"/>
+	<requires url="acs-automated-testing" version="5.10.0d5"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowiki/tcl/test/test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/test-procs.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/xowiki/tcl/test/test-procs.tcl	21 Jun 2018 16:00:59 -0000	1.8
+++ openacs-4/packages/xowiki/tcl/test/test-procs.tcl	23 Jul 2018 14:12:57 -0000	1.9
@@ -62,64 +62,15 @@
         return $pretty_form_content
     }
 
-
     ad_proc -private ::xowiki::test::get_form_values {node className} {
-        set values {}
-        foreach n [$node selectNodes //form\[contains(@class,'$className')\]//input] {
-            set name  [$n getAttribute name]
-            #ns_log notice "form $className input node $n name $name:"
-            if {[$n hasAttribute value]} {
-                set value [$n getAttribute value]
-            } else {
-                set value ""
-            }
-            lappend values $name $value
-        }
-        foreach n [$node selectNodes //form\[contains(@class,'$className')\]//textarea] {
-            set name  [$n getAttribute name]
-            #ns_log notice "form $className textarea node $n name $name:"
-            set value [$n text]
-            lappend values $name $value
-        }
-        ns_log notice "final values $values"
-        return $values
+        return [::aa_xpath::get_form_values $node \
+                    "//form\[contains(@class,'$className')\]" ]
     }
+    
     ad_proc -private ::xowiki::test::get_form_action {node className} {
         return [$node selectNodes string(//form\[contains(@class,'$className')\]/@action)]
     }
 
-    ad_proc -private ::xowiki::test::form_reply {
-        -user_id
-        -url
-        {-update {}}
-        form_content
-    } {
-        foreach {att value} $update {
-            dict set form_content $att $value
-        }
-        #ns_log notice "final form_content $form_content"
-        #
-        # Transform the dict into export format. Since export_vars
-        # will skip all names containing a ":", such as
-        # "formbutton:ok", we do this "manually".
-        #
-        set export {}
-        foreach {att value} $form_content {
-            lappend export [ad_urlencode_query $att]=[ad_urlencode_query $value]
-        }
-        set body [join $export &]
-        #ns_log notice "body=$body"
-        #
-        # Send the POST request
-        #
-        return [aa_http \
-                    -user_id $user_id \
-                    -method POST -body $body \
-                    -headers {Content-Type application/x-www-form-urlencoded} \
-                    $url]
-
-    }
-
     ad_proc ::xowiki::test::require_test_folder {
         -user_id:required
         -instance:required
@@ -156,19 +107,22 @@
                 # since -fresh was specified, we delete the folder and
                 # create it later again.
                 #
-                aa_log "test folder $folder_name exists already, ... delete it"
+                aa_log "test folder $folder_name exists already, ... delete it (user_id $user_id)"
                 set d [aa_http -user_id $user_id $instance/$folder_name?m=delete&return_url=$instance/]
                 aa_equals "Status code valid" [dict get $d status] 302
-                set location [::xowiki::test::get_url_from_location $d]
-                set d [aa_http -user_id $user_id $location/]
-                aa_equals "Status code valid" [dict get $d status] 200
+                if {[dict get $d status] == 302} {
+                    set location [::xowiki::test::get_url_from_location $d]
+                    set d [aa_http -user_id $user_id $location/]
+                    aa_equals "Status code valid" [dict get $d status] 200
+
+                }
             } else {
                 set must_create 0
             }
         }
 
         if {$must_create} {
-            aa_log "create a frest test folder $folder_name"
+            aa_log "create a fresh test folder $folder_name"
             #
             # When we try folder creation without being logged in, we
             # expect a permission denied error.
@@ -257,7 +211,7 @@
             aa_true "page has at least 9 fields" { [llength $names] >= 9 }
         }
 
-        set d [::xowiki::test::form_reply \
+        set d [::aa_test::form_reply \
                    -user_id $user_id \
                    -url $f_form_action \
                    -update $update \
@@ -330,7 +284,7 @@
             aa_true "page has at least 9 fields" { [llength $names] >= 9 }
         }
 
-        set d [::xowiki::test::form_reply \
+        set d [::aa_test::form_reply \
                    -user_id $user_id \
                    -url $f_form_action \
                    -update $update \
@@ -407,7 +361,7 @@
         aa_log "empty form_content:\n$[::xowiki::test::pretty_form_content $form_content]"
         dict set form_content name $name
 
-        set d [::xowiki::test::form_reply \
+        set d [::aa_test::form_reply \
                    -user_id $user_id \
                    -url $f_form_action \
                    -update $update \