From 6f9dd6728ba68934d678a6caf66edcdf2900537a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Mar 2010 09:42:49 +0000 Subject: cmcfixes73: #i110069# add 61 count for ia64 as well --- basegfx/test/basegfx2d.cxx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'basegfx/test') diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index b169d35ed96a..bbf5045b5832 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -481,16 +481,15 @@ public: } while ( nIndex >= 0 ); - // Adapted number of spaces to 50 and 67 because of the new circle construction - // methods which produce more points and thus more spaces, too. Use both since - // depending on float precision and the getContinuity() implemetation using - // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32 - // uses more 'S' statements (as it should be for circles) -#ifdef S390X - CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==61 ); -#else - CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 ); -#endif + // Adapted number of spaces to 50, 67 and 61 because of the new circle + // construction methods which produce more points and thus more spaces, + // too. Use both since depending on float precision and the + // getContinuity() implemetation using fTools::equal, linux and mac + // produce more 'C' than 'S' statements, while WIN32 uses more 'S' + // statements (as it should be for circles) + + // 61 elements for S390x, and IA64 + CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 || nCount == 61); const B2DPolygon aRect( tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) )); -- cgit v1.2.3 From 438d3eef38d0b13ee54f5ab2f0365893dbdff68a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Mar 2010 17:02:39 +0000 Subject: cmcfixes73: #i110069# remove platform-dependent test --- basegfx/test/basegfx2d.cxx | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'basegfx/test') diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index bbf5045b5832..7258563fe52d 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -465,32 +465,6 @@ public: CPPUNIT_ASSERT_MESSAGE("exporting complex polygon to SVG-D (round-trip)", !aExport.compareToAscii(sExportString2)); - const B2DPolygon aCircle( - tools::createPolygonFromEllipse( B2DPoint(4000,4000), - 1000.0, 2000.0 )); - aExport = tools::exportToSvgD( B2DPolyPolygon(aCircle), false, false); - - // count number of spaces, in lieu of a better way - no real - // point in comparing with a gold standard, as fractional - // parts of the coordinates will differ between systems. - sal_Int32 nIndex=0, nCount=0; - do - { - rtl::OUString aToken = aExport.getToken( 0, ' ', nIndex ); - ++nCount; - } - while ( nIndex >= 0 ); - - // Adapted number of spaces to 50, 67 and 61 because of the new circle - // construction methods which produce more points and thus more spaces, - // too. Use both since depending on float precision and the - // getContinuity() implemetation using fTools::equal, linux and mac - // produce more 'C' than 'S' statements, while WIN32 uses more 'S' - // statements (as it should be for circles) - - // 61 elements for S390x, and IA64 - CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 || nCount == 61); - const B2DPolygon aRect( tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) )); aExport = tools::exportToSvgD( B2DPolyPolygon(aRect), false, false); -- cgit v1.2.3