<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191236] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191236">191236</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 21:48:50 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringOperatorscpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191235 => 191236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-17 04:37:16 UTC (rev 191235)
+++ trunk/Tools/ChangeLog 2015-10-17 04:48:50 UTC (rev 191236)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-10-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2.AutoLayoutIntegration API test is failing on some of the bots
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringOperatorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp (191235 => 191236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp 2015-10-17 04:37:16 UTC (rev 191235)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp 2015-10-17 04:48:50 UTC (rev 191236)
</span><span class="lines">@@ -29,18 +29,10 @@
</span><span class="cx">
</span><span class="cx"> static int wtfStringCopyCount;
</span><span class="cx">
</span><del>-#include <wtf/text/StringBuilder.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><del>-static void build(StringBuilder& builder, std::vector<UChar> input)
-{
- builder.clear();
- for (auto codeUnit : input)
- builder.append(codeUnit);
-}
-
</del><span class="cx"> #define EXPECT_N_WTF_STRING_COPIES(count, expr) \
</span><span class="cx"> do { \
</span><span class="cx"> wtfStringCopyCount = 0; \
</span><span class="lines">@@ -194,23 +186,18 @@
</span><span class="cx">
</span><span class="cx"> TEST(WTF, ConcatenateCharacterArrayAndEmptyString)
</span><span class="cx"> {
</span><del>- StringBuilder b;
</del><ins>+ String emptyString;
+ EXPECT_EQ(static_cast<unsigned>(0), emptyString.length());
</ins><span class="cx">
</span><del>- 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);
</del><ins>+ UChar ucharArray[] = { 't', 'e', 's', 't', '\0' };
+ String concatenation16 = ucharArray + emptyString;
+ ASSERT_EQ(static_cast<unsigned>(4), concatenation16.length());
+ ASSERT_TRUE(concatenation16 == String(ucharArray));
</ins><span class="cx">
</span><del>- 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);
</del><ins>+ LChar lcharArray[] = { 't', 'e', 's', 't', '\0' };
+ String concatenation8 = lcharArray + emptyString;
+ ASSERT_EQ(static_cast<unsigned>(4), concatenation8.length());
+ ASSERT_TRUE(concatenation8 == String(lcharArray));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>