bug 955957 - pt 1.1 - update gfxSkipChars test for revised API (no gfxSkipCharsBuilder any longer). r=roc
authorJonathan Kew <jkew@mozilla.com>
Fri, 10 Jan 2014 09:42:05 +0000
changeset 162919 95f43cea056e8c66a1fa2642a96489b92f937f01
parent 162918 58d7421ad39d68e0afc10bac5826d0abf7e34b6c
child 162920 464e261cbcbe791df57a30053f83444519cc30a5
push id25975
push userryanvm@gmail.com
push dateFri, 10 Jan 2014 19:46:47 +0000
treeherderautoland@e89afc241513 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs955957
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 955957 - pt 1.1 - update gfxSkipChars test for revised API (no gfxSkipCharsBuilder any longer). r=roc
gfx/tests/gtest/TestSkipChars.cpp
--- a/gfx/tests/gtest/TestSkipChars.cpp
+++ b/gfx/tests/gtest/TestSkipChars.cpp
@@ -17,101 +17,96 @@ TestConstructor()
     "[1] Make sure the gfxSkipChars was properly initialized with constructor";
 
   return true;
 }
 
 static bool
 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";
 
-  builder.SkipChars(50);
+  skipChars.SkipChars(50);
 
-  EXPECT_TRUE(builder.GetCharCount() == 150) <<
+  EXPECT_TRUE(skipChars.GetOriginalCharCount() == 150) <<
     "[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";
 
-  builder.KeepChar();
+  skipChars.KeepChar();
 
-  EXPECT_TRUE(builder.GetCharCount() == 201) <<
+  EXPECT_TRUE(skipChars.GetOriginalCharCount() == 201) <<
     "[4] Check length after keeping a final char";
 
   return true;
 }
 
 static bool
 TestIterator()
 {
   // Test a gfxSkipChars that starts with kept chars
-  gfxSkipCharsBuilder builder1;
+  gfxSkipChars skipChars1;
 
-  builder1.KeepChars(9);
-  builder1.SkipChar();
-  builder1.KeepChars(9);
-  builder1.SkipChar();
-  builder1.KeepChars(9);
+  skipChars1.KeepChars(9);
+  skipChars1.SkipChar();
+  skipChars1.KeepChars(9);
+  skipChars1.SkipChar();
+  skipChars1.KeepChars(9);
 
-  gfxSkipChars skipChars;
-  skipChars.TakeFrom(&builder1);
-
-  EXPECT_TRUE(skipChars.GetOriginalCharCount() == 29) <<
+  EXPECT_TRUE(skipChars1.GetOriginalCharCount() == 29) <<
     "[1] Check length";
 
-  gfxSkipCharsIterator iter(skipChars);
+  gfxSkipCharsIterator iter1(skipChars1);
 
-  EXPECT_TRUE(iter.GetOriginalOffset() == 0) <<
+  EXPECT_TRUE(iter1.GetOriginalOffset() == 0) <<
     "[2] Check initial original offset";
-  EXPECT_TRUE(iter.GetSkippedOffset() == 0) <<
+  EXPECT_TRUE(iter1.GetSkippedOffset() == 0) <<
     "[3] Check initial skipped offset";
 
   uint32_t expectSkipped1[] =
   {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
      9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
     18, 19, 20, 21, 22, 23, 24, 25, 26, 27 };
 
   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;
   }
 
   uint32_t expectOriginal1[] =
   {  0,  1,  2,  3,  4,  5,  6,  7,  8,
     10, 11, 12, 13, 14, 15, 16, 17, 18,
     20, 21, 22, 23, 24, 25, 26, 27, 28 };
 
   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;
   }
 
   // Test a gfxSkipChars that starts with skipped chars
-  gfxSkipCharsBuilder builder2;
+  gfxSkipChars skipChars2;
 
-  builder2.SkipChars(9);
-  builder2.KeepChar();
-  builder2.SkipChars(9);
-  builder2.KeepChar();
-  builder2.SkipChars(9);
+  skipChars2.SkipChars(9);
+  skipChars2.KeepChar();
+  skipChars2.SkipChars(9);
+  skipChars2.KeepChar();
+  skipChars2.SkipChars(9);
 
-  skipChars.TakeFrom(&builder2);
-
-  EXPECT_TRUE(skipChars.GetOriginalCharCount() == 29) <<
+  EXPECT_TRUE(skipChars2.GetOriginalCharCount() == 29) <<
     "[6] Check length";
 
-  gfxSkipCharsIterator iter2(skipChars);
+  gfxSkipCharsIterator iter2(skipChars2);
 
   EXPECT_TRUE(iter2.GetOriginalOffset() == 0) <<
     "[7] Check initial original offset";
   EXPECT_TRUE(iter2.GetSkippedOffset() == 0) <<
     "[8] Check initial skipped offset";
 
   uint32_t expectSkipped2[] =
   {  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,