You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pa...@apache.org on 2019/10/09 04:45:21 UTC
svn commit: r1868167 - in
/ofbiz/ofbiz-framework/trunk/applications/accounting:
minilang/test/AutoAcctgAdminTests.xml
src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy
testdef/accountingtests.xml
Author: pawan
Date: Wed Oct 9 04:45:21 2019
New Revision: 1868167
URL: http://svn.apache.org/viewvc?rev=1868167&view=rev
Log:
Improved: Convert AutoAcctgAdminTests Unit Test from XML to Groovy
(OFBIZ-11243)
Thanks: Jacques Le Roux for the review and test.
Added:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy (with props)
Removed:
ofbiz/ofbiz-framework/trunk/applications/accounting/minilang/test/AutoAcctgAdminTests.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/AutoAcctgAdminTests.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy?rev=1868167&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy (added)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy Wed Oct 9 04:45:21 2019
@@ -0,0 +1,253 @@
+/*
+ * 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 AutoAcctgAdminTests extends OFBizTestCase {
+ public AutoAcctgAdminTests(String name) {
+ super(name)
+ }
+
+ void testGetFXConversion() {
+ Map serviceCtx = [
+ uomId: 'EUR',
+ uomIdTo: 'USD',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').cache().queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync("getFXConversion", serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+ }
+
+ void testAddPaymentMethodTypeGlAssignment() {
+ Map serviceCtx = [
+ paymentMethodTypeId: 'GIFT_CARD',
+ organizationPartyId: 'DEMO_COMPANY1',
+ glAccountId: '999999',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('addPaymentMethodTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue paymentMethodTypeGlAccount = EntityQuery.use(delegator).from('PaymentMethodTypeGlAccount')
+ .where('paymentMethodTypeId', 'GIFT_CARD',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert paymentMethodTypeGlAccount
+ assert paymentMethodTypeGlAccount.glAccountId == '999999'
+ }
+
+ void testRemovePaymentTypeGlAssignment() {
+ Map serviceCtx = [
+ paymentTypeId: 'COMMISSION_PAYMENT',
+ organizationPartyId: 'DEMO_COMPANY1',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('removePaymentTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue paymentMethodTypeGlAccount = EntityQuery.use(delegator).from('PaymentGlAccountTypeMap')
+ .where('paymentTypeId', 'COMMISSION_PAYMENT',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert paymentMethodTypeGlAccount == null
+ }
+
+ void testCreatePartyAcctgPreference() {
+ Map serviceCtx = [
+ partyId: 'DEMO_COMPANY',
+ refundPaymentMethodId: '9020',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('createPartyAcctgPreference', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue partyAcctgPreference = EntityQuery.use(delegator).from('PartyAcctgPreference')
+ .where('partyId', 'DEMO_COMPANY')
+ .queryOne()
+ assert partyAcctgPreference
+ assert partyAcctgPreference.partyId == 'DEMO_COMPANY'
+ assert partyAcctgPreference.refundPaymentMethodId == '9020'
+ }
+
+ void testUpdatePartyAcctgPreference() {
+ Map serviceCtx = [
+ partyId: 'DEMO_COMPANY1',
+ refundPaymentMethodId: '9020',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('updatePartyAcctgPreference', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue partyAcctgPreference = EntityQuery.use(delegator).from('PartyAcctgPreference')
+ .where('partyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert partyAcctgPreference
+ assert partyAcctgPreference.refundPaymentMethodId == '9020'
+ }
+
+ void testGetPartyAccountingPreferences() {
+ Map serviceCtx = [
+ organizationPartyId: 'DEMO_COMPANY1',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('getPartyAccountingPreferences', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+ assert serviceResult.partyAccountingPreference != null
+ }
+
+ void testSetAcctgCompany() {
+ Map serviceCtx = [
+ organizationPartyId: 'DEMO_COMPANY1',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('setAcctgCompany', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue userPreference = EntityQuery.use(delegator).from('UserPreference')
+ .where('userPrefValue', 'DEMO_COMPANY1')
+ .queryFirst()
+ assert userPreference
+ assert userPreference.userPrefGroupTypeId == 'GLOBAL_PREFERENCES'
+ assert userPreference.userPrefTypeId == 'ORGANIZATION_PARTY'
+ }
+
+ void testUpdateFXConversion() {
+ Map serviceCtx = [
+ uomId: 'INR',
+ uomIdTo: 'USD',
+ conversionFactor: 2.0,
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('updateFXConversion', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue uomConversionDated = EntityQuery.use(delegator).from('UomConversionDated')
+ .where('uomId', 'INR', 'uomIdTo', 'USD')
+ .queryFirst()
+ assert uomConversionDated
+ assert uomConversionDated.conversionFactor == 2.0
+ }
+
+ void testCreateGlAccountTypeDefault() {
+ Map serviceCtx = [
+ glAccountTypeId: 'BALANCE_ACCOUNT',
+ organizationPartyId: 'DEMO_COMPANY1',
+ glAccountId: '999999',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('createGlAccountTypeDefault', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue glAccountTypeDefault = EntityQuery.use(delegator).from('GlAccountTypeDefault')
+ .where('glAccountTypeId', 'BALANCE_ACCOUNT', 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert glAccountTypeDefault
+ assert glAccountTypeDefault.glAccountId == '999999'
+ }
+
+ void testRemoveGlAccountTypeDefault() {
+ Map serviceCtx = [
+ glAccountTypeId: 'ACCOUNTS_PAYABLE',
+ organizationPartyId: 'DEMO_COMPANY1',
+ glAccountId: '999999',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('removeGlAccountTypeDefault', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue glAccountTypeDefault = EntityQuery.use(delegator).from('GlAccountTypeDefault')
+ .where('glAccountTypeId', 'ACCOUNTS_PAYABLE',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert glAccountTypeDefault == null
+ }
+
+ void testAddInvoiceItemTypeGlAssignment() {
+ Map serviceCtx = [
+ invoiceItemTypeId: 'PINV_FPROD_ITEM',
+ organizationPartyId: 'DEMO_COMPANY1',
+ glAccountId: '999999',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('addInvoiceItemTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue invoiceItemTypeGlAccount = EntityQuery.use(delegator).from('InvoiceItemTypeGlAccount')
+ .where('invoiceItemTypeId', 'PINV_FPROD_ITEM',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert invoiceItemTypeGlAccount
+ assert invoiceItemTypeGlAccount.glAccountId == '999999'
+ }
+
+ void testRemoveInvoiceItemTypeGlAssignment() {
+ Map serviceCtx = [
+ invoiceItemTypeId: 'PINV_SALES_TAX',
+ organizationPartyId: 'DEMO_COMPANY1',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('removeInvoiceItemTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue invoiceItemTypeGlAccount = EntityQuery.use(delegator).from('InvoiceItemTypeGlAccount')
+ .where('invoiceItemTypeId', 'PINV_SALES_TAX',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert invoiceItemTypeGlAccount == null
+ }
+
+ void testAddPaymentTypeGlAssignment() {
+ Map serviceCtx = [
+ paymentTypeId: 'TAX_PAYMENT',
+ organizationPartyId: 'DEMO_COMPANY1',
+ glAccountTypeId: 'TAX_ACCOUNT',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('addPaymentTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue paymentGlAccountTypeMap = EntityQuery.use(delegator).from('PaymentGlAccountTypeMap')
+ .where('paymentTypeId', 'TAX_PAYMENT',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert paymentGlAccountTypeMap
+ assert paymentGlAccountTypeMap.glAccountTypeId == 'TAX_ACCOUNT'
+ }
+
+ void testRemovePaymentMethodTypeGlAssignment() {
+ Map serviceCtx = [
+ paymentMethodTypeId: 'CASH',
+ organizationPartyId: 'DEMO_COMPANY1',
+ userLogin: EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').queryOne()
+ ]
+ Map serviceResult = dispatcher.runSync('removePaymentMethodTypeGlAssignment', serviceCtx)
+ assert ServiceUtil.isSuccess(serviceResult)
+
+ GenericValue paymentMethodTypeGlAccount = EntityQuery.use(delegator).from('PaymentMethodTypeGlAccount')
+ .where('paymentMethodTypeId', 'CASH',
+ 'organizationPartyId', 'DEMO_COMPANY1')
+ .queryOne()
+ assert paymentMethodTypeGlAccount == null
+ }
+
+}
\ No newline at end of file
Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.groovy
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/AutoAcctgAdminTests.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=1868167&r1=1868166&r2=1868167&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/testdef/accountingtests.xml Wed Oct 9 04:45:21 2019
@@ -37,7 +37,7 @@
<simple-method-test location="component://accounting/minilang/test/AutoAcctgTransTestsPurchase.xml"/>
</test-case>
<test-case case-name="auto-accounting-admin-tests">
- <simple-method-test location="component://accounting/minilang/test/AutoAcctgAdminTests.xml"/>
+ <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"/>