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 -r1.15.2.18 -r1.15.2.19
--- openacs-4/packages/xowiki/tcl/test/test-procs.tcl	6 Mar 2021 14:25:45 -0000	1.15.2.18
+++ openacs-4/packages/xowiki/tcl/test/test-procs.tcl	28 Jun 2021 19:57:42 -0000	1.15.2.19
@@ -239,6 +239,7 @@
         {-update ""}
         {-remove ""}
         {-extra_url_parameter ""}
+        {-expect_validation_error ""}
     } {
 
         Create a form page via the web interface.
@@ -281,9 +282,9 @@
             set form [::acs::test::xpath::get_form $root [subst {
                 //form\[contains(@class,'$formCSSClass')\]
             }]]
-            set fields [acs::test::form_get_fields $form]
-
             #aa_log "FORM_CONTENT !$form!"
+
+            set fields [acs::test::form_get_fields $form]
             set f_page_name   [dict get $fields _name]
             set f_creator     [dict get $fields _creator]
             if {$autonamed_p} {
@@ -307,44 +308,60 @@
                    -form $form \
                    -update $update \
                    -remove $remove]
-        acs::test::reply_has_status_code $d 302
+        if {$expect_validation_error ne ""} {
+            aa_log "HAVE VALIDATION ERROR"
+            acs::test::reply_has_status_code $d 200
+            set response [dict get $d body]
+            acs::test::dom_html root $response {
+                set errorNodes [$root selectNodes {//div[contains(@class,'form-error')]}]
+                aa_true "errorNodes exist '$errorNodes'" {$errorNodes ne ""}
+                set errorMsgs {}
+                foreach n $errorNodes {
+                    aa_log "validation error '[$n text]'"
+                    lappend errorMsgs [$n text]
+                }
+                aa_true "contains expected msg '$expect_validation_error'" {$expect_validation_error in $errorMsgs}
+            }
+        } else {
+            acs::test::reply_has_status_code $d 302
 
-        #set response [dict get $d body]
-        #ns_log notice "FORM POST\n$response"
+            #set response [dict get $d body]
+            #ns_log notice "FORM POST\n$response"
 
-        foreach {key value} $update {
-            dict set form_content $key $value
-        }
-        aa_log "create_form_page: form_content:\n[::xowiki::test::pretty_form_content $form_content]"
+            foreach {key value} $update {
+                dict set form_content $key $value
+            }
+            aa_log "create_form_page: form_content:\n[::xowiki::test::pretty_form_content $form_content]"
 
-        set location [::acs::test::get_url_from_location $d]
-        aa_true "create_form_page: location '$location' is valid" {$location ne ""}
+            set location [::acs::test::get_url_from_location $d]
+            aa_true "create_form_page: location '$location' is valid" {$location ne ""}
 
-        set d [acs::test::http \
-                   -last_request $last_request -user_id $user_id \
-                   $location]
-        acs::test::reply_has_status_code $d 200
+            set d [acs::test::http \
+                       -last_request $last_request -user_id $user_id \
+                       $location]
+            acs::test::reply_has_status_code $d 200
 
-        ::xo::Package initialize -url $location
-        set lang [string range [lang::system::locale] 0 1]
+            ::xo::Package initialize -url $location
+            set lang [string range [lang::system::locale] 0 1]
 
-        set page_info [::$package_id item_ref \
-                           -default_lang $lang \
-                           -parent_id $parent_id \
-                           [dict get $form_content _name] \
-                          ]
-        set item_id [dict get $page_info item_id]
-        #aa_log "lookup of $folder_name/page -> $item_id"
-        if {$item_id == 0} {error "Page not found"}
-        ::xo::db::CrClass get_instance_from_db -item_id $item_id
+            set page_info [::$package_id item_ref \
+                               -default_lang $lang \
+                               -parent_id $parent_id \
+                               [dict get $form_content _name] \
+                              ]
+            set item_id [dict get $page_info item_id]
+            #aa_log "lookup of $folder_name/page -> $item_id"
+            if {$item_id == 0} {error "Page not found"}
+            ::xo::db::CrClass get_instance_from_db -item_id $item_id
 
-        set d [acs::test::http \
-                   -last_request $last_request -user_id $user_id \
-                   $instance/admin/set-publish-state?state=ready&revision_id=[::$item_id revision_id]]
-        acs::test::reply_has_status_code $d 302
-        aa_log "create_form_page: DONE"
-        dict set d page_info $page_info
-        dict set d instance $instance        
+            set d [acs::test::http \
+                       -last_request $last_request -user_id $user_id \
+                       $instance/admin/set-publish-state?state=ready&revision_id=[::$item_id revision_id]]
+            acs::test::reply_has_status_code $d 302
+            aa_log "create_form_page: DONE"
+            dict set d page_info $page_info
+            dict set d instance $instance
+        }
         return $d
     }
 
@@ -392,7 +409,7 @@
         aa_true "page_name '$f_page_name' non empty" {$f_page_name ne ""}
         #aa_true "creator '$f_creator' is nonempty" {$f_creator ne ""}
         aa_log  "creator '$f_creator'"
-        
+
         set f_form_action  [dict get $form @action]
         aa_true "form_action '$f_form_action' is nonempty" {$f_form_action ne ""}
 
@@ -419,7 +436,7 @@
         acs::test::reply_has_status_code $d 200
         acs::test::reply_contains $d [dict get $form_content _title]
 
-        dict set d instance $instance        
+        dict set d instance $instance
         return $d
     }
 
Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.50 -r1.1.2.51
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	31 Mar 2021 13:13:22 -0000	1.1.2.50
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	28 Jun 2021 19:57:42 -0000	1.1.2.51
@@ -713,7 +713,135 @@
             }
         }
     }
