зеркало из https://github.com/mozilla/gecko-dev.git
bug 955957 - pt 1.1 - update gfxSkipChars test for revised API (no gfxSkipCharsBuilder any longer). r=roc
This commit is contained in:
Родитель
a19636ff66
Коммит
97c10496ed
|
@ -21,26 +21,26 @@ TestConstructor()
|
||||||
static bool
|
static bool
|
||||||
TestLength()
|
TestLength()
|
||||||
{
|
{
|
||||||
gfxSkipCharsBuilder builder;
|
gfxSkipChars skipChars;
|
||||||
|
|
||||||
builder.KeepChars(100);
|
skipChars.KeepChars(100);
|
||||||
|
|
||||||
EXPECT_TRUE(builder.GetCharCount() == 100) <<
|
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 100) <<
|
||||||
"[1] Check length after keeping chars";
|
"[1] Check length after keeping chars";
|
||||||
|
|
||||||
builder.SkipChars(50);
|
skipChars.SkipChars(50);
|
||||||
|
|
||||||
EXPECT_TRUE(builder.GetCharCount() == 150) <<
|
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 150) <<
|
||||||
"[2] Check length after skipping chars";
|
"[2] Check length after skipping chars";
|
||||||
|
|
||||||
builder.SkipChars(50);
|
skipChars.SkipChars(50);
|
||||||
|
|
||||||
EXPECT_TRUE(builder.GetCharCount() == 200) <<
|
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 200) <<
|
||||||
"[3] Check length after skipping more chars";
|
"[3] Check length after skipping more chars";
|
||||||
|
|
||||||
builder.KeepChar();
|
skipChars.KeepChar();
|
||||||
|
|
||||||
EXPECT_TRUE(builder.GetCharCount() == 201) <<
|
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 201) <<
|
||||||
"[4] Check length after keeping a final char";
|
"[4] Check length after keeping a final char";
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -50,25 +50,22 @@ static bool
|
||||||
TestIterator()
|
TestIterator()
|
||||||
{
|
{
|
||||||
// Test a gfxSkipChars that starts with kept chars
|
// Test a gfxSkipChars that starts with kept chars
|
||||||
gfxSkipCharsBuilder builder1;
|
gfxSkipChars skipChars1;
|
||||||
|
|
||||||
builder1.KeepChars(9);
|
skipChars1.KeepChars(9);
|
||||||
builder1.SkipChar();
|
skipChars1.SkipChar();
|
||||||
builder1.KeepChars(9);
|
skipChars1.KeepChars(9);
|
||||||
builder1.SkipChar();
|
skipChars1.SkipChar();
|
||||||
builder1.KeepChars(9);
|
skipChars1.KeepChars(9);
|
||||||
|
|
||||||
gfxSkipChars skipChars;
|
EXPECT_TRUE(skipChars1.GetOriginalCharCount() == 29) <<
|
||||||
skipChars.TakeFrom(&builder1);
|
|
||||||
|
|
||||||
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 29) <<
|
|
||||||
"[1] Check length";
|
"[1] Check length";
|
||||||
|
|
||||||
gfxSkipCharsIterator iter(skipChars);
|
gfxSkipCharsIterator iter1(skipChars1);
|
||||||
|
|
||||||
EXPECT_TRUE(iter.GetOriginalOffset() == 0) <<
|
EXPECT_TRUE(iter1.GetOriginalOffset() == 0) <<
|
||||||
"[2] Check initial original offset";
|
"[2] Check initial original offset";
|
||||||
EXPECT_TRUE(iter.GetSkippedOffset() == 0) <<
|
EXPECT_TRUE(iter1.GetSkippedOffset() == 0) <<
|
||||||
"[3] Check initial skipped offset";
|
"[3] Check initial skipped offset";
|
||||||
|
|
||||||
uint32_t expectSkipped1[] =
|
uint32_t expectSkipped1[] =
|
||||||
|
@ -77,7 +74,7 @@ TestIterator()
|
||||||
18, 19, 20, 21, 22, 23, 24, 25, 26, 27 };
|
18, 19, 20, 21, 22, 23, 24, 25, 26, 27 };
|
||||||
|
|
||||||
for (uint32_t i = 0; i < mozilla::ArrayLength(expectSkipped1); i++) {
|
for (uint32_t i = 0; i < mozilla::ArrayLength(expectSkipped1); i++) {
|
||||||
EXPECT_TRUE(iter.ConvertOriginalToSkipped(i) == expectSkipped1[i]) <<
|
EXPECT_TRUE(iter1.ConvertOriginalToSkipped(i) == expectSkipped1[i]) <<
|
||||||
"[4] Check mapping of original to skipped for " << i;
|
"[4] Check mapping of original to skipped for " << i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,25 +84,23 @@ TestIterator()
|
||||||
20, 21, 22, 23, 24, 25, 26, 27, 28 };
|
20, 21, 22, 23, 24, 25, 26, 27, 28 };
|
||||||
|
|
||||||
for (uint32_t i = 0; i < mozilla::ArrayLength(expectOriginal1); i++) {
|
for (uint32_t i = 0; i < mozilla::ArrayLength(expectOriginal1); i++) {
|
||||||
EXPECT_TRUE(iter.ConvertSkippedToOriginal(i) == expectOriginal1[i]) <<
|
EXPECT_TRUE(iter1.ConvertSkippedToOriginal(i) == expectOriginal1[i]) <<
|
||||||
"[5] Check mapping of skipped to original for " << i;
|
"[5] Check mapping of skipped to original for " << i;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test a gfxSkipChars that starts with skipped chars
|
// Test a gfxSkipChars that starts with skipped chars
|
||||||
gfxSkipCharsBuilder builder2;
|
gfxSkipChars skipChars2;
|
||||||
|
|
||||||
builder2.SkipChars(9);
|
skipChars2.SkipChars(9);
|
||||||
builder2.KeepChar();
|
skipChars2.KeepChar();
|
||||||
builder2.SkipChars(9);
|
skipChars2.SkipChars(9);
|
||||||
builder2.KeepChar();
|
skipChars2.KeepChar();
|
||||||
builder2.SkipChars(9);
|
skipChars2.SkipChars(9);
|
||||||
|
|
||||||
skipChars.TakeFrom(&builder2);
|
EXPECT_TRUE(skipChars2.GetOriginalCharCount() == 29) <<
|
||||||
|
|
||||||
EXPECT_TRUE(skipChars.GetOriginalCharCount() == 29) <<
|
|
||||||
"[6] Check length";
|
"[6] Check length";
|
||||||
|
|
||||||
gfxSkipCharsIterator iter2(skipChars);
|
gfxSkipCharsIterator iter2(skipChars2);
|
||||||
|
|
||||||
EXPECT_TRUE(iter2.GetOriginalOffset() == 0) <<
|
EXPECT_TRUE(iter2.GetOriginalOffset() == 0) <<
|
||||||
"[7] Check initial original offset";
|
"[7] Check initial original offset";
|
||||||
|
|
Загрузка…
Ссылка в новой задаче