Index: Source/wtf/tests/StringImpl.cpp |
diff --git a/Source/wtf/tests/StringImpl.cpp b/Source/wtf/tests/StringImpl.cpp |
index d1353435597fb2221a14e7773a5797f2ea80decc..f8c8600e3070a79bafc01a7e9efbc499fce8ddbe 100644 |
--- a/Source/wtf/tests/StringImpl.cpp |
+++ b/Source/wtf/tests/StringImpl.cpp |
@@ -31,73 +31,10 @@ |
namespace { |
-TEST(WTF, StringImplCreationFromLiteral) |
+TEST(WTF, StringImplCreate8Bit) |
{ |
- // Constructor using the template to determine the size. |
- RefPtr<StringImpl> stringWithTemplate = StringImpl::createFromLiteral("Template Literal"); |
- ASSERT_EQ(strlen("Template Literal"), stringWithTemplate->length()); |
- ASSERT_TRUE(equal(stringWithTemplate.get(), "Template Literal")); |
- ASSERT_TRUE(stringWithTemplate->is8Bit()); |
- |
- // Constructor taking the size explicitely. |
- const char* programmaticStringData = "Explicit Size Literal"; |
- RefPtr<StringImpl> programmaticString = StringImpl::createFromLiteral(programmaticStringData, strlen(programmaticStringData)); |
- ASSERT_EQ(strlen(programmaticStringData), programmaticString->length()); |
- ASSERT_TRUE(equal(programmaticString.get(), programmaticStringData)); |
- ASSERT_EQ(programmaticStringData, reinterpret_cast<const char*>(programmaticString->characters8())); |
- ASSERT_TRUE(programmaticString->is8Bit()); |
- |
- // Constructor without explicit size. |
- const char* stringWithoutLengthLiteral = "No Size Literal"; |
- RefPtr<StringImpl> programmaticStringNoLength = StringImpl::createFromLiteral(stringWithoutLengthLiteral); |
- ASSERT_EQ(strlen(stringWithoutLengthLiteral), programmaticStringNoLength->length()); |
- ASSERT_TRUE(equal(programmaticStringNoLength.get(), stringWithoutLengthLiteral)); |
- ASSERT_EQ(stringWithoutLengthLiteral, reinterpret_cast<const char*>(programmaticStringNoLength->characters8())); |
- ASSERT_TRUE(programmaticStringNoLength->is8Bit()); |
-} |
- |
-TEST(WTF, StringImplReplaceWithLiteral) |
-{ |
- RefPtr<StringImpl> testStringImpl = StringImpl::createFromLiteral("1224"); |
+ RefPtr<StringImpl> testStringImpl = StringImpl::create("1224"); |
ASSERT_TRUE(testStringImpl->is8Bit()); |
- |
- // Cases for 8Bit source. |
- testStringImpl = testStringImpl->replace('2', "", 0); |
- ASSERT_TRUE(equal(testStringImpl.get(), "14")); |
- |
- testStringImpl = StringImpl::createFromLiteral("1224"); |
- ASSERT_TRUE(testStringImpl->is8Bit()); |
- |
- testStringImpl = testStringImpl->replace('3', "NotFound", 8); |
- ASSERT_TRUE(equal(testStringImpl.get(), "1224")); |
- |
- testStringImpl = testStringImpl->replace('2', "3", 1); |
- ASSERT_TRUE(equal(testStringImpl.get(), "1334")); |
- |
- testStringImpl = StringImpl::createFromLiteral("1224"); |
- ASSERT_TRUE(testStringImpl->is8Bit()); |
- testStringImpl = testStringImpl->replace('2', "555", 3); |
- ASSERT_TRUE(equal(testStringImpl.get(), "15555554")); |
- |
- // Cases for 16Bit source. |
- String testString = String::fromUTF8("résumé"); |
- ASSERT_FALSE(testString.impl()->is8Bit()); |
- |
- testStringImpl = testString.impl()->replace('2', "NotFound", 8); |
- ASSERT_TRUE(equal(testStringImpl.get(), String::fromUTF8("résumé").impl())); |
- |
- testStringImpl = testString.impl()->replace(UChar(0x00E9 /*U+00E9 is 'é'*/), "e", 1); |
- ASSERT_TRUE(equal(testStringImpl.get(), "resume")); |
- |
- testString = String::fromUTF8("résumé"); |
- ASSERT_FALSE(testString.impl()->is8Bit()); |
- testStringImpl = testString.impl()->replace(UChar(0x00E9 /*U+00E9 is 'é'*/), "", 0); |
- ASSERT_TRUE(equal(testStringImpl.get(), "rsum")); |
- |
- testString = String::fromUTF8("résumé"); |
- ASSERT_FALSE(testString.impl()->is8Bit()); |
- testStringImpl = testString.impl()->replace(UChar(0x00E9 /*U+00E9 is 'é'*/), "555", 3); |
- ASSERT_TRUE(equal(testStringImpl.get(), "r555sum555")); |
} |
} // namespace |