svn commit: r1331751 - in /ofbiz/trunk/framework: documents/UnitTest.xml testtools/dtd/test-suite.xsd testtools/src/org/ofbiz/testtools/JythonTest.java testtools/src/org/ofbiz/testtools/ModelTestSuite.java

[lektran]

Author: lektran
Date: Sat Apr 28 11:30:14 2012
New Revision: 1331751

URL: http://svn.apache.org/viewvc?rev=1331751&view=rev
Log:
Removing Jython tests as an option since it was never actually implemented, if we add script support now it'll likely be using Adrian's recent work and won't require a specific implementation for each script engine

Removed:
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/JythonTest.java
Modified:
    ofbiz/trunk/framework/documents/UnitTest.xml
    ofbiz/trunk/framework/testtools/dtd/test-suite.xsd
    ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java

Modified: ofbiz/trunk/framework/documents/UnitTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/documents/UnitTest.xml?rev=1331751&r1=1331750&r2=1331751&view=diff
==============================================================================
--- ofbiz/trunk/framework/documents/UnitTest.xml (original)
+++ ofbiz/trunk/framework/documents/UnitTest.xml Sat Apr 28 11:30:14 2012
@@ -87,18 +87,7 @@
             </para>
         </section>
         <section>
-            <title>3. Jython</title>
-            <para>
-                Specific jython script's location which will be tested in a script-location attribute like this:
-                <programlisting>
-                    &lt;test-case case-name="service-tests"&gt;
-                        &lt;jython-test script-location="component://testtools/webapp/testtools/actions/ServiceEngineTests.py"/&gt;
-                    &lt;/test-case&gt;
-                </programlisting>
-            </para>
-        </section>
-        <section>
-            <title>4. Service</title>
+            <title>3. Service</title>
             <para>
                 Specific service's name which will be tested in a service-name attribute like this:
                 <programlisting>
@@ -109,7 +98,7 @@
             </para>
         </section>
         <section>
-            <title>5. Simple Method</title>
+            <title>4. Simple Method</title>
             <para>
                 Specific simple method's location and name which will be tested in a location and a name attribute respectively like this:
                 <programlisting>

Modified: ofbiz/trunk/framework/testtools/dtd/test-suite.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/dtd/test-suite.xsd?rev=1331751&r1=1331750&r2=1331751&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/dtd/test-suite.xsd (original)
+++ ofbiz/trunk/framework/testtools/dtd/test-suite.xsd Sat Apr 28 11:30:14 2012
@@ -129,12 +129,4 @@ under the License.
         </xs:attribute>
     </xs:attributeGroup>
 
-    <xs:element name="jython-test" substitutionGroup="TestCaseTypes">
-        <xs:complexType>
-            <xs:attributeGroup ref="attlist.jython-test"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.jython-test">
-        <xs:attribute type="xs:string" name="script-location" use="required"/>
-    </xs:attributeGroup>
 </xs:schema>

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=1331751&r1=1331750&r2=1331751&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Sat Apr 28 11:30:14 2012
@@ -139,10 +139,7 @@ public class ModelTestSuite {
         } else if ("entity-xml-assert".equals(nodeName)) {
             // this is the old, deprecated name for the element, changed because it now does assert or load
             this.testList.add(new EntityXmlAssertTest(caseName, testElement));
-        } else if ("jython-test".equals(nodeName)) {
-            this.testList.add(new JythonTest(caseName, testElement));
         }
-
     }
 
     String getSuiteName() {