svn commit: r1709516 - in /ofbiz/trunk/framework/testtools: dtd/test-suite.xsd src/org/ofbiz/testtools/ModelTestSuite.java

[hansbak-2]

Author: hansbak
Date: Tue Oct 20 06:34:32 2015
New Revision: 1709516

URL: http://svn.apache.org/viewvc?rev=1709516&view=rev
Log:
Selenium web driver integration using XML files: https://issues.apache.org/jira/browse/OFBIZ-6618

Modified:
    ofbiz/trunk/framework/testtools/dtd/test-suite.xsd
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java

Modified: ofbiz/trunk/framework/testtools/dtd/test-suite.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/dtd/test-suite.xsd?rev=1709516&r1=1709515&r2=1709516&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/dtd/test-suite.xsd (original)
+++ ofbiz/trunk/framework/testtools/dtd/test-suite.xsd Tue Oct 20 06:34:32 2015
@@ -95,6 +95,15 @@ under the License.
         <xs:attribute type="xs:string" name="service-name" use="required"/>
     </xs:attributeGroup>
 
+    <xs:element name="webdriver-test" substitutionGroup="TestCaseTypes">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.webdriver-test"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.webdriver-test">
+        <xs:attribute type="xs:string" name="location" use="required"/>
+    </xs:attributeGroup>
+
     <xs:element name="simple-method-test" substitutionGroup="TestCaseTypes">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.simple-method-test"/>

Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java?rev=1709516&r1=1709515&r2=1709516&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Tue Oct 20 06:34:32 2015
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.ofbiz.testtools;
 
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
@@ -134,6 +135,16 @@ public class ModelTestSuite {
                     Debug.logError(e, module);
                 }
             }
+        } else if ("webdriver-test".equals(nodeName)) {
+            try {
+                String className = "org.ofbiz.testtools.WebDriverTest";
+                Class<?> cl;
+                cl = Class.forName(className);
+                Constructor<?> con = cl.getConstructor(String.class, Element.class);
+                this.testList.add((Test)con.newInstance(caseName, testElement));
+            } catch (Exception e) {
+                Debug.logError(e, module);
+            }
         } else if ("entity-xml".equals(nodeName)) {
             this.testList.add(new EntityXmlAssertTest(caseName, testElement));
         } else if ("entity-xml-assert".equals(nodeName)) {