<!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>[166076] 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/166076">166076</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-21 10:59:11 -0700 (Fri, 21 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove use of deprecatedCharacters in WebKit API tests
https://bugs.webkit.org/show_bug.cgi?id=130602
Reviewed by Antti Koivisto.
* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
(TestWebKitAPI::expectBuilderContent): Use characters8/16 instead of deprecatedCharacters.
(TestWebKitAPI::expectEmpty): Use characters8.
(TestWebKitAPI::TEST): Use characters8 instead of deprecatedCharacters in most cases.
* TestWebKitAPI/Tests/WTF/StringImpl.cpp:
Removed the test that is entirely about 16-bit conversion since that's basically a test of
the deprecatedCharacters function itself, which we are about to delete.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringBuildercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringImplcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166075 => 166076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-21 17:55:59 UTC (rev 166075)
+++ trunk/Tools/ChangeLog 2014-03-21 17:59:11 UTC (rev 166076)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-21 Darin Adler <darin@apple.com>
+
+ Remove use of deprecatedCharacters in WebKit API tests
+ https://bugs.webkit.org/show_bug.cgi?id=130602
+
+ Reviewed by Antti Koivisto.
+
+ * TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
+ (TestWebKitAPI::expectBuilderContent): Use characters8/16 instead of deprecatedCharacters.
+ (TestWebKitAPI::expectEmpty): Use characters8.
+ (TestWebKitAPI::TEST): Use characters8 instead of deprecatedCharacters in most cases.
+
+ * TestWebKitAPI/Tests/WTF/StringImpl.cpp:
+ Removed the test that is entirely about 16-bit conversion since that's basically a test of
+ the deprecatedCharacters function itself, which we are about to delete.
+
</ins><span class="cx"> 2014-03-21 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [webkitpy] Fix has_valid_reviewer()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (166075 => 166076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp 2014-03-21 17:55:59 UTC (rev 166075)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp 2014-03-21 17:59:11 UTC (rev 166076)
</span><span class="lines">@@ -38,14 +38,17 @@
</span><span class="cx"> {
</span><span class="cx"> // Not using builder.toString() or builder.toStringPreserveCapacity() because they all
</span><span class="cx"> // change internal state of builder.
</span><del>- EXPECT_EQ(expected, String(builder.deprecatedCharacters(), builder.length()));
</del><ins>+ if (builder.is8Bit())
+ EXPECT_EQ(expected, String(builder.characters8(), builder.length()));
+ else
+ EXPECT_EQ(expected, String(builder.characters16(), builder.length()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void expectEmpty(const StringBuilder& builder)
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(0U, builder.length());
</span><span class="cx"> EXPECT_TRUE(builder.isEmpty());
</span><del>- EXPECT_EQ(0, builder.deprecatedCharacters());
</del><ins>+ EXPECT_EQ(0, builder.characters8());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(StringBuilderTest, DefaultConstructor)
</span><span class="lines">@@ -72,20 +75,20 @@
</span><span class="cx"> StringBuilder builder1;
</span><span class="cx"> builder.append("", 0);
</span><span class="cx"> expectBuilderContent("0123456789abcdefg#", builder);
</span><del>- builder1.append(builder.deprecatedCharacters(), builder.length());
</del><ins>+ builder1.append(builder.characters8(), builder.length());
</ins><span class="cx"> builder1.append("XYZ");
</span><del>- builder.append(builder1.deprecatedCharacters(), builder1.length());
</del><ins>+ builder.append(builder1.characters8(), builder1.length());
</ins><span class="cx"> expectBuilderContent("0123456789abcdefg#0123456789abcdefg#XYZ", builder);
</span><span class="cx">
</span><span class="cx"> StringBuilder builder2;
</span><span class="cx"> builder2.reserveCapacity(100);
</span><span class="cx"> builder2.append("xyz");
</span><del>- const UChar* characters = builder2.deprecatedCharacters();
</del><ins>+ const LChar* characters = builder2.characters8();
</ins><span class="cx"> builder2.append("0123456789");
</span><del>- ASSERT_EQ(characters, builder2.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(characters, builder2.characters8());
</ins><span class="cx"> builder2.toStringPreserveCapacity(); // Test after reifyString with buffer preserved.
</span><span class="cx"> builder2.append("abcd");
</span><del>- ASSERT_EQ(characters, builder2.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(characters, builder2.characters8());
</ins><span class="cx">
</span><span class="cx"> // Test appending UChar32 characters to StringBuilder.
</span><span class="cx"> StringBuilder builderForUChar32Append;
</span><span class="lines">@@ -140,7 +143,7 @@
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><span class="cx"> ASSERT_EQ(String("0123456789"), string);
</span><span class="cx"> ASSERT_EQ(string.impl(), builder.toStringPreserveCapacity().impl());
</span><del>- ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(string.characters8(), builder.characters8());
</ins><span class="cx">
</span><span class="cx"> // Changing the StringBuilder should not affect the original result of toStringPreserveCapacity().
</span><span class="cx"> builder.append("abcdefghijklmnopqrstuvwxyz");
</span><span class="lines">@@ -151,7 +154,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> string = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(string.characters8(), builder.characters8());
</ins><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string);
</span><span class="cx"> builder.append("ABC");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string);
</span><span class="lines">@@ -160,7 +163,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> String string1 = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string1.deprecatedCharacters(), builder.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(string1.characters8(), builder.characters8());
</ins><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1);
</span><span class="cx"> string1.append("DEF");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), builder.toStringPreserveCapacity());
</span><span class="lines">@@ -170,7 +173,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> string1 = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</del><ins>+ ASSERT_EQ(string.characters8(), builder.characters8());
</ins><span class="cx"> builder.resize(10);
</span><span class="cx"> builder.append("###");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp (166075 => 166076)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2014-03-21 17:55:59 UTC (rev 166075)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2014-03-21 17:59:11 UTC (rev 166076)
</span><span class="lines">@@ -55,17 +55,6 @@
</span><span class="cx"> ASSERT_TRUE(programmaticStringNoLength->is8Bit());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WTF, StringImplFromLiteralLoop16BitConversion)
-{
- RefPtr<StringImpl> controlString = StringImpl::create("Template Literal");
- for (size_t i = 0; i < 10; ++i) {
- RefPtr<StringImpl> string = StringImpl::createFromLiteral("Template Literal");
-
- ASSERT_EQ(0, memcmp(controlString->deprecatedCharacters(), string->deprecatedCharacters(), controlString->length() * sizeof(UChar)));
- ASSERT_TRUE(string->has16BitShadow());
- }
-}
-
</del><span class="cx"> TEST(WTF, StringImplReplaceWithLiteral)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StringImpl> testStringImpl = StringImpl::createFromLiteral("1224");
</span></span></pre>
</div>
</div>
</body>
</html>