From e2cb154195fdc2ffccdb6f5e87cae8b29640b3eb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Feb 2018 17:13:01 +0200 Subject: convert COL_ constants to be of type Color Change-Id: I0e25c8950ac26b851ff42f71e1471fcbe4770d48 Reviewed-on: https://gerrit.libreoffice.org/50373 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svl/qa/unit/svl.cxx | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'svl') diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 7f10e5f0a4e1..633e82b75eb2 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -46,6 +46,12 @@ using namespace ::com::sun::star; using namespace svl; +inline std::ostream& operator<<(std::ostream& rStrm, const Color& rColor) +{ + rStrm << "Color: R:" << static_cast(rColor.GetRed()) << " G:" << static_cast(rColor.GetGreen()) << " B: " << static_cast(rColor.GetBlue()); + return rStrm; +} + namespace { class Test : public CppUnit::TestFixture { @@ -1562,16 +1568,16 @@ void Test::testStandardColorIntegrity() CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, size_t(NF_KEY_LASTCOLOR) - size_t(NF_KEY_FIRSTCOLOR) + 1 ); CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, rStandardColors.size() ); // Colors must follow same order as in sEnglishKeyword - CPPUNIT_ASSERT_EQUAL( rStandardColors[0].GetColor(), COL_BLACK ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[1].GetColor(), COL_LIGHTBLUE ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[2].GetColor(), COL_LIGHTGREEN ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[3].GetColor(), COL_LIGHTCYAN ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[4].GetColor(), COL_LIGHTRED ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[5].GetColor(), COL_LIGHTMAGENTA ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[6].GetColor(), COL_BROWN ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[7].GetColor(), COL_GRAY ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[8].GetColor(), COL_YELLOW ); - CPPUNIT_ASSERT_EQUAL( rStandardColors[9].GetColor(), COL_WHITE ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[0], COL_BLACK ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[1], COL_LIGHTBLUE ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[2], COL_LIGHTGREEN ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[3], COL_LIGHTCYAN ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[4], COL_LIGHTRED ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[5], COL_LIGHTMAGENTA ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[6], COL_BROWN ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[7], COL_GRAY ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[8], COL_YELLOW ); + CPPUNIT_ASSERT_EQUAL( rStandardColors[9], COL_WHITE ); } void Test::testColorNamesConversion() -- cgit