Kaydet (Commit) 39eecc51 authored tarafından Noel Grandin's avatar Noel Grandin

disable part of VclComplexTextTest::testArabic

fails sporadically on one of the windows buildboxes, Khaled might be
able to get to it in a few weeks

Change-Id: I65ebb8ad1e2ae08308d2ac150b88a393c134f715
Reviewed-on: https://gerrit.libreoffice.org/54906Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4883fd31
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec); std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
#endif
#include <unotest/filters-test.hxx> #include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx> #include <test/bootstrapfixture.hxx>
...@@ -23,6 +25,7 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec); ...@@ -23,6 +25,7 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
#include <config_test.h> #include <config_test.h>
#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec) std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
{ {
rStream << "{ "; rStream << "{ ";
...@@ -32,6 +35,7 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec) ...@@ -32,6 +35,7 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
rStream << " }"; rStream << " }";
return rStream; return rStream;
} }
#endif
class VclComplexTextTest : public test::BootstrapFixture class VclComplexTextTest : public test::BootstrapFixture
{ {
...@@ -76,12 +80,16 @@ void VclComplexTextTest::testArabic() ...@@ -76,12 +80,16 @@ void VclComplexTextTest::testArabic()
pOutDev->SetFont( aFont ); pOutDev->SetFont( aFont );
// absolute character widths AKA text array. // absolute character widths AKA text array.
#if !defined(_WIN32)
std::vector<long> aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32, std::vector<long> aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
36, 40, 49, 53, 56, 63, 63, 66, 72, 72}; 36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
#endif
std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0); std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0);
long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data()); long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
#if !defined(_WIN32)
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths); CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths);
#endif
CPPUNIT_ASSERT_EQUAL(72L, nTextWidth); CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back()); CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
......
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