[Libreoffice-commits] core.git: svl/qa
Eike Rathke
erack at redhat.com
Thu Dec 14 13:45:03 UTC 2017
svl/qa/unit/svl.cxx | 134 ++++++++++++++++++++++++++--------------------------
1 file changed, 67 insertions(+), 67 deletions(-)
New commits:
commit 4fbe04cd7fe280ddc57a8dc8a7c4f07e30a340ac
Author: Eike Rathke <erack at redhat.com>
Date: Thu Dec 14 14:39:52 2017 +0100
Naming nitpicks, r... for reference
Change-Id: I1d169590302067fdcb3fe8ecc1cf5dea8f766a02
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index be9310db0af9..15546554fc78 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1393,86 +1393,86 @@ void Test::testUserDefinedNumberFormats()
void Test::testNfEnglishKeywordsIntegrity()
{
SvNumberFormatter aFormatter(m_xContext, LANGUAGE_ENGLISH_US);
- const ::std::vector<OUString> & sEnglishKeywords = aFormatter.GetEnglishKeywords();
+ const ::std::vector<OUString> & rEnglishKeywords = aFormatter.GetEnglishKeywords();
const NfKeywordTable& sKeywords = aFormatter.GetKeywords(0);
- CPPUNIT_ASSERT_EQUAL( size_t(NF_KEYWORD_ENTRIES_COUNT), sEnglishKeywords.size() );
+ CPPUNIT_ASSERT_EQUAL( size_t(NF_KEYWORD_ENTRIES_COUNT), rEnglishKeywords.size() );
for (size_t i = 0; i < size_t(NF_KEYWORD_ENTRIES_COUNT); ++i)
{
- CPPUNIT_ASSERT_EQUAL( sKeywords[i], sEnglishKeywords[i] );
+ CPPUNIT_ASSERT_EQUAL( sKeywords[i], rEnglishKeywords[i] );
}
// Check the order of sEnglishKeyword
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_E], OUString("E") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_AMPM], OUString("AM/PM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_AP], OUString("A/P") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MI], OUString("M") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MMI], OUString("MM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_M], OUString("M") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MM], OUString("MM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MMM], OUString("MMM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MMMM], OUString("MMMM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_H], OUString("H") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_HH], OUString("HH") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_S], OUString("S") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_SS], OUString("SS") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_Q], OUString("Q") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_QQ], OUString("QQ") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_D], OUString("D") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_DD], OUString("DD") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_DDD], OUString("DDD") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_DDDD], OUString("DDDD") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_YY], OUString("YY") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_YYYY], OUString("YYYY") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_NN], OUString("NN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_NNNN], OUString("NNNN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_CCC], OUString("CCC") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_GENERAL], OUString("GENERAL") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_NNN], OUString("NNN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_WW], OUString("WW") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MMMMM], OUString("MMMMM") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_TRUE], OUString("TRUE") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_FALSE], OUString("FALSE") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_BOOLEAN], OUString("BOOLEAN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_COLOR], OUString("COLOR") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_BLACK], OUString("BLACK") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_BLUE], OUString("BLUE") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_GREEN], OUString("GREEN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_CYAN], OUString("CYAN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_RED], OUString("RED") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_MAGENTA], OUString("MAGENTA") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_BROWN], OUString("BROWN") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_GREY], OUString("GREY") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_YELLOW], OUString("YELLOW") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_WHITE], OUString("WHITE") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_AAA], OUString("AAA") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_AAAA], OUString("AAAA") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_EC], OUString("E") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_EEC], OUString("EE") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_G], OUString("G") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_GG], OUString("GG") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_GGG], OUString("GGG") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_R], OUString("R") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_RR], OUString("RR") );
- CPPUNIT_ASSERT_EQUAL( sEnglishKeywords[NF_KEY_THAI_T], OUString("t") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_E], OUString("E") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AMPM], OUString("AM/PM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AP], OUString("A/P") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MI], OUString("M") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMI], OUString("MM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_M], OUString("M") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MM], OUString("MM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMM], OUString("MMM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMMM], OUString("MMMM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_H], OUString("H") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_HH], OUString("HH") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_S], OUString("S") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_SS], OUString("SS") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_Q], OUString("Q") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_QQ], OUString("QQ") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_D], OUString("D") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DD], OUString("DD") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DDD], OUString("DDD") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_DDDD], OUString("DDDD") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YY], OUString("YY") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YYYY], OUString("YYYY") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NN], OUString("NN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NNNN], OUString("NNNN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_CCC], OUString("CCC") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GENERAL], OUString("GENERAL") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_NNN], OUString("NNN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_WW], OUString("WW") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MMMMM], OUString("MMMMM") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_TRUE], OUString("TRUE") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_FALSE], OUString("FALSE") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BOOLEAN], OUString("BOOLEAN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_COLOR], OUString("COLOR") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BLACK], OUString("BLACK") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BLUE], OUString("BLUE") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GREEN], OUString("GREEN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_CYAN], OUString("CYAN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_RED], OUString("RED") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_MAGENTA], OUString("MAGENTA") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_BROWN], OUString("BROWN") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GREY], OUString("GREY") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_YELLOW], OUString("YELLOW") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_WHITE], OUString("WHITE") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AAA], OUString("AAA") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_AAAA], OUString("AAAA") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_EC], OUString("E") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_EEC], OUString("EE") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_G], OUString("G") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GG], OUString("GG") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_GGG], OUString("GGG") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_R], OUString("R") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_RR], OUString("RR") );
+ CPPUNIT_ASSERT_EQUAL( rEnglishKeywords[NF_KEY_THAI_T], OUString("t") );
}
void Test::testStandardColorIntegrity()
{
SvNumberFormatter aFormatter(m_xContext, LANGUAGE_ENGLISH_US);
- const ::std::vector<Color> & aStandardColors = aFormatter.GetStandardColors();
+ const ::std::vector<Color> & rStandardColors = aFormatter.GetStandardColors();
const size_t nMaxDefaultColors = aFormatter.GetMaxDefaultColors();
CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, size_t(NF_KEY_LASTCOLOR) - size_t(NF_KEY_FIRSTCOLOR) + 1 );
- CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, aStandardColors.size() );
+ CPPUNIT_ASSERT_EQUAL( nMaxDefaultColors, rStandardColors.size() );
// Colors must follow same order as in sEnglishKeyword
- CPPUNIT_ASSERT_EQUAL( aStandardColors[0].GetColor(), COL_BLACK );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[1].GetColor(), COL_LIGHTBLUE );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[2].GetColor(), COL_LIGHTGREEN );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[3].GetColor(), COL_LIGHTCYAN );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[4].GetColor(), COL_LIGHTRED );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[5].GetColor(), COL_LIGHTMAGENTA );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[6].GetColor(), COL_BROWN );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[7].GetColor(), COL_GRAY );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[8].GetColor(), COL_YELLOW );
- CPPUNIT_ASSERT_EQUAL( aStandardColors[9].GetColor(), COL_WHITE );
+ 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 );
}
void Test::testColorNamesConversion()
More information about the Libreoffice-commits
mailing list