svn commit: r821731 - in /ofbiz/trunk/framework/testtools: webapp/testtools/WEB-INF/controller.xml widget/CommonScreens.xml widget/RunSeleniumForms.xml

[hansbak-2]

Author: hansbak
Date: Mon Oct  5 10:00:45 2009
New Revision: 821731

URL: http://svn.apache.org/viewvc?rev=821731&view=rev
Log:
paging on testsuites in selenium test corrected

Modified:
    ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/testtools/widget/CommonScreens.xml
    ofbiz/trunk/framework/testtools/widget/RunSeleniumForms.xml

Modified: ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/controller.xml?rev=821731&r1=821730&r2=821731&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/testtools/webapp/testtools/WEB-INF/controller.xml Mon Oct  5 10:00:45 2009
@@ -56,21 +56,21 @@
     <request-map uri="updateSeleniumTestSuitePath">
         <security https="true" auth="true"/>
         <event type="simple" path="component://testtools/script/org/ofbiz/selenium/SeleniumTestSuitePathEvents.xml" invoke="updateSeleniumTestSuitePath"/>
-        <response name="success" type="view" value="selenium"/>
+        <response name="success" type="request" value="selenium"/>
     </request-map>
     <request-map uri="removeSeleniumTestSuitePath">
         <security https="true" auth="true"/>
         <event type="simple" path="component://testtools/script/org/ofbiz/selenium/SeleniumTestSuitePathEvents.xml" invoke="removeSeleniumTestSuitePath"/>
-        <response name="success" type="view" value="selenium"/>
+        <response name="success" type="request" value="selenium"/>
     </request-map>
     
     <request-map uri="editSeleniumTestSuitePath">
-    <security https="true" auth="true"/>
-        <response name="success" type="view" value="selenium"/>
+        <security https="true" auth="true"/>
+        <response name="success" type="request" value="selenium"/>
     </request-map>
     
     <!--  selenium Test Case -->
     <view-map name="selenium" type="screen" page="component://testtools/widget/CommonScreens.xml#selenium"/>
     <view-map name="runSelenium" type="screen" page="component://testtools/widget/CommonScreens.xml#runSelenium"/>
     <view-map name="test" type="screen" page="component://testtools/widget/CommonScreens.xml#runSelenium"/>
-</site-conf>
+</site-conf>
\ No newline at end of file

Modified: ofbiz/trunk/framework/testtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/widget/CommonScreens.xml?rev=821731&r1=821730&r2=821731&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/testtools/widget/CommonScreens.xml Mon Oct  5 10:00:45 2009
@@ -73,6 +73,10 @@
                 <entity-one entity-name="SeleniumTestSuitePath"  value-field="testSuitePath">
                     <field-map field-name="testSuiteId" value="${parameters.testSuiteId}"/>
                 </entity-one>
+                <entity-condition entity-name="SeleniumTestSuitePath" list="listIt">
+                    <condition-expr field-name="testSuiteId" operator="not-equals" value="none"/>
+                    <!--order-by field-name="createdStamp DESC"/-->
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/framework/testtools/widget/RunSeleniumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/widget/RunSeleniumForms.xml?rev=821731&r1=821730&r2=821731&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/widget/RunSeleniumForms.xml (original)
+++ ofbiz/trunk/framework/testtools/widget/RunSeleniumForms.xml Mon Oct  5 10:00:45 2009
@@ -20,7 +20,7 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
+    
     <form name="editSeleniumTestSuitePath" target="updateSeleniumTestSuitePath" type="single" title="Add new selenium test suite" default-map-name="testSuitePath"
         header-row-style="header-row" default-table-style="basic-table">
         
@@ -33,18 +33,9 @@
         <field name="description"><textarea rows="3"/></field>
         <field name="submitButton" title=""><submit button-type="button"/></field>
     </form>
-    <form name="seleniumTestSuitePathList"  paginate-target="editSeleniumTestSuitePath" type="list" title="path file of selenium test suite"  separate-columns="true" list-name="listIt"
-        view-size="15" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <actions>
-            <set field="parameters" default-value=""></set>
-            <set field="parameters.noConditionFind" default-value="Y"></set>
-            
-            <service service-name="performFind" result-map="result" result-map-list="listIt">
-                <field-map field-name="inputFields" from-field="parameters"/>
-                <field-map field-name="entityName" value="SeleniumTestSuitePath"/>
-                <field-map field-name="orderBy" value="createdStamp"/>
-            </service>
-        </actions>
+    <form name="seleniumTestSuitePathList"  paginate-target="selenium" type="list" title="path file of selenium test suite"  separate-columns="true" list-name="listIt"
+        view-size="15" odd-row-style="alternate-row" paginate="true" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        
         <field name="testSuiteId" widget-style="buttontext">
             <hyperlink also-hidden="true" description="${testSuiteId}" target="editSeleniumTestSuitePath">
                 <parameter param-name="testSuiteId"/>