Use getAbsoluteLocation that is now defined in erp5_ui_test_core instead of getLocation.

Note that in Selenium 0.8 or later getLocation returns absolute url, but older Selenium returns path only.
So for transitional period, please use assert/verifyAbsoluteLocation.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25438 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml

@@ -66,8 +66,8 @@
 <!-- as the init macro create 1 Foo, we assume that our newly created foo will\n
 have id "2". This is probably a bit too stupid. -->\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/2/view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -87,8 +87,8 @@ have id "2". This is probably a bit too stupid. -->\n
   <td>Add Foo Line</td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/2/1/view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/1/view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -115,8 +115,8 @@ have id "2". This is probably a bit too stupid. -->\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/3/view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/3/view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -137,8 +137,8 @@ another object of the same type. -->\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/4/Foo_view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/4/Foo_view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml

@@ -102,8 +102,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/Foo_view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/Foo_view*" />\n
   <td></td>\n
 </tr>\n
 <!-- We check that the transition has not been passed by looking at the\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml

@@ -66,8 +66,8 @@
 <!-- as the init macro create 1 Foo, we assume that our newly created foo will\n
 have id "2". This is probably a bit too stupid. -->\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/2/view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -87,8 +87,8 @@ have id "2". This is probably a bit too stupid. -->\n
   <td>Add Foo Line</td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/2/1/view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/1/view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -109,8 +109,8 @@ another object of the same type. -->\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/2/2/FooLine_view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/2/2/FooLine_view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -134,8 +134,8 @@ another object of the same type. -->\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/3/Foo_view*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/3/Foo_view*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml

@@ -130,8 +130,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/FooModule_viewFooList*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/FooModule_viewFooList*" />\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml

@@ -94,8 +94,8 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/Base_viewHistory*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/Base_viewHistory*" />\n
   <td></td>\n
 </tr>\n
 \n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml

@@ -107,8 +107,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/setSelectionQuickSortOrder*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/setSelectionQuickSortOrder*" />\n
   <td></td>\n
 </tr>\n
 \n
@@ -180,8 +180,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0" />\n
   <td></td>\n
 </tr>\n
 <!-- Go to last and verify -->\n
@@ -226,8 +226,8 @@
   <td>4 of 4</td>\n
 </tr>\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/listbox_setPage\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/listbox_setPage" />\n
   <td></td>\n
 </tr>\n
 <!-- Go to previous and verify -->\n
@@ -262,8 +262,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0" />\n
   <td></td>\n
 </tr>\n
 <!-- Go to first and verify -->\n
@@ -308,8 +308,8 @@
   <td>1 of 4</td>\n
 </tr>\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/listbox_setPage\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/listbox_setPage" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -417,8 +417,8 @@
 </tr>\n
 <!-- END of inspired code -->\n
 <tr>\n
-  <td>verifyLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/unfoldDomain*\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>verifyAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/unfoldDomain*" />\n
   <td></td>\n
 </tr>\n
 \n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml

@@ -87,8 +87,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/0/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/0/view" />\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -97,8 +97,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/view" />\n
   <td></td>\n
 </tr>\n
 \n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogActions.xml

@@ -118,8 +118,8 @@
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/foo_module/1/Foo_view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/foo_module/1/Foo_view" />\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml

@@ -77,8 +77,8 @@ shouldn\'t do anything. -->\n
     <td></td>\n
   </tr>\n
   <tr>\n
-    <td>assertLocation</td>\n
-    <td tal:content="python:\'*%s/foo_module/1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+    <td>assertAbsoluteLocation</td>\n
+    <td tal:content="string:glob:${here/portal_url}/foo_module/1/view" />\n
     <td/>\n
   </tr>\n
   <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml

@@ -118,8 +118,8 @@ button</td></tr>\n
   <td></td>\n
 </tr>\n
 <tr>\n
-  <td>assertLocation</td>\n
-  <td tal:content="python:\'*%s/portal_categories/foo_category/a/a1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+  <td>assertAbsoluteLocation</td>\n
+  <td tal:content="string:glob:${here/portal_url}/portal_categories/foo_category/a/a1/view" />\n
   <td/>\n
 </tr>\n
 </tbody></table>\n

bt5/erp5_ui_test/bt/revision

-405
+406
\ No newline at end of file