Author: mthl
Date: Fri Aug 23 18:02:42 2019
New Revision: 1865787
URL: http://svn.apache.org/viewvc?rev=1865787&view=rev
Log:
Improved: Remove useless ‘GroovyScriptTestCase’
(OFBIZ-11165)
This class was useless since ‘GroovyScriptTestCase’ provides the same
interesting feature as ‘OFBizTestCase’ meaning a delegator and a dispatcher.
Removed:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/groovy/
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/GroovyScriptTestCase.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgBudgetTests.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgInvoiceTests.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgLedgerTests.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentGatewayTests.groovy
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentTests.groovy
ofbiz/ofbiz-framework/trunk/applications/content/src/main/groovy/org/apache/ofbiz/content/ContentTests.groovy
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderTests.groovy
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/QuoteTests.groovy
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/TestCustRequestPermissionCheck.groovy
ofbiz/ofbiz-framework/trunk/applications/party/src/main/groovy/org/apache/ofbiz/party/ContactMechWorkerTests.groovy
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductFeatureTypeTests.groovy
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoActionTests.groovy
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoCondTests.groovy
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductTests.groovy
ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgBudgetTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgBudgetTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgBudgetTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgBudgetTests.groovy
Fri Aug 23 18:02:42 2019
@@ -21,9 +21,13 @@ package org.apache.ofbiz.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class AutoAcctgBudgetTests extends OFBizTestCase {
+ public AutoAcctgBudgetTests(String name) {
+ super(name)
+ }
-class AutoAcctgBudgetTests extends GroovyScriptTestCase {
void testCreateBudget() {
Map serviceCtx = [:]
serviceCtx.budgetTypeId = 'CAPITAL_BUDGET'
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgInvoiceTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgInvoiceTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgInvoiceTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgInvoiceTests.groovy
Fri Aug 23 18:02:42 2019
@@ -22,8 +22,12 @@ import org.apache.ofbiz.base.util.UtilDa
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
-class AutoAcctgInvoiceTests extends GroovyScriptTestCase {
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+class AutoAcctgInvoiceTests extends OFBizTestCase {
+ public AutoAcctgInvoiceTests(String name) {
+ super(name)
+ }
+
void testCreateInvoiceContent() {
def userLogin = EntityQuery.use(delegator).from('UserLogin')
.where('userLoginId', 'system')
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgLedgerTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgLedgerTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgLedgerTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgLedgerTests.groovy
Fri Aug 23 18:02:42 2019
@@ -22,9 +22,13 @@ import org.apache.ofbiz.base.util.UtilDa
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class AutoAcctgLedgerTests extends OFBizTestCase {
+ public AutoAcctgLedgerTests(String name) {
+ super(name)
+ }
-class AutoAcctgLedgerTests extends GroovyScriptTestCase {
void testCreateAcctgTrans() {
Map serviceCtx = [:]
serviceCtx.acctgTransTypeId = 'CREDIT_MEMO'
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentGatewayTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentGatewayTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentGatewayTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentGatewayTests.groovy
Fri Aug 23 18:02:42 2019
@@ -21,9 +21,13 @@ package org.apache.ofbiz.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class AutoAcctgPaymentGatewayTests extends OFBizTestCase {
+ public AutoAcctgPaymentGatewayTests(String name) {
+ super(name)
+ }
-class AutoAcctgPaymentGatewayTests extends GroovyScriptTestCase {
void testUpdatePaymentGatewayConfig() {
Map serviceCtx = [:]
serviceCtx.paymentGatewayConfigId = 'SAGEPAY_CONFIG'
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgPaymentTests.groovy
Fri Aug 23 18:02:42 2019
@@ -21,9 +21,13 @@ package org.apache.ofbiz.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class AutoAcctgPaymentTests extends OFBizTestCase {
+ public AutoAcctgPaymentTests(String name) {
+ super(name)
+ }
-class AutoAcctgPaymentTests extends GroovyScriptTestCase {
void testCreatePayment() {
Map serviceCtx = [:]
serviceCtx.paymentTypeId = 'CUSTOMER_PAYMENT'
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/groovy/org/apache/ofbiz/content/ContentTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/groovy/org/apache/ofbiz/content/ContentTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/groovy/org/apache/ofbiz/content/ContentTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/groovy/org/apache/ofbiz/content/ContentTests.groovy
Fri Aug 23 18:02:42 2019
@@ -22,9 +22,13 @@ import org.apache.ofbiz.base.util.UtilDa
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class ContentTests extends OFBizTestCase {
+ public ContentTests(String name) {
+ super(name)
+ }
-class ContentTests extends GroovyScriptTestCase {
void testGetDataResource() {
Map serviceCtx = [:]
serviceCtx.dataResourceId = 'TEST_RESOURCE'
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderTests.groovy
Fri Aug 23 18:02:42 2019
@@ -20,9 +20,13 @@ package org.apache.ofbiz.order
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class OrderTests extends OFBizTestCase {
+ public OrderTests(String name) {
+ super(name)
+ }
-class OrderTests extends GroovyScriptTestCase {
void testAddRequirementTask() {
Map serviceCtx = [
requirementId: '1000',
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/QuoteTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/QuoteTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/QuoteTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/QuoteTests.groovy
Fri Aug 23 18:02:42 2019
@@ -18,7 +18,7 @@
*/
package org.apache.ofbiz.order
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
import org.apache.ofbiz.order.shoppingcart.ShoppingCart
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.entity.GenericValue
@@ -31,7 +31,10 @@ import static org.apache.ofbiz.base.util
import static org.apache.ofbiz.entity.condition.EntityCondition.makeCondition
import static
org.apache.ofbiz.entity.condition.EntityComparisonOperator.GREATER_THAN_EQUAL_TO
-class QuoteTests extends GroovyScriptTestCase {
+class QuoteTests extends OFBizTestCase {
+ public QuoteTests(String name) {
+ super(name)
+ }
// Retrieves a particular login record.
private GenericValue getUserLogin(String userLoginId) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/TestCustRequestPermissionCheck.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/TestCustRequestPermissionCheck.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/TestCustRequestPermissionCheck.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/TestCustRequestPermissionCheck.groovy
Fri Aug 23 18:02:42 2019
@@ -21,9 +21,13 @@ package org.apache.ofbiz.order
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class TestCustRequestPermissionCheck extends OFBizTestCase {
+ public TestCustRequestPermissionCheck(String name) {
+ super(name)
+ }
-class TestCustRequestPermissionCheck extends GroovyScriptTestCase {
void testCustRequestPermission() {
Map serviceCtx = [:]
serviceCtx.fromPartyId = 'Company'
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/src/main/groovy/org/apache/ofbiz/party/ContactMechWorkerTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/groovy/org/apache/ofbiz/party/ContactMechWorkerTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/src/main/groovy/org/apache/ofbiz/party/ContactMechWorkerTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/src/main/groovy/org/apache/ofbiz/party/ContactMechWorkerTests.groovy
Fri Aug 23 18:02:42 2019
@@ -20,9 +20,12 @@ package org.apache.ofbiz.party
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.party.contact.ContactMechWorker
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
-class ContactMechWorkerTests extends GroovyScriptTestCase {
+class ContactMechWorkerTests extends OFBizTestCase {
+ public ContactMechWorkerTests(String name) {
+ super(name)
+ }
void testPartyContactMechResolution() {
//control for the DemoCustomer that postal, email, telecom and ftp
contact are present and return correct information
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductFeatureTypeTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductFeatureTypeTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductFeatureTypeTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductFeatureTypeTests.groovy
Fri Aug 23 18:02:42 2019
@@ -21,9 +21,13 @@ package org.apache.ofbiz.product
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class ProductFeatureTypeTests extends OFBizTestCase {
+ public ProductFeatureTypeTests(String name) {
+ super(name)
+ }
-class ProductFeatureTypeTests extends GroovyScriptTestCase {
void testCreateProductFeatureType() {
Map serviceCtx = [:]
serviceCtx.productFeatureTypeId = 'testProdFeat'
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoActionTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoActionTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoActionTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoActionTests.groovy
Fri Aug 23 18:02:42 2019
@@ -27,7 +27,7 @@ import org.apache.ofbiz.entity.util.Enti
import org.apache.ofbiz.order.shoppingcart.CheckOutHelper
import org.apache.ofbiz.order.shoppingcart.ShoppingCart
import org.apache.ofbiz.order.shoppingcart.ShoppingCartItem
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
import org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker
import
org.apache.ofbiz.order.shoppingcart.product.ProductPromoWorker.ActionResultInfo
import org.apache.ofbiz.service.ServiceUtil
@@ -35,7 +35,10 @@ import org.apache.ofbiz.service.ServiceU
import java.sql.Timestamp
import java.util.Map
-class ProductPromoActionTest extends GroovyScriptTestCase {
+class ProductPromoActionTest extends OFBizTestCase {
+ public ProductPromoActionTest(String name) {
+ super(name)
+ }
ShoppingCart loadOrder(String orderId) {
GenericValue permUserLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").cache().queryOne()
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoCondTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoCondTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoCondTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductPromoCondTests.groovy
Fri Aug 23 18:02:42 2019
@@ -24,10 +24,13 @@ import org.apache.ofbiz.base.util.UtilMi
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.order.shoppingcart.ShoppingCart
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
import org.apache.ofbiz.service.ServiceUtil
-class ProductPromoCondTest extends GroovyScriptTestCase {
+class ProductPromoCondTest extends OFBizTestCase {
+ public ProductPromoCondTest(String name) {
+ super(name)
+ }
Map prepareConditionMap(ShoppingCart cart, String condValue) {
return prepareConditionMap(cart, condValue, false)
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductTests.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductTests.groovy?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductTests.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/groovy/org/apache/ofbiz/product/ProductTests.groovy
Fri Aug 23 18:02:42 2019
@@ -22,9 +22,13 @@ import org.apache.ofbiz.base.util.UtilDa
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityQuery
import org.apache.ofbiz.service.ServiceUtil
-import org.apache.ofbiz.testtools.GroovyScriptTestCase
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class ProductTests extends OFBizTestCase {
+ public ProductTests(String name) {
+ super(name)
+ }
-class ProductTests extends GroovyScriptTestCase {
void testUpdateProductCategory() {
Map serviceCtx = [:]
serviceCtx.categoryName = 'Updated Test Product Category'
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=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/dtd/test-suite.xsd Fri Aug
23 18:02:42 2019
@@ -84,28 +84,6 @@ under the License.
</xs:attribute>
</xs:attributeGroup>
- <xs:element name="groovy-test-suite" substitutionGroup="TestCaseTypes">
- <xs:annotation>
- <xs:documentation>
- Used for JUnit test suites written as a Groovy class. See
http://groovy-lang.org/testing.html
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attributeGroup ref="attlist.groovy-test-suite"/>
- </xs:complexType>
- </xs:element>
- <xs:attributeGroup name="attlist.groovy-test-suite">
- <xs:attribute type="xs:string" name="name"/>
- <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/groovyScripts/test/MySuiteTest.groovy
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:attributeGroup>
-
<xs:element name="service-test" substitutionGroup="TestCaseTypes">
<xs:complexType>
<xs:attributeGroup ref="attlist.service-test"/>
Modified:
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java?rev=1865787&r1=1865786&r2=1865787&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/ModelTestSuite.java
Fri Aug 23 18:02:42 2019
@@ -106,14 +106,6 @@ public class ModelTestSuite {
String errMsg = "Unable to load test suite class : " +
className;
Debug.logError(e, errMsg, module);
}
- } else if ("groovy-test-suite".equals(nodeName)) {
- try {
- Class<? extends TestCase> testClass =
-
UtilGenerics.cast(GroovyUtil.getScriptClassFromLocation(testElement.getAttribute("location")));
- this.testList.add(new TestSuite(testClass,
testElement.getAttribute("name")));
- } catch (GeneralException e) {
- Debug.logError(e, module);
- }
} else if ("service-test".equals(nodeName)) {
this.testList.add(new ServiceTest(caseName, testElement));
} else if ("simple-method-test".equals(nodeName)) {
@@ -188,10 +180,6 @@ public class ModelTestSuite {
if (test instanceof OFBizTestCase) {
((OFBizTestCase)test).setDispatcher(dispatcher);
}
- } else if (test instanceof GroovyScriptTestCase) {
- ((GroovyScriptTestCase)test).setDelegator(delegator);
- ((GroovyScriptTestCase)test).setDispatcher(dispatcher);
- ((GroovyScriptTestCase)test).setSecurity(dispatcher.getSecurity());
}
}
}
