svn commit: r631218 - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/test/SalesOrderTest.java testdef/OrderTest.xml

[mor-2]

Author: mor
Date: Tue Feb 26 06:08:30 2008
New Revision: 631218

URL: http://svn.apache.org/viewvc?rev=631218&view=rev
Log:
Applied patch from Jira issue OFBIZ-1469 (https://issues.apache.org/jira/browse/OFBIZ-1469)
containing JUnit test case for Creating Sales Order.
Thanks to Alok Agnihotri for posting a new patch resolving conflicts and testing this exclusively

Added:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java
Modified:
    ofbiz/trunk/applications/order/testdef/OrderTest.xml

Added: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java?rev=631218&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java (added)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java Tue Feb 26 06:08:30 2008
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * 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.ofbiz.order.test;
+
+import junit.framework.TestCase;
+import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.GenericDispatcher;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.base.util.UtilMisc;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import javolution.util.FastMap;
+
+public class SalesOrderTest extends TestCase {
+
+    protected LocalDispatcher dispatcher = null;
+    protected GenericDelegator delegator = null;
+    protected GenericValue userLogin = null;
+
+    public SalesOrderTest(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        delegator = GenericDelegator.getGenericDelegator("test");
+        dispatcher = GenericDispatcher.getLocalDispatcher("test-dispatcher", delegator);
+        userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system"));
+    }
+
+    protected void tearDown() throws Exception {
+    }
+
+    public void testCreateSalesOrder() throws Exception {
+        Map ctx = UtilMisc.toMap("partyId", "DemoCustomer", "orderTypeId", "SALES_ORDER", "currencyUom", "USD", "productStoreId", "9000");
+        
+        List orderPaymentInfo = new ArrayList();
+        GenericValue orderContactMech = delegator.makeValue("OrderContactMech", UtilMisc.toMap("contactMechId", "9015", "contactMechPurposeTypeId", "BILLING_LOCATION"));
+        orderPaymentInfo.add(orderContactMech);
+        
+        GenericValue orderPaymentPreference = delegator.makeValue("OrderPaymentPreference", UtilMisc.toMap("paymentMethodId", "9015", "paymentMethodTypeId", "CREDIT_CARD",
+                "statusId", "PAYMENT_NOT_AUTH", "overflowFlag", "N", "maxAmount", new Double(49.26)));
+        orderPaymentInfo.add(orderPaymentPreference);
+        ctx.put("orderPaymentInfo", orderPaymentInfo);
+        
+        List orderItemShipGroupInfo = new ArrayList();
+        orderContactMech.set("contactMechPurposeTypeId", "SHIPPING_LOCATION");
+        orderItemShipGroupInfo.add(orderContactMech);
+      
+        GenericValue orderItemShipGroup = delegator.makeValue("OrderItemShipGroup", UtilMisc.toMap("carrierPartyId", "UPS", "contactMechId", "9015", "isGift", "N",
+                "shipGroupSeqId", "00001", "shipmentMethodTypeId", "NEXT_DAY"));
+        orderItemShipGroupInfo.add(orderItemShipGroup);
+        
+        GenericValue orderItemShipGroupAssoc = delegator.makeValue("OrderItemShipGroupAssoc", UtilMisc.toMap("orderItemSeqId", "00001", "quantity", new Double(1.0), "shipGroupSeqId", "00001"));
+        orderItemShipGroupInfo.add(orderItemShipGroupAssoc);
+        
+        GenericValue orderAdjustment = null;
+        orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "SHIPPING_CHARGES", "shipGroupSeqId", "00001", "amount", new Double(12.45)));
+        orderItemShipGroupInfo.add(orderAdjustment);
+        
+        orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "SALES_TAX", "orderItemSeqId", "00001", "overrideGlAccountId", "224153",
+                "primaryGeoId", "UT", "shipGroupSeqId", "00001", "sourcePercentage", new BigDecimal(4.7)));
+        orderAdjustment.set("taxAuthGeoId", "UT");
+        orderAdjustment.set("taxAuthPartyId", "UT_TAXMAN");
+        orderAdjustment.set("taxAuthorityRateSeqId", "9004");
+        orderAdjustment.set("amount", new BigDecimal(1.824));
+        orderAdjustment.set("comments", "Utah State Sales Tax");
+        orderItemShipGroupInfo.add(orderAdjustment);
+        
+        orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "SALES_TAX", "orderItemSeqId", "00001", "overrideGlAccountId", "224153",
+                "primaryGeoId", "UT-UTAH", "shipGroupSeqId", "00001", "sourcePercentage", new BigDecimal(0.1)));
+        orderAdjustment.set("taxAuthGeoId", "UT-UTAH");
+        orderAdjustment.set("taxAuthPartyId", "UT_UTAH_TAXMAN");
+        orderAdjustment.set("taxAuthorityRateSeqId", "9005");
+        orderAdjustment.set("amount", new BigDecimal(0.039));
+        orderAdjustment.set("comments", "Utah County, Utah Sales Tax");
+        orderItemShipGroupInfo.add(orderAdjustment);
+
+        orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "SALES_TAX", "orderItemSeqId", "00001", "overrideGlAccountId", "224000",
+                "primaryGeoId", "_NA_", "shipGroupSeqId", "00001", "sourcePercentage", new BigDecimal(1)));
+        orderAdjustment.set("taxAuthGeoId", "_NA_");
+        orderAdjustment.set("taxAuthPartyId", "_NA_");
+        orderAdjustment.set("taxAuthorityRateSeqId", "9000");
+        orderAdjustment.set("amount", new BigDecimal(0.384));
+        orderAdjustment.set("comments", "1% OFB _NA_ Tax");
+        orderItemShipGroupInfo.add(orderAdjustment);
+        
+        ctx.put("orderItemShipGroupInfo", orderItemShipGroupInfo);
+        
+        List orderAdjustments = new ArrayList();
+        orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", "productPromoActionSeqId", "01", "productPromoId", "9011", "productPromoRuleId", "01", "amount", new BigDecimal(-3.84)));
+        orderAdjustments.add(orderAdjustment);
+        ctx.put("orderAdjustments", orderAdjustments);
+
+        List orderItems = new ArrayList();
+        GenericValue orderItem = delegator.makeValue("OrderItem", UtilMisc.toMap("orderItemSeqId", "00001", "orderItemTypeId", "PRODUCT_ORDER_ITEM", "prodCatalogId", "DemoCatalog", "productId", "GZ-2644", "quantity", new Double(1), "selectedAmount", new Double(0.0)));
+        orderItem.set("isPromo", "N");
+        orderItem.set("isModifiedPrice", "N");
+        orderItem.set("unitPrice", new Double(38.4));
+        orderItem.set("unitListPrice", new Double(48.0));
+        orderItem.set("statusId", "ITEM_CREATED");
+        
+        orderItems.add(orderItem);
+        ctx.put("orderItems", orderItems);
+        
+        List orderTerms = new ArrayList();
+        ctx.put("orderTerms", orderTerms);
+
+        GenericValue OrderContactMech = delegator.makeValue("OrderContactMech", FastMap.newInstance());
+        OrderContactMech.set("contactMechPurposeTypeId", "SHIPPING_LOCATION");
+        OrderContactMech.set("contactMechId", "10000");
+        List orderContactMechs = new ArrayList();
+        orderContactMechs.add(OrderContactMech);
+        
+        ctx.put("placingCustomerPartyId", "DemoCustomer");
+        ctx.put("endUserCustomerPartyId", "DemoCustomer");
+        ctx.put("shipToCustomerPartyId", "DemoCustomer");
+        ctx.put("billToCustomerPartyId", "DemoCustomer");
+        ctx.put("billFromVendorPartyId", "Company");
+        
+        ctx.put("userLogin", userLogin);
+        Map resp = dispatcher.runSync("storeOrder", ctx);
+        String orderId = (String) resp.get("orderId");
+        String statusId = (String) resp.get("statusId");
+        assertNotNull(orderId);
+        assertNotNull(statusId);
+    }
+}
\ No newline at end of file

Modified: ofbiz/trunk/applications/order/testdef/OrderTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/testdef/OrderTest.xml?rev=631218&r1=631217&r2=631218&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/testdef/OrderTest.xml (original)
+++ ofbiz/trunk/applications/order/testdef/OrderTest.xml Tue Feb 26 06:08:30 2008
@@ -24,4 +24,7 @@
     <test-case case-name="purchaseOrder-test">
         <junit-test-suite class-name="org.ofbiz.order.test.PurchaseOrderTest"/>
     </test-case>
+    <test-case case-name="salesOrder-test">
+        <junit-test-suite class-name="org.ofbiz.order.test.SalesOrderTest"/>
+    </test-case>
 </test-suite>