Author: adrianc
Date: Sat May 12 12:07:40 2012 New Revision: 1337518 URL: http://svn.apache.org/viewvc?rev=1337518&view=rev Log: Fixed tests that were failing due to the recent Mini-language changes. Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=1337518&r1=1337517&r2=1337518&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml Sat May 12 12:07:40 2012 @@ -152,7 +152,7 @@ under the License. </call-class-method> <assert> <or> - <if-compare-field field="amountTotal" operator="equals" to-field="invoiceTotal"/> + <if-compare-field field="amountTotal" operator="equals" to-field="invoiceTotal" type="BigDecimal"/> </or> </assert> <check-errors/> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml?rev=1337518&r1=1337517&r2=1337518&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/FixedAssetTests.xml Sat May 12 12:07:40 2012 @@ -126,7 +126,7 @@ under the License. <entity-one entity-name="FixedAssetMeter" value-field="fixedAssetMeter"/> <assert> <not><if-empty field="fixedAssetMeter"/></not> - <if-compare-field field="fixedAssetMeter.meterValue" operator="equals" to-field="meterValue"/> + <if-compare-field field="fixedAssetMeter.meterValue" operator="equals" to-field="meterValue" type="BigDecimal"/> </assert> <check-errors/> </simple-method> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml?rev=1337518&r1=1337517&r2=1337518&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml Sat May 12 12:07:40 2012 @@ -62,8 +62,8 @@ under the License. </call-class-method> <set field="zero" value="0" type="BigDecimal"/> <assert> - <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero"/> - <if-compare-field operator="equals" field="notAppliedInvoice" to-field="zero"/> + <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero" type="BigDecimal"/> + <if-compare-field operator="equals" field="notAppliedInvoice" to-field="zero" type="BigDecimal"/> </assert> <check-errors/> <remove-value value-field="paymentApplication"/> @@ -98,7 +98,7 @@ under the License. <not><if-empty field="paymentApplication"/></not> <if-compare-field field="paymentApplication.billingAccountId" operator="equals" to-field="serviceInMap.billingAccountId"/> <if-compare-field field="paymentApplication.paymentId" operator="equals" to-field="serviceInMap.paymentId"/> - <if-compare-field field="paymentApplication.amountApplied" operator="equals" to-field="payment.amount"/> + <if-compare-field field="paymentApplication.amountApplied" operator="equals" to-field="payment.amount" type="BigDecimal"/> </assert> <check-errors/> <!-- both payment and invoice should be completely applied --> @@ -112,8 +112,8 @@ under the License. </call-class-method> <set field="zero" value="0" type="BigDecimal"/> <assert> - <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero"/> - <if-compare-field operator="equals" field="appliedBilling" to-field="paymentAmount"/> + <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero" type="BigDecimal"/> + <if-compare-field operator="equals" field="appliedBilling" to-field="paymentAmount" type="BigDecimal"/> </assert> <check-errors/> <remove-value value-field="paymentApplication"/> @@ -147,7 +147,7 @@ under the License. <not><if-empty field="paymentApplication"/></not> <if-compare-field field="paymentApplication.toPaymentId" operator="equals" to-field="serviceInMap.toPaymentId"/> <if-compare-field field="paymentApplication.paymentId" operator="equals" to-field="serviceInMap.paymentId"/> - <if-compare-field field="paymentApplication.amountApplied" operator="equals" to-field="payment.amount"/> + <if-compare-field field="paymentApplication.amountApplied" operator="equals" to-field="payment.amount" type="BigDecimal"/> </assert> <check-errors/> <!-- both payment and invoice should be completely applied --> @@ -161,8 +161,8 @@ under the License. </call-class-method> <set field="zero" value="0" type="BigDecimal"/> <assert> - <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero"/> - <if-compare-field operator="equals" field="notAppliedToPayment" to-field="zero"/> + <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero" type="BigDecimal"/> + <if-compare-field operator="equals" field="notAppliedToPayment" to-field="zero" type="BigDecimal"/> </assert> <check-errors/> <remove-value value-field="paymentApplication"/> @@ -201,7 +201,7 @@ under the License. </call-class-method> <set field="zero" value="0" type="BigDecimal"/> <assert> - <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero"/> + <if-compare-field operator="equals" field="notAppliedPayment" to-field="zero" type="BigDecimal"/> </assert> <check-errors/> <remove-value value-field="paymentApplication"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=1337518&r1=1337517&r2=1337518&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml Sat May 12 12:07:40 2012 @@ -58,7 +58,7 @@ under the License. <if-compare field="productionRunHeader.workEffortTypeId" operator="equals" value="PROD_ORDER_HEADER"/> <if-compare-field field="productionRunHeader.facilityId" operator="equals" to-field="facilityId"/> <if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare-field field="productionRunHeader.quantityToProduce" operator="equals" to-field="quantity"/> + <if-compare-field field="productionRunHeader.quantityToProduce" operator="equals" to-field="quantity" type="BigDecimal"/> <if-compare-field field="productionRunHeader.estimatedStartDate" operator="equals" to-field="productionRunStartDate" type="Timestamp"/> <if-compare-field field="productionRunHeader.estimatedStartDate" operator="less" to-field="productionRunHeader.estimatedCompletionDate" type="Timestamp"/> </assert> @@ -72,7 +72,7 @@ under the License. <not><if-empty field="productionRunProduct"/></not> <if-compare-field field="productionRunProduct.productId" operator="equals" to-field="productId"/> <if-compare field="productionRunProduct.workEffortGoodStdTypeId" operator="equals" value="PRUN_PROD_DELIV"/> - <if-compare-field field="productionRunProduct.estimatedQuantity" operator="equals" to-field="quantity"/> + <if-compare-field field="productionRunProduct.estimatedQuantity" operator="equals" to-field="quantity" type="BigDecimal"/> </assert> <entity-and list="productionRunTasks" entity-name="WorkEffort"> @@ -86,7 +86,7 @@ under the License. <if-compare-field field="productionRunTask.facilityId" operator="equals" to-field="facilityId"/> <if-compare field="productionRunTask.fixedAssetId" operator="equals" value="WORKCENTER_COST"/> <if-compare field="productionRunTask.currentStatusId" operator="equals" value="PRUN_CREATED"/> - <if-compare-field field="productionRunTask.quantityToProduce" operator="equals" to-field="quantity"/> + <if-compare-field field="productionRunTask.quantityToProduce" operator="equals" to-field="quantity" type="BigDecimal"/> <if-compare-field field="productionRunHeader.estimatedStartDate" operator="equals" to-field="productionRunTask.estimatedStartDate" type="Timestamp"/> <if-compare-field field="productionRunHeader.estimatedCompletionDate" operator="equals" to-field="productionRunTask.estimatedCompletionDate" type="Timestamp"/> <if-compare field="productionRunTask.estimatedSetupMillis" operator="equals" value="600000.00" type="BigDecimal"/> @@ -841,9 +841,9 @@ under the License. <assert> <if-compare field="productionRunHeader.currentStatusId" operator="equals" value="PRUN_CLOSED"/> - <if-compare-field field="productionRunHeader.quantityProduced" operator="equals" to-field="quantity"/> + <if-compare-field field="productionRunHeader.quantityProduced" operator="equals" to-field="quantity" type="BigDecimal"/> <if-compare field="productionRunTask.currentStatusId" operator="equals" value="PRUN_CLOSED"/> - <if-compare-field field="productionRunTask.quantityProduced" operator="equals" to-field="quantity"/> + <if-compare-field field="productionRunTask.quantityProduced" operator="equals" to-field="quantity" type="BigDecimal"/> </assert> <check-errors/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml?rev=1337518&r1=1337517&r2=1337518&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml Sat May 12 12:07:40 2012 @@ -191,9 +191,9 @@ under the License. <not><if-empty field="shipmentReceipt"></if-empty></not> <if-compare-field field="inventoryItem.productId" operator="equals" to-field="serviceCtx.productId"/> <if-compare-field field="inventoryItem.facilityId" operator="equals" to-field="serviceCtx.facilityId"/> - <if-compare-field field="inventoryItem.quantityOnHandTotal" operator="equals" to-field="serviceCtx.quantityAccepted"/> - <if-compare-field field="inventoryItem.availableToPromiseTotal" operator="equals" to-field="serviceCtx.quantityAccepted"/> - <if-compare-field field="shipmentReceipt.quantityAccepted" operator="equals" to-field="serviceCtx.quantityAccepted"/> + <if-compare-field field="inventoryItem.quantityOnHandTotal" operator="equals" to-field="serviceCtx.quantityAccepted" type="BigDecimal"/> + <if-compare-field field="inventoryItem.availableToPromiseTotal" operator="equals" to-field="serviceCtx.quantityAccepted" type="BigDecimal"/> + <if-compare-field field="shipmentReceipt.quantityAccepted" operator="equals" to-field="serviceCtx.quantityAccepted" type="BigDecimal"/> <if-compare-field field="shipmentReceipt.productId" operator="equals" to-field="serviceCtx.productId"/> </assert> <check-errors/> |
Free forum by Nabble | Edit this page |