svn commit: r826220 - in /ofbiz/trunk/applications/product: script/org/ofbiz/shipment/shipment/ShipmentServices.xml script/org/ofbiz/shipment/test/ShipmentTests.xml testdef/FacilityTest.xml testdef/ProductTest.xml

[lektran]

Author: lektran
Date: Sat Oct 17 10:37:32 2009
New Revision: 826220

URL: http://svn.apache.org/viewvc?rev=826220&view=rev
Log:
Moved a shipment test definition out of the product tests def and into the shipments.
Also moved the test itself out of ShipmentServices.xml and into ShipmentTests.xml

Modified:
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml
    ofbiz/trunk/applications/product/testdef/FacilityTest.xml
    ofbiz/trunk/applications/product/testdef/ProductTest.xml

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=826220&r1=826219&r2=826220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Sat Oct 17 10:37:32 2009
@@ -2092,28 +2092,5 @@
         <remove-value value-field="quantityBreak"/>
         <check-errors/>
     </simple-method>
-
-     <!--Service for test Shipment Service -->
-    <simple-method method-name="testCreateShipmentRouteSegment" short-description="Test to create Shipment Route Segment" login-required="false">
-        <log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
-        <set field="shipRouteSegMap.shipmentId" value="10000"/>
-
-        <entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
-            <field-map field-name="userLoginId" value="system"/>
-        </entity-one>
-        <call-service service-name="createShipmentRouteSegment" in-map-name="shipRouteSegMap">
-            <result-to-field result-name="shipmentRouteSegmentId" field="routeSegMap.shipmentRouteSegmentId"/>
-        </call-service>
-        <entity-one entity-name="ShipmentRouteSegment" value-field="shipmentRouteSegment">
-            <field-map field-name="shipmentId" from-field="shipRouteSegMap.shipmentId"/>
-            <field-map field-name="shipmentRouteSegmentId" from-field="routeSegMap.shipmentRouteSegmentId"/>
-        </entity-one>
-        <assert>
-            <not><if-empty field="shipmentRouteSegment"/></not>
-            <if-compare-field field="shipmentRouteSegment.shipmentId" to-field="shipRouteSegMap.shipmentId" operator="equals"/>
-            <if-compare-field field="shipmentRouteSegment.shipmentRouteSegmentId" to-field="routeSegMap.shipmentRouteSegmentId" operator="equals"/>
-        </assert>
-        <check-errors/>
-    </simple-method>
 </simple-methods>
 

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=826220&r1=826219&r2=826220&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 Oct 17 10:37:32 2009
@@ -198,4 +198,26 @@
         </assert>
         <check-errors/>
     </simple-method>
+
+    <simple-method method-name="testCreateShipmentRouteSegment" short-description="Test to create Shipment Route Segment" login-required="false">
+        <log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
+        <set field="shipRouteSegMap.shipmentId" value="10000"/>
+
+        <entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
+            <field-map field-name="userLoginId" value="system"/>
+        </entity-one>
+        <call-service service-name="createShipmentRouteSegment" in-map-name="shipRouteSegMap">
+            <result-to-field result-name="shipmentRouteSegmentId" field="routeSegMap.shipmentRouteSegmentId"/>
+        </call-service>
+        <entity-one entity-name="ShipmentRouteSegment" value-field="shipmentRouteSegment">
+            <field-map field-name="shipmentId" from-field="shipRouteSegMap.shipmentId"/>
+            <field-map field-name="shipmentRouteSegmentId" from-field="routeSegMap.shipmentRouteSegmentId"/>
+        </entity-one>
+        <assert>
+            <not><if-empty field="shipmentRouteSegment"/></not>
+            <if-compare-field field="shipmentRouteSegment.shipmentId" to-field="shipRouteSegMap.shipmentId" operator="equals"/>
+            <if-compare-field field="shipmentRouteSegment.shipmentRouteSegmentId" to-field="routeSegMap.shipmentRouteSegmentId" operator="equals"/>
+        </assert>
+        <check-errors/>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/product/testdef/FacilityTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/testdef/FacilityTest.xml?rev=826220&r1=826219&r2=826220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/testdef/FacilityTest.xml (original)
+++ ofbiz/trunk/applications/product/testdef/FacilityTest.xml Sat Oct 17 10:37:32 2009
@@ -44,4 +44,8 @@
     <test-case case-name="receiveInventoryItemNonSerialized-test">
         <simple-method-test location="component://product/script/org/ofbiz/shipment/test/ShipmentTests.xml" name="testReceiveInventoryNonSerialized"/>
     </test-case>
+
+    <test-case case-name="testCreateShipmentRouteSegment-test">
+        <simple-method-test location="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml" name="testCreateShipmentRouteSegment"/>
+    </test-case>
 </test-suite>
\ No newline at end of file

Modified: ofbiz/trunk/applications/product/testdef/ProductTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/testdef/ProductTest.xml?rev=826220&r1=826219&r2=826220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/testdef/ProductTest.xml (original)
+++ ofbiz/trunk/applications/product/testdef/ProductTest.xml Sat Oct 17 10:37:32 2009
@@ -22,12 +22,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
 
-    <!-- TODO: TO run one test case at a time comment to others -->
-
     <!--test-case case-name="inventoryAdjustment-test">
         <junit-test-suite class-name="org.ofbiz.product.test.PhysicalInventoryAdjustmentTest"/>
     </test-case-->
-    <test-case case-name="testReceiveShipment Direct Simple Method">
-        <simple-method-test location="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml" name="testCreateShipmentRouteSegment"/>
-    </test-case>
 </test-suite>
\ No newline at end of file