Author: jacopoc
Date: Fri Mar 28 14:38:06 2014
New Revision: 1582764
URL: http://svn.apache.org/r1582764
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/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1582762
Modified:
ofbiz/branches/release12.04/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml?rev=1582764&r1=1582763&r2=1582764&view=diff
==============================================================================
---
ofbiz/branches/release12.04/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
(original)
+++
ofbiz/branches/release12.04/applications/manufacturing/script/org/ofbiz/manufacturing/test/ProductionRunTests.xml
Fri Mar 28 14:38:06 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/>
