* support Zelenium based on Selenium >= 0.8.

* modify test titles. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25489 20353a03-c40f-0410-a6d1-a30d3c3de9de

* support Zelenium based on Selenium >= 0.8.
* modify test titles. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25489 20353a03-c40f-0410-a6d1-a30d3c3de9de
4d751456 · Kazuhiko Shiozaki · 66f2872b · 4d751456 · 4d751456 · 4d751456
Commit 4d751456 authored Feb 07, 2009 by Kazuhiko Shiozaki
5 changed files
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml
@@ -48,7 +48,7 @@
 <body>\n
 <table cellpadding="1" cellspacing="1" border="1">\n
 <thead>\n
-<tr><td rowspan="1" colspan="3">Test block Positioning</td></tr>\n
+<tr><td rowspan="1" colspan="3">Test PlanningBox Block Positioning</td></tr>\n
 </thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n
 <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n
 <tr>\n
@@ -180,17 +180,17 @@
  <tr>\n
    <td>verifyElementPositionTop</td>\n
    <td>id=group_1_activity_1_block_1</td>\n
-    <td>266</td>\n
+    <td>250</td>\n
  </tr>\n
  <tr>\n
    <td>verifyElementPositionTop</td>\n
    <td>id=group_2_activity_1_block_1</td>\n
-    <td>346</td>\n
+    <td>330</td>\n
  </tr>\n
  <tr>\n
    <td>verifyElementPositionTop</td>\n
    <td>id=group_3_activity_1_block_1</td>\n
-    <td>426</td>\n
+    <td>410</td>\n
  </tr>\n
  <tr>\n
    <td>verifyElementWidth</td>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldProxyListBox.xml
@@ -48,7 +48,7 @@
 <body>\n
 <table cellpadding="1" cellspacing="1" border="1">\n
 <thead>\n
-<tr><td rowspan="1" colspan="3">Test Simple Relation Field Search Dialog Change Page</td></tr>\n
+<tr><td rowspan="1" colspan="3">Test Multiple Relation Field Proxy ListBox</td></tr>\n
 </thead><tbody>\n
 <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n
 <tr>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
@@ -48,8 +48,8 @@
 <body>\n
 <table cellpadding="1" cellspacing="1" border="1">\n
 <thead>\n
-<tr><td rowspan="1" colspan="3">Test Simple Relation Field Search Dialog Change Page</td></tr>\n
-</thead><tbody>\n
+<tr><td rowspan="1" colspan="3">Test Multiple Relation Field Search Dialog Change Page</td></tr>\n
+</thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n
 <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n
 <tr>\n
  <td>open</td>\n
@@ -94,8 +94,13 @@
 <tr>\n
  <td>type</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>%1%<br />%2%</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>%1%\n
 %2%</td>\n
+</tal:block>\n
 </tr>\n
 <tr>\n
  <td>clickAndWait</td>\n

--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml
@@ -50,7 +50,7 @@
 <thead>\n
 <tr><td rowspan="1" colspan="3">Test Multi Relation Field, using metadata tab\n
 to set categories</td></tr>\n
-</thead><tbody>\n
+</thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n
 <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n
 <tr>\n
  <td>open</td>\n
@@ -85,8 +85,13 @@ to set categories</td></tr>\n
 <tr>\n
  <td>type</td>\n
  <td>field_my_category_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>bar_category/foo_module/0<br />bar_category/foo_module/1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>bar_category/foo_module/0\n
 bar_category/foo_module/1</td>\n
+</tal:block>\n
  <td></td>\n
 </tr>\n
 <tr>\n
@@ -110,16 +115,26 @@ bar_category/foo_module/1</td>\n
 <tr>\n
  <td>verifyValue</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 0<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 0\n
 Title 1</td>\n
+</tal:block>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>type</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 0<br />Title 1<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 0\n
 Title 1\n
 Title 1</td>\n
+</tal:block>\n
  <td>Make sure than we can repeat the second item in a list</td>\n
 </tr>\n
 <tr>\n
@@ -131,18 +146,28 @@ Title 1</td>\n
 <tr>\n
  <td>verifyValue</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 0<br />Title 1<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 0\n
 Title 1\n
 Title 1</td>\n
+</tal:block>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>type</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 0<br />Title 0<br />Title 1<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 0\n
 Title 0\n
 Title 1\n
 Title 1</td>\n
+</tal:block>\n
  <td>Make sure that we can repeat the first item (default) in a list</td>\n
 </tr>\n
 <tr>\n
@@ -154,18 +179,28 @@ Title 1</td>\n
 <tr>\n
  <td>verifyValue</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 0<br />Title 0<br />Title 1<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 0\n
 Title 0\n
 Title 1\n
 Title 1</td>\n
+</tal:block>\n
  <td></td>\n
 </tr>\n
 <tr>\n
  <td>type</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 1<br />Title 0<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 1\n
 Title 0\n
 Title 1</td>\n
+</tal:block>\n
  <td>Make sure we can reorder items in a list</td>\n
 </tr>\n
 <tr>\n
@@ -177,9 +212,14 @@ Title 1</td>\n
 <tr>\n
  <td>verifyValue</td>\n
  <td>field_my_bar_category_title_list</td>\n
+<tal:block tal:condition="is_selenium_0_8">\n
+  <td>Title 1<br />Title 0<br />Title 1</td>\n
+</tal:block>\n
+<tal:block tal:condition="not:is_selenium_0_8">\n
  <td>Title 1\n
 Title 0\n
 Title 1</td>\n
+</tal:block>\n
  <td></td>\n
 </tr>\n
 <!-- XXX don\'t test jump for now, because we don\'t have good locators anyway.\n

--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
-408
\ No newline at end of file
+409
\ No newline at end of file