diff options
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp')
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp b/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp index 11bf3590e..9ca5d6ee8 100644 --- a/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp +++ b/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp @@ -38,17 +38,14 @@ static void expectBuilderContent(const String& expected, const StringBuilder& bu { // Not using builder.toString() or builder.toStringPreserveCapacity() because they all // change internal state of builder. - if (builder.is8Bit()) - EXPECT_EQ(expected, String(builder.characters8(), builder.length())); - else - EXPECT_EQ(expected, String(builder.characters16(), builder.length())); + EXPECT_EQ(expected, String(builder.deprecatedCharacters(), builder.length())); } void expectEmpty(const StringBuilder& builder) { EXPECT_EQ(0U, builder.length()); EXPECT_TRUE(builder.isEmpty()); - EXPECT_EQ(0, builder.characters8()); + EXPECT_EQ(0, builder.deprecatedCharacters()); } TEST(StringBuilderTest, DefaultConstructor) @@ -75,20 +72,20 @@ TEST(StringBuilderTest, Append) StringBuilder builder1; builder.append("", 0); expectBuilderContent("0123456789abcdefg#", builder); - builder1.append(builder.characters8(), builder.length()); + builder1.append(builder.deprecatedCharacters(), builder.length()); builder1.append("XYZ"); - builder.append(builder1.characters8(), builder1.length()); + builder.append(builder1.deprecatedCharacters(), builder1.length()); expectBuilderContent("0123456789abcdefg#0123456789abcdefg#XYZ", builder); StringBuilder builder2; builder2.reserveCapacity(100); builder2.append("xyz"); - const LChar* characters = builder2.characters8(); + const UChar* characters = builder2.deprecatedCharacters(); builder2.append("0123456789"); - ASSERT_EQ(characters, builder2.characters8()); + ASSERT_EQ(characters, builder2.deprecatedCharacters()); builder2.toStringPreserveCapacity(); // Test after reifyString with buffer preserved. builder2.append("abcd"); - ASSERT_EQ(characters, builder2.characters8()); + ASSERT_EQ(characters, builder2.deprecatedCharacters()); // Test appending UChar32 characters to StringBuilder. StringBuilder builderForUChar32Append; @@ -143,7 +140,7 @@ TEST(StringBuilderTest, ToStringPreserveCapacity) ASSERT_EQ(capacity, builder.capacity()); ASSERT_EQ(String("0123456789"), string); ASSERT_EQ(string.impl(), builder.toStringPreserveCapacity().impl()); - ASSERT_EQ(string.characters8(), builder.characters8()); + ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters()); // Changing the StringBuilder should not affect the original result of toStringPreserveCapacity(). builder.append("abcdefghijklmnopqrstuvwxyz"); @@ -154,7 +151,7 @@ TEST(StringBuilderTest, ToStringPreserveCapacity) capacity = builder.capacity(); string = builder.toStringPreserveCapacity(); ASSERT_EQ(capacity, builder.capacity()); - ASSERT_EQ(string.characters8(), builder.characters8()); + ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters()); ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string); builder.append("ABC"); ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string); @@ -163,7 +160,7 @@ TEST(StringBuilderTest, ToStringPreserveCapacity) capacity = builder.capacity(); String string1 = builder.toStringPreserveCapacity(); ASSERT_EQ(capacity, builder.capacity()); - ASSERT_EQ(string1.characters8(), builder.characters8()); + ASSERT_EQ(string1.deprecatedCharacters(), builder.deprecatedCharacters()); ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1); string1.append("DEF"); ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), builder.toStringPreserveCapacity()); @@ -173,7 +170,7 @@ TEST(StringBuilderTest, ToStringPreserveCapacity) capacity = builder.capacity(); string1 = builder.toStringPreserveCapacity(); ASSERT_EQ(capacity, builder.capacity()); - ASSERT_EQ(string.characters8(), builder.characters8()); + ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters()); builder.resize(10); builder.append("###"); ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1); |