svn commit: r1816345 - in /ofbiz/ofbiz-framework/trunk/framework: base/groovyScript/ base/groovyScript/test/ testtools/dtd/ testtools/src/main/java/org/apache/ofbiz/testtools/

[nmalin]

Author: nmalin
Date: Sat Nov 25 20:05:29 2017
New Revision: 1816345

URL: http://svn.apache.org/viewvc?rev=1816345&view=rev
Log:
Fixed: forget to add the class GroovyScriptTestCase.java ans the simple groovy test-suite in the previous commit related to issue OFBIZ-9996
Correct introduced typo in framework/testtools/dtd/test-suite.xsd

Added:
    ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/
    ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/
    ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy   (with props)
    ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java   (with props)
Modified:
    ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd

Added: ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy?rev=1816345&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy (added)
+++ ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy Sat Nov 25 20:05:29 2017
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+import org.apache.ofbiz.testtools.GroovyScriptTestCase
+
+class BaseTest extends GroovyScriptTestCase {
+    void testTrue() {
+        assert 1, 1
+    }
+
+    void testFalse() {
+        assertNotSame 1, 0
+    }
+
+    void testDelegator() {
+        assert delegator
+    }
+
+    void testDispatcher() {
+        assert dispatcher
+    }
+}

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/groovyScript/test/SimpleTests.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd?rev=1816345&r1=1816344&r2=1816345&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd Sat Nov 25 20:05:29 2017
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
@@ -99,15 +98,14 @@ under the License.
     </xs:element>
     <xs:attributeGroup name="attlist.groovy-test-suite">
         <xs:attribute type="xs:string" name="name"/>
-    </xs:attributeGroup>
-    <xs:attributeGroup name="attlist.groovy-test-suite">
-        <xs:attribute type="xs:string" name="location" use="required"/>
+        <xs:attribute type="xs:string" name="location" use="required">
             <xs:annotation>
                 <xs:documentation>
                     Give the location where is groovy file that contaions the test suite.
                     You can use a flexible url location like component://mycomponent/groovyScript/test/MySuiteTest.groovy
                 </xs:documentation>
             </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
 
     <xs:element name="service-test" substitutionGroup="TestCaseTypes">

Added: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java?rev=1816345&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java (added)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java Sat Nov 25 20:05:29 2017
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+package org.apache.ofbiz.testtools;
+
+import groovy.util.GroovyTestCase;
+import org.apache.ofbiz.entity.Delegator;
+import org.apache.ofbiz.service.LocalDispatcher;
+
+public class GroovyScriptTestCase extends GroovyTestCase {
+
+    public Delegator delegator;
+    public LocalDispatcher dispatcher;
+
+    public void setDelegator(Delegator delegator) {
+        this.delegator = delegator;
+    }
+    public Delegator getDelegator() {
+        return delegator;
+    }
+
+    public LocalDispatcher getDispatcher() {
+        return dispatcher;
+    }
+    public void setDispatcher(LocalDispatcher dispatcher) {
+        this.dispatcher = dispatcher;
+    }
+}

Propchange: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain