You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/03/28 15:38:49 UTC

svn commit: r1582765 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml

Author: jacopoc
Date: Fri Mar 28 14:38:49 2014
New Revision: 1582765

URL: http://svn.apache.org/r1582765
Log:
Applied fix from trunk for revision: 1582762 
===

Fixed tests failing for DST differences between server and client: the time difference can be 1 or to 2 hours.


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1582762

Modified: ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=1582765&r1=1582764&r2=1582765&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml Fri Mar 28 14:38:49 2014
@@ -273,9 +273,11 @@ under the License.
             <if-compare-field field="productionRunTask.estimatedStartDate" operator="equals" to-field="productionRunNewStartDate" type="Timestamp"/>
             <or>
                 <if-compare field="taskTimeDifference" operator="equals" value="0.0" type="Double"/>
-                <!-- a difference of +1 or -1 hour is accepted because it could be caused by DST change happening in one of the two time periods -->
+                <!-- a difference of +/- 1 or 2 hours is accepted because it could be caused by DST change happening in one of the two time periods -->
                 <if-compare field="taskTimeDifference" operator="equals" value="3600000.0" type="Double"/>
                 <if-compare field="taskTimeDifference" operator="equals" value="-3600000.0" type="Double"/>
+                <if-compare field="taskTimeDifference" operator="equals" value="7200000.0" type="Double"/>
+                <if-compare field="taskTimeDifference" operator="equals" value="-7200000.0" type="Double"/>
             </or>
         </assert>
         <check-errors/>