Changeset 191236 in webkit

Timestamp:

Oct 16, 2015, 9:48:50 PM (10 years ago)

Author:

akling@apple.com

Message:

[EFL, AppleWin] WTF.ConcatenateCharacterArrayAndEmptyString API test failed
<​https://webkit.org/b/150153>

Unreviewed.

Just use simple arrays of LChar and UChar for this test instead of creating String
objects and then getting the characters8()/characters16() from them, since that
doesn't guarantee null-termination (the bug.)

• TestWebKitAPI/Tests/WTF/StringOperators.cpp:

(TestWebKitAPI::TEST):
(TestWebKitAPI::build): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WTF/StringOperators.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-10-16  Andreas Kling  <akling@apple.com>
+
+        [EFL, AppleWin] WTF.ConcatenateCharacterArrayAndEmptyString API test failed
+        <https://webkit.org/b/150153>
+
+        Unreviewed.
+
+        Just use simple arrays of LChar and UChar for this test instead of creating String
+        objects and then getting the characters8()/characters16() from them, since that
+        doesn't guarantee null-termination (the bug.)
+
+        * TestWebKitAPI/Tests/WTF/StringOperators.cpp:
+        (TestWebKitAPI::TEST):
+        (TestWebKitAPI::build): Deleted.
+
 2015-10-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp

@@ -30 +30 @@
 static int wtfStringCopyCount;
 
-#include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
 namespace TestWebKitAPI {
-
-static void build(StringBuilder& builder, std::vector<UChar> input)
-{
-    builder.clear();
-    for (auto codeUnit : input)
-        builder.append(codeUnit);
-}
 
 #define EXPECT_N_WTF_STRING_COPIES(count, expr) \
@@ -195 +187 @@
 TEST(WTF, ConcatenateCharacterArrayAndEmptyString)
 {
-    StringBuilder b;
-
-    build(b, {0x9FF0, 0x868D, 'M', 'E'});
-    String sixteenBitString = b.toString();
-    EXPECT_FALSE(sixteenBitString.is8Bit());
-    String concatenation = sixteenBitString.characters16() + String();
-    ASSERT_EQ(sixteenBitString.length(), static_cast<unsigned>(4));
-    ASSERT_EQ(concatenation.length(), static_cast<unsigned>(4));
-    ASSERT_TRUE(concatenation == sixteenBitString);
-
-    build(b, {'P', 'L', 'S'});
-    String eightBitString = b.toString();
-    EXPECT_TRUE(eightBitString.is8Bit());
-    String concatenation8 = eightBitString.characters8() + String();
-    ASSERT_EQ(eightBitString.length(), static_cast<unsigned>(3));
-    ASSERT_EQ(concatenation8.length(), static_cast<unsigned>(3));
-    ASSERT_TRUE(concatenation8 == eightBitString);
+    String emptyString;
+    EXPECT_EQ(static_cast<unsigned>(0), emptyString.length());
+
+    UChar ucharArray[] = { 't', 'e', 's', 't', '\0' };
+    String concatenation16 = ucharArray + emptyString;
+    ASSERT_EQ(static_cast<unsigned>(4), concatenation16.length());
+    ASSERT_TRUE(concatenation16 == String(ucharArray));
+
+    LChar lcharArray[] = { 't', 'e', 's', 't', '\0' };
+    String concatenation8 = lcharArray + emptyString;
+    ASSERT_EQ(static_cast<unsigned>(4), concatenation8.length());
+    ASSERT_TRUE(concatenation8 == String(lcharArray));
 }