Author: jleroux
Date: Wed Oct 2 14:46:00 2019
New Revision: 1867889
URL: http://svn.apache.org/viewvc?rev=1867889&view=rev
Log:
Improved: Unit test case for service - SendOrderBackorderNotification
(OFBIZ-8810)(OFBIZ-9647)(OFBIZ-9671)
While working on this I stumbled upon an issue related with
webSiteId="OrderEntry" well related by Ratnesh Upadhyay in OFBIZ-9647.
Unlike him I decided not to remove the webSiteId="OrderEntry" entries but to
replace them by webSiteId="WebStore"
Tests pass!
Added:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
(with props)
Modified:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml
ofbiz/ofbiz-framework/trunk/applications/order/servicedef/secas.xml
ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml
ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml?rev=1867889&r1=1867888&r2=1867889&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml
Wed Oct 2 14:46:00 2019
@@ -2361,7 +2361,7 @@ under the License.
<!--PartyTaxAuthInfo partyId="Company" taxAuthGeoId="FRA"
taxAuthPartyId="FRA_TA" fromDate="2014-01-01 00:00:00.000"
partyTaxId="FR-12345678901" isExempt="N"/-->
<!--Demo data for a sales order -->
- <OrderHeader orderId="DEMO10090" orderTypeId="SALES_ORDER"
salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392"
entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002"
statusId="ORDER_APPROVED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="38.40" grandTotal="50.85"
invoicePerShipment="Y"/>
+ <OrderHeader orderId="DEMO10090" orderTypeId="SALES_ORDER"
salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392"
entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002"
statusId="ORDER_APPROVED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="38.40" grandTotal="50.85"
invoicePerShipment="Y" webSiteId="WebStore"/>
<OrderItem orderId="DEMO10090" orderItemSeqId="00001"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644"
prodCatalogId="DemoCatalog" isPromo="N" quantity="2.0" selectedAmount="0.0"
unitPrice="38.4" unitListPrice="48.0" isModifiedPrice="N"
itemDescription="Round Gizmo" statusId="ITEM_APPROVED"/>
<OrderItemPriceInfo orderItemPriceInfoId="9000" orderId="DEMO10090"
orderItemSeqId="00001" productPriceRuleId="9000" productPriceActionSeqId="01"
modifyAmount="-9.600" description="[PRODUCT_CATEGORY_IDIsPROMOTIONS]
[list:48.0;avgCost:48.0;margin:0.0] [type:PRICE_POL]"/>
@@ -2400,7 +2400,7 @@ under the License.
<!-- Purchase order test data -->
<!--for jira issue - 1782-->
- <OrderHeader orderId="DEMO10091" orderTypeId="PURCHASE_ORDER"
orderName="New Purchase Order" salesChannelEnumId="UNKNWN_SALES_CHANNEL"
orderDate="2008-06-10 13:27:07.024" entryDate="2008-06-10 13:27:07.024"
visitId="10000" statusId="ORDER_CREATED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="108.0" grandTotal="108.0"/>
+ <OrderHeader orderId="DEMO10091" orderTypeId="PURCHASE_ORDER"
orderName="New Purchase Order" salesChannelEnumId="UNKNWN_SALES_CHANNEL"
orderDate="2008-06-10 13:27:07.024" entryDate="2008-06-10 13:27:07.024"
visitId="10000" statusId="ORDER_CREATED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="108.0" grandTotal="108.0"
webSiteId="WebStore"/>
<OrderItem orderId="DEMO10091" orderItemSeqId="00001"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644"
prodCatalogId="DemoCatalog" isPromo="N" quantity="5.0" selectedAmount="0.0"
unitPrice="21.6" unitListPrice="0.0" isModifiedPrice="N"
itemDescription="GZ-2644-5 Round Gizmo" statusId="ITEM_CREATED"/>
<OrderItemPriceInfo orderItemPriceInfoId="10001" orderId="DEMO10091"
orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:5.0,
lastPrice: 21.6]"/>
<OrderItemPriceInfo orderItemPriceInfoId="10002" orderId="DEMO10091"
orderItemSeqId="00001" description="SupplierProduct [minimumOrderQuantity:0.0,
lastPrice: 24.0]"/>
@@ -2423,7 +2423,7 @@ under the License.
<ItemIssuance itemIssuanceId="9003" orderId="DEMO10091"
orderItemSeqId="00001" shipGroupSeqId="00001" shipmentId="9999"
shipmentItemSeqId="00001" issuedDateTime="2009-08-13 17:46:29.603"
quantity="5"/>
<!--Demo Purchase Order data for Accounting-->
- <OrderHeader orderId="Demo1001" orderTypeId="PURCHASE_ORDER"
orderName="Demo Purchase Order " salesChannelEnumId="UNKNWN_SALES_CHANNEL"
orderDate="2009-08-13 17:45:50.419" priority="2" entryDate="2009-08-13
17:45:50.419" statusId="ORDER_COMPLETED" currencyUom="USD"
remainingSubTotal="48.00" grandTotal="48.00"/>
+ <OrderHeader orderId="Demo1001" orderTypeId="PURCHASE_ORDER"
orderName="Demo Purchase Order " salesChannelEnumId="UNKNWN_SALES_CHANNEL"
orderDate="2009-08-13 17:45:50.419" priority="2" entryDate="2009-08-13
17:45:50.419" statusId="ORDER_COMPLETED" currencyUom="USD"
remainingSubTotal="48.00" grandTotal="48.00" webSiteId="WebStore" />
<OrderItem orderId="Demo1001" orderItemSeqId="00001"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644"
prodCatalogId="DemoCatalog" isPromo="N" quantity="2.000000"
selectedAmount="0.000000" unitPrice="24.00" unitListPrice="0.00"
isModifiedPrice="N" itemDescription="GZ-2644-0 Round Gizmo"
statusId="ITEM_COMPLETED" estimatedDeliveryDate="2009-08-13 17:43:53.0"/>
<OrderItemPriceInfo orderItemPriceInfoId="9001" orderId="Demo1001"
orderItemSeqId="00001" description="SupplierProduct
[minimumOrderQuantity:0.000000, lastPrice: 24.000]"/>
<OrderRole orderId="Demo1001" partyId="Company"
roleTypeId="BILL_TO_CUSTOMER" />
@@ -2467,7 +2467,7 @@ under the License.
<AcctgTransEntry acctgTransId="9001" acctgTransEntrySeqId="00002"
acctgTransEntryTypeId="_NA_" partyId="DemoSupplier"
roleTypeId="BILL_FROM_VENDOR" glAccountTypeId="ACCOUNTS_PAYABLE"
glAccountId="210000" organizationPartyId="Company" amount="48.00"
currencyUomId="USD" origAmount="48.00" origCurrencyUomId="USD"
debitCreditFlag="C" reconcileStatusId="AES_NOT_RECONCILED"/>
<!--Demo Sales Order for Accounting-->
- <OrderHeader orderId="Demo1002" orderTypeId="SALES_ORDER" orderName="Demo
Sales Order" salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2009-08-17
14:23:49.475" priority="2" entryDate="2009-08-17 14:23:49.475" visitId="10000"
statusId="ORDER_COMPLETED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="107.98" grandTotal="127.09"/>
+ <OrderHeader orderId="Demo1002" orderTypeId="SALES_ORDER" orderName="Demo
Sales Order" salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2009-08-17
14:23:49.475" priority="2" entryDate="2009-08-17 14:23:49.475" visitId="10000"
statusId="ORDER_COMPLETED" createdBy="admin" currencyUom="USD"
productStoreId="9000" remainingSubTotal="107.98" grandTotal="127.09"
webSiteId="WebStore"/>
<OrderItem orderId="Demo1002" orderItemSeqId="00001"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="WG-1111"
prodCatalogId="DemoCatalog" isPromo="N" quantity="2.000000"
selectedAmount="0.000000" unitPrice="59.99" unitListPrice="60.00"
isModifiedPrice="N" itemDescription="Micro Chrome Widget"
statusId="ITEM_COMPLETED"/>
<OrderItem orderId="Demo1002" orderItemSeqId="00004"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="WG-1111" isPromo="Y"
quantity="1.000000" selectedAmount="0.000000" unitPrice="59.99"
unitListPrice="60.00" isModifiedPrice="N" itemDescription="Micro Chrome Widget"
statusId="ITEM_COMPLETED"/>
<PartyRole partyId="DemoCustomer" roleTypeId="END_USER_CUSTOMER"/>
Added:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml?rev=1867889&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
(added)
+++ ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
Wed Oct 2 14:46:00 2019
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://ofbiz.apache.org/Simple-Method";
xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method
http://ofbiz.apache.org/dtds/simple-methods.xsd";>
+
+ <simple-method method-name="testSendOrderChangeNotification"
short-description="Sends order change confirmation mail" login-required="false">
+ <entity-one entity-name="UserLogin" value-field="userLogin">
+ <field-map field-name="userLoginId" value="system"/>
+ </entity-one>
+ <set-current-user-login value-field="userLogin"/>
+ <set field="serviceCtx.orderId" value="TEST_DEMO10090"/>
+ <set field="serviceCtx.note" value="Test Note"/>
+ <set field="serviceCtx.comments" value="Test comments"/>
+ <set field="serviceCtx.sendTo" value="[email protected]"/>
+ <call-service service-name="sendOrderChangeNotification"
in-map-name="serviceCtx">
+ <results-to-map map-name="serviceResult"/>
+ </call-service>
+ <assert>
+ <not><if-empty field="serviceResult"/></not>
+ <if-compare operator="equals" field="serviceResult.emailType"
value="PRDS_ODR_CHANGE" />
+ </assert>
+ <check-errors/>
+ </simple-method>
+</simple-methods>
\ No newline at end of file
Propchange:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/test/OrderTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/ofbiz-framework/trunk/applications/order/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/servicedef/secas.xml?rev=1867889&r1=1867888&r2=1867889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/servicedef/secas.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/servicedef/secas.xml Wed Oct
2 14:46:00 2019
@@ -403,6 +403,7 @@ under the License.
<condition field-name="oldStatusId" operator="not-equals"
value="CRQ_ACCEPTED"/>
<condition field-name="oldStatusId" operator="not-equals"
value="CRQ_PENDING"/>
<condition field-name="statusId" operator="equals"
value="CRQ_ACCEPTED"/>
+ <condition field-name="webSiteId" operator="equals" value="WebStore"/>
<set field-name="bodyParameters.custRequestId"
env-name="custRequestId"/>
<set field-name="bodyParameters.custRequestName"
env-name="custRequestName"/>
<set field-name="partyIdTo" env-name="fromPartyId"/>
@@ -413,6 +414,7 @@ under the License.
<eca service="setCustRequestStatus" event="commit">
<condition field-name="oldStatusId" operator="not-equals"
value="CRQ_COMPLETED"/>
<condition field-name="statusId" operator="equals"
value="CRQ_COMPLETED"/>
+ <condition field-name="webSiteId" operator="equals" value="WebStore"/>
<set field-name="bodyParameters.custRequestId"
env-name="custRequestId"/>
<set field-name="partyIdTo" env-name="fromPartyId"/>
<set field-name="emailTemplateSettingId" value="CUST_REQ_COMPLETED"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml?rev=1867889&r1=1867888&r2=1867889&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml Wed
Oct 2 14:46:00 2019
@@ -24,6 +24,9 @@ under the License.
<test-case case-name="order-tests-data-load">
<entity-xml action="load"
entity-xml-url="component://order/testdef/data/OrderTestData.xml"/>
</test-case>
+ <test-case case-name="order-tests-data-load">
+ <entity-xml action="load"
entity-xml-url="component://order/testdef/data/OrderTestData.xml"/>
+ </test-case>
<test-case case-name="purchaseOrder-test">
<junit-test-suite
class-name="org.apache.ofbiz.order.test.PurchaseOrderTest"/>
</test-case>
@@ -31,6 +34,9 @@ under the License.
<junit-test-suite
class-name="org.apache.ofbiz.order.test.SalesOrderTest"/>
</test-case>
<test-case case-name="order-test">
+ <simple-method-test
location="component://order/minilang/test/OrderTest.xml"/>
+ </test-case>
+ <test-case case-name="order-test">
<simple-method-test
location="component://order/minilang/test/OrderTests.xml"/>
</test-case>
<test-case case-name="order-tests">
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml?rev=1867889&r1=1867888&r2=1867889&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml
Wed Oct 2 14:46:00 2019
@@ -30,7 +30,7 @@ under the License.
<ProductStoreEmailSetting productStoreId="9000"
emailType="PRDS_ODR_CONFIRM"
bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice"
xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf"
subject="OFBiz Demo - Order Confirmation #${orderId}"
bccAddress="[email protected]" fromAddress="[email protected]"/>
<!--Demo data for a sales order -->
- <OrderHeader orderId="TEST_DEMO10090" orderTypeId="SALES_ORDER"
salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392"
entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002"
statusId="ORDER_APPROVED" currencyUom="USD" productStoreId="9000"
remainingSubTotal="38.40" grandTotal="50.85" invoicePerShipment="Y"/>
+ <OrderHeader orderId="TEST_DEMO10090" orderTypeId="SALES_ORDER"
salesChannelEnumId="WEB_SALES_CHANNEL" orderDate="2008-04-23 16:49:27.392"
entryDate="2008-04-23 16:49:27.392" priority="2" visitId="10002"
statusId="ORDER_APPROVED" currencyUom="USD" productStoreId="9000"
remainingSubTotal="38.40" grandTotal="50.85" invoicePerShipment="Y"
webSiteId="WebStore"/>
<OrderItem orderId="TEST_DEMO10090" orderItemSeqId="00001"
orderItemTypeId="PRODUCT_ORDER_ITEM" productId="GZ-2644"
prodCatalogId="DemoCatalog" isPromo="N" quantity="2.0" selectedAmount="0.0"
unitPrice="38.4" unitListPrice="48.0" isModifiedPrice="N"
itemDescription="Round Gizmo" statusId="ITEM_APPROVED"/>
<Party partyId="TestDemoCustomer" partyTypeId="PERSON"
statusId="PARTY_ENABLED"/>
