Author: hansbak
Date: Tue Oct 25 06:01:41 2011
New Revision: 1188521
URL:
http://svn.apache.org/viewvc?rev=1188521&view=revLog:
fix some test cases which did run on derby but not progresql
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
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=1188521&r1=1188520&r2=1188521&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 Tue Oct 25 06:01:41 2011
@@ -203,10 +203,10 @@ under the License.
<log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
<entity-and list="shipments" entity-name="Shipment">
<field-map field-name="primaryOrderId" value="DEMO10090"/>
+ <field-map field-name="shipmentId" value="9998"/>
</entity-and>
<first-from-list entry="shipment" list="shipments"/>
<set field="shipRouteSegMap.shipmentId" from-field="shipment.shipmentId"/>
-
<entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java?rev=1188521&r1=1188520&r2=1188521&view=diff==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java Tue Oct 25 06:01:41 2011
@@ -78,7 +78,7 @@ public class IssuanceTest extends OFBizT
assertTrue("Incorrect quantity in OrderShipment. Expected 6.00000 actual " + actual, actual.compareTo(BigDecimal.valueOf(6L))==0);
// Test the ItemIssuances are correct
- List<GenericValue> itemIssuances = delegator.getRelated("ItemIssuance", null, null, orderHeader);
+ List<GenericValue> itemIssuances = delegator.getRelated("ItemIssuance", null, UtilMisc.toList("itemIssuanceId"), orderHeader);
assertFalse("No ItemIssuances for order", UtilValidate.isEmpty(itemIssuances));
assertEquals( "Incorrect number of ItemIssuances for order", 2, itemIssuances.size());