You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/08/29 11:22:46 UTC

svn commit: r1518547 - /openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java

Author: hdu
Date: Thu Aug 29 09:22:45 2013
New Revision: 1518547

URL: http://svn.apache.org/r1518547
Log:
#i123138# tolerate integer rounding artifacts in the fvt.uno.sc.chart.ChartLegend autotest

Modified:
    openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java

Modified: openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java?rev=1518547&r1=1518546&r2=1518547&view=diff
==============================================================================
--- openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java (original)
+++ openoffice/trunk/test/testuno/source/fvt/uno/sc/chart/ChartLegend.java Thu Aug 29 09:22:45 2013
@@ -186,9 +186,10 @@ public class ChartLegend {
 		String chartName = "testChart";
 		String cellRangeName = "A1:D4";
 		Boolean result = true;
-		int delta = 4;//Save as .xls file, the legend position may change a little, set acceptable range.
+		int delta = 1; // tolerate legend position changes from integer rounding
 
 		if (fileType.equalsIgnoreCase("xls")) {
+			delta = 4; // increase tolerance for legend position changes in the XLS roundtrip
 			chartName = "Object 1";			
 		}
 		
@@ -221,15 +222,8 @@ public class ChartLegend {
 		
 		assertTrue("Chart legend has not been enabled in ." + fileType + " file.", result);
 		
-		if (fileType.equalsIgnoreCase("xls")) {
-			assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X, delta);
-			assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.Y, resultPoint.Y, delta);
-		}
-		else {
-			assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X);
-			assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.Y, resultPoint.Y);
-		}
-		
+		assertEquals("Incorrect chart legend position X got in ." + fileType + " file.", aPoint.X, resultPoint.X, delta);
+		assertEquals("Incorrect chart legend position Y got in ." + fileType + " file.", aPoint.Y, resultPoint.Y, delta);
 	}
 
-}
\ No newline at end of file
+}