svn commit: r1868449 - in /ofbiz/ofbiz-framework/trunk/applications/accounting: minilang/test/AutoAcctgAgreementTests.xml src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy testdef/accountingtests.xml

[Pawan Verma-2]

Author: pawan
Date: Mon Oct 14 13:31:22 2019
New Revision: 1868449

URL: http://svn.apache.org/viewvc?rev=1868449&view=rev
Log:
Improved: Convert AutoAcctgAgreementTests Unit Test from XML to Groovy
(OFBIZ-11248)

Thanks: Devanshu Vyas for your contribution.

Added:
    ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy   (with props)
Removed:
    ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/test/AutoAcctgAgreementTests.xml
Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml

Added: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy?rev=1868449&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy (added)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy Mon Oct 14 13:31:22 2019
@@ -0,0 +1,87 @@
+/*
+ * 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.accounting
+
+import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.entity.util.EntityQuery
+import org.apache.ofbiz.service.ServiceUtil
+import org.apache.ofbiz.service.testtools.OFBizTestCase
+
+class AutoAcctgAgreementTests extends OFBizTestCase {
+    public AutoAcctgAgreementTests(String name) {
+        super(name)
+    }
+
+    void testAddPaymentMethodTypeGlAssignment() {
+        Map serviceCtx = [
+                agreementId: '1000',
+                userLogin: userLogin
+        ]
+        Map serviceResult = dispatcher.runSync('expireAgreement', serviceCtx)
+        assert ServiceUtil.isSuccess(serviceResult)
+
+        GenericValue agreement = EntityQuery.use(delegator).from('Agreement')
+                .where('agreementId', '1000')
+                .filterByDate()
+                .queryOne()
+        assert agreement == null
+    }
+
+    void testCopyAgreement() {
+        Map serviceCtx = [
+                agreementId: '1010',
+                copyAgreementTerms: 'N',
+                copyAgreementProducts: 'Y',
+                userLogin: userLogin
+        ]
+        Map serviceResult = dispatcher.runSync('copyAgreement', serviceCtx)
+        assert ServiceUtil.isSuccess(serviceResult)
+
+        GenericValue agreement = EntityQuery.use(delegator).from('Agreement')
+                .where('agreementId', serviceResult.agreementId)
+                .queryOne()
+        List<GenericValue> agreementItems = agreement.getRelated("AgreementItem", null, null, false)
+        List<GenericValue> agreementTerms = agreement.getRelated("AgreementTerm", null, null, false)
+        List<GenericValue> agreementProductAppls = agreement.getRelated("AgreementProductAppl", null, null, false)
+
+        assert agreement
+        assert agreementItems
+        assert agreementTerms?.isEmpty()
+        assert agreementProductAppls
+    }
+
+    void testGetCommissionForProduct() {
+        Map serviceCtx = [
+                productId: 'TestProduct2',
+                invoiceItemSeqId: 'COMM_INV_ITEM',
+                invoiceItemTypeId: 'COMM_INV_ITEM',
+                amount: 100.00,
+                userLogin: userLogin
+        ]
+        Map serviceResult = dispatcher.runSync('getCommissionForProduct', serviceCtx)
+        assert ServiceUtil.isSuccess(serviceResult)
+
+        List<Map<String, Object>> commissions = serviceResult.commissions
+        Map<String, Object> commission = commissions?.first()
+
+        assert commission
+        assert commission.commission == 10.00
+    }
+
+}
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAgreementTests.groovy
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml?rev=1868449&r1=1868448&r2=1868449&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml Mon Oct 14 13:31:22 2019
@@ -40,7 +40,7 @@
         <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgAdminTests"/>
     </test-case>
     <test-case case-name="auto-accounting-agreement-tests">
-        <simple-method-test location="component://accounting/minilang/test/AutoAcctgAgreementTests.xml"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgAgreementTests"/>
     </test-case>
     <test-case case-name="auto-accounting-budget-tests">
         <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgBudgetTests"/>