+
+    aa_register_case -cats {web} -procs {
+        "::acs::test::dom_html"
+        "::acs::test::http"
+        "::acs::test::reply_has_status_code"
+        "::acs::test::require_package_instance"
+        "::acs::test::user::create"
+        "::export_vars"
+        "::lang::system::locale"
+        "::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"
+        "::xowiki::Page instproc www-create-new"
+        "::xowiki::Page instproc www-edit"
+
+    } form_validate {
+
+        Create an xowiki form and an instance of this form.  The
+        instance contains validation errors.
+
+    } {
+        #
+        # Setup of test user_id and login
+        #
+        set user_info [::acs::test::user::create -email xowf@acs-testing.test -admin]
+        set request_info [::acs::test::login $user_info]
+
+        set instance /xowiki-test
+        set package_id [::acs::test::require_package_instance \
+                            -package_key xowiki \
+                            -empty \
+                            -instance_name $instance]
+        set testfolder .testfolder
+
+        try {
+            ###########################################################
+            aa_section "Require test folder"
+            ###########################################################
+
+            set folder_info [::xowiki::test::require_test_folder \
+                                 -last_request $request_info \
+                                 -instance $instance \
+                                 -folder_name $testfolder \
+                                 -fresh \
+                                ]
+
+            set folder_id  [dict get $folder_info folder_id]
+            set package_id [dict get $folder_info package_id]
+            aa_true "folder_id '$folder_id' is not 0" {$folder_id != 0}
+
+            set locale [lang::system::locale]
+            set lang [string range $locale 0 1]
+            set form_name $lang:validation.form
+            ###########################################################
+            aa_section "Create Form $form_name"
+            ###########################################################
+
+            #
+            # The created form contains fields to be validated.
+            #
+
+            ::xowiki::test::create_form \
+                -last_request $request_info \
+                -instance $instance \
+                -path $testfolder \
+                -parent_id $folder_id \
+                -name $form_name \
+                -update [subst {
+                    title "Validation Form"
+                    nls_language $locale
+                    text {}
+                    text.format text/html
+                    form {<form>@number@</form>}
+                    form.format text/plain
+                    form_constraints {
+                        number:numeric
+                    }
+                }]
+            aa_log "Form $form_name created"
+
+            ###########################################################
+            aa_section "Create an instance of $form_name named '${lang}:validate1'"
+            ###########################################################
+            set page_name ${lang}:validate1
+            set title "fresh $page_name for validation"
+            set d [::xowiki::test::create_form_page \
+                       -last_request $request_info \
+                       -instance $instance \
+                       -path $testfolder \
+                       -parent_id $folder_id \
+                       -form_name $form_name \
+                       -expect_validation_error "Invalid numeric value" \
+                       -update [subst {
+                           _name "$page_name"
+                           _title "$title"
+                           _nls_language $locale
+                           number a
+                       }]]
+            
+            #ns_log notice "::xowiki::test::create_form_page returns $d"
+            acs::test::reply_has_status_code $d 200
+
+            set response [dict get $d body]
+            acs::test::dom_html root $response {
+                set f_id [::xowiki::test::get_object_name $root]
+                aa_true "page_name '$f_id' non empty" {$f_id ne ""}
+                set new_title [$root getElementById F.$f_id._title]
+                set new_number [$root getElementById F.$f_id.number]
+                aa_equals "_title stays '$title'" $title [$new_title getAttribute value]
+                aa_equals "number stays 'a'" a [$new_number getAttribute value]
+            }
+
+        } on error {errorMsg} {
+            aa_true "Error msg: $errorMsg" 0
+        } finally {
+            #
+            # In case something has to be cleaned manually, do it here.
+            #
+            if {$package_id ne "" && $instance ne ""} {
+                set node_id [site_node::get_element -url $instance -element node_id]
+                site_node::delete -node_id $node_id -delete_package
+            }
+        }
+    }
 }
+
 #
 # Local variables:
 #    mode: tcl