Kaydet (Commit) f3134948 authored tarafından Tamás Zolnai's avatar Tamás Zolnai

ChartDumpTest: Add different deltas for different systems for now

Change-Id: Id505edb3ca1b03817d3a98e6102d79df901a3dc2
Reviewed-on: https://gerrit.libreoffice.org/34308Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst b3098d23
...@@ -25,7 +25,14 @@ ...@@ -25,7 +25,14 @@
#include <fstream> #include <fstream>
#define EPS 1E-12 #define EPS 1E-12
#if defined(MACOSX)
#define INT_EPS 200.1
#elif defined(UNX)
#define INT_EPS 2.1 #define INT_EPS 2.1
#else
#define INT_EPS 0.1
#endif
#define DECLARE_DUMP_TEST(TestName, BaseClass, DumpMode) \ #define DECLARE_DUMP_TEST(TestName, BaseClass, DumpMode) \
class TestName : public BaseClass { \ class TestName : public BaseClass { \
...@@ -210,12 +217,12 @@ protected: ...@@ -210,12 +217,12 @@ protected:
aExpectedTransform.Line3.Column3 = rExpectedTranform.getToken(8, ';').toDouble(); aExpectedTransform.Line3.Column3 = rExpectedTranform.getToken(8, ';').toDouble();
// Check the equality of the two transformation // Check the equality of the two transformation
return (std::abs(aExpectedTransform.Line1.Column1 - rTransform.Line1.Column1) < 184.1 && return (std::abs(aExpectedTransform.Line1.Column1 - rTransform.Line1.Column1) < INT_EPS &&
std::abs(aExpectedTransform.Line1.Column2 - rTransform.Line1.Column2) < 18 && std::abs(aExpectedTransform.Line1.Column2 - rTransform.Line1.Column2) < INT_EPS &&
std::abs(aExpectedTransform.Line1.Column3 - rTransform.Line1.Column3) < 90.1 && std::abs(aExpectedTransform.Line1.Column3 - rTransform.Line1.Column3) < INT_EPS &&
std::abs(aExpectedTransform.Line2.Column1 - rTransform.Line2.Column1) < 45.1 && std::abs(aExpectedTransform.Line2.Column1 - rTransform.Line2.Column1) < INT_EPS &&
std::abs(aExpectedTransform.Line2.Column2 - rTransform.Line2.Column2) < 74.1 && std::abs(aExpectedTransform.Line2.Column2 - rTransform.Line2.Column2) < INT_EPS &&
std::abs(aExpectedTransform.Line2.Column3 - rTransform.Line2.Column3) < 44.1 && std::abs(aExpectedTransform.Line2.Column3 - rTransform.Line2.Column3) < INT_EPS &&
std::abs(aExpectedTransform.Line3.Column1 - rTransform.Line3.Column1) < INT_EPS && std::abs(aExpectedTransform.Line3.Column1 - rTransform.Line3.Column1) < INT_EPS &&
std::abs(aExpectedTransform.Line3.Column2 - rTransform.Line3.Column2) < INT_EPS && std::abs(aExpectedTransform.Line3.Column2 - rTransform.Line3.Column2) < INT_EPS &&
std::abs(aExpectedTransform.Line3.Column3 - rTransform.Line3.Column3) < INT_EPS); std::abs(aExpectedTransform.Line3.Column3 - rTransform.Line3.Column3) < INT_EPS);
...@@ -416,11 +423,11 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false) ...@@ -416,11 +423,11 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
// Check legend position and size // Check legend position and size
awt::Point aLegendPosition = xLegend->getPosition(); awt::Point aLegendPosition = xLegend->getPosition();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendPosition.X, 48.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendPosition.X, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendPosition.Y, 50.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendPosition.Y, INT_EPS);
awt::Size aLegendSize = xLegend->getSize(); awt::Size aLegendSize = xLegend->getSize();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendSize.Width, 97.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendSize.Width, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendSize.Height, 100.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLegendSize.Height, INT_EPS);
// Check legend entries // Check legend entries
uno::Reference< chart2::XChartDocument > xChartDoc2(xChartDoc, UNO_QUERY_THROW); uno::Reference< chart2::XChartDocument > xChartDoc2(xChartDoc, UNO_QUERY_THROW);
...@@ -595,9 +602,9 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) ...@@ -595,9 +602,9 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
// Check position and size // Check position and size
awt::Point aAxisPosition = xXAxis->getPosition(); awt::Point aAxisPosition = xXAxis->getPosition();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisPosition.X, INT_EPS); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisPosition.X, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisPosition.Y, 25.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisPosition.Y, INT_EPS);
awt::Size aAxisSize = xXAxis->getSize(); awt::Size aAxisSize = xXAxis->getSize();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisSize.Height, 25.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisSize.Height, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisSize.Width, INT_EPS); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aAxisSize.Width, INT_EPS);
// Check transformation // Check transformation
...@@ -689,11 +696,11 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) ...@@ -689,11 +696,11 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
// Check size and position // Check size and position
uno::Reference<drawing::XShape> xLabelShape(xLabel, uno::UNO_QUERY); uno::Reference<drawing::XShape> xLabelShape(xLabel, uno::UNO_QUERY);
awt::Point aLabelPosition = xLabelShape->getPosition(); awt::Point aLabelPosition = xLabelShape->getPosition();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.X, 90.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.X, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.Y, 35.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelPosition.Y, INT_EPS);
awt::Size aLabelSize = xLabelShape->getSize(); awt::Size aLabelSize = xLabelShape->getSize();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Height, 25.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Height, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Width, 90.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLabelSize.Width, INT_EPS);
// Check transformation // Check transformation
Reference< beans::XPropertySet > xPropSet(xLabelShape, UNO_QUERY_THROW); Reference< beans::XPropertySet > xPropSet(xLabelShape, UNO_QUERY_THROW);
...@@ -813,11 +820,11 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) ...@@ -813,11 +820,11 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
// Check position and size // Check position and size
awt::Point aChartWallPosition = xChartWall->getPosition(); awt::Point aChartWallPosition = xChartWall->getPosition();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.X, 88.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.X, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.Y, 44.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallPosition.Y, INT_EPS);
awt::Size aChartWallSize = xChartWall->getSize(); awt::Size aChartWallSize = xChartWall->getSize();
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Height, 74.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Height, INT_EPS);
CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Width, 184.1); CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aChartWallSize.Width, INT_EPS);
// Check transformation // Check transformation
Reference< beans::XPropertySet > xPropSet(xChartWall, UNO_QUERY_THROW); Reference< beans::XPropertySet > xPropSet(xChartWall, UNO_QUERY_THROW);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment