<!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>[208121] 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/208121">208121</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-10-29 23:44:32 -0700 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix failing ExtendedColor tests.
* TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp:
Changed the tests in two ways: First, use EXPECT_EQ instead of EXPECT_TRUE
for the string equality comparisons. This required including WTFStringUtilities.h.
Second, change expected results to match what the code is currently generating,
so alpha channels are "0.25" rather than "0.25 / 1". I'll let Dean fix both these
tests and the code if these results are incorrect.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreExtendedColorcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208120 => 208121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-30 03:53:10 UTC (rev 208120)
+++ trunk/Tools/ChangeLog 2016-10-30 06:44:32 UTC (rev 208121)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-29 Darin Adler <darin@apple.com>
+
+ Fix failing ExtendedColor tests.
+
+ * TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp:
+ Changed the tests in two ways: First, use EXPECT_EQ instead of EXPECT_TRUE
+ for the string equality comparisons. This required including WTFStringUtilities.h.
+ Second, change expected results to match what the code is currently generating,
+ so alpha channels are "0.25" rather than "0.25 / 1". I'll let Dean fix both these
+ tests and the code if these results are incorrect.
+
</ins><span class="cx"> 2016-10-29 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> UIScriptControllerIOS.mm should not be soft-linking UIKit
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreExtendedColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp (208120 => 208121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp 2016-10-30 03:53:10 UTC (rev 208120)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ExtendedColor.cpp 2016-10-30 06:44:32 UTC (rev 208121)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #include "Test.h"
</span><ins>+#include "WTFStringUtilities.h"
</ins><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -40,8 +41,8 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c1.asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c1.asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c1.asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c1.asExtended().refCount());
- EXPECT_TRUE(c1.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(1u, c1.asExtended().refCount());
+ EXPECT_EQ(c1.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(ExtendedColor, CopyConstructor)
</span><span class="lines">@@ -55,9 +56,9 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c2.asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c2.asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c2.asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(2), c1.asExtended().refCount());
- EXPECT_EQ(static_cast<unsigned>(2), c2.asExtended().refCount());
- EXPECT_TRUE(c2.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(2u, c1.asExtended().refCount());
+ EXPECT_EQ(2u, c2.asExtended().refCount());
+ EXPECT_EQ(c2.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(ExtendedColor, Assignment)
</span><span class="lines">@@ -71,9 +72,9 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c2.asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c2.asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c2.asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(2), c1.asExtended().refCount());
- EXPECT_EQ(static_cast<unsigned>(2), c2.asExtended().refCount());
- EXPECT_TRUE(c2.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(2u, c1.asExtended().refCount());
+ EXPECT_EQ(2u, c2.asExtended().refCount());
+ EXPECT_EQ(c2.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(ExtendedColor, MoveConstructor)
</span><span class="lines">@@ -91,8 +92,8 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c2.asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c2.asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c2.asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c2.asExtended().refCount());
- EXPECT_TRUE(c2.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(1u, c2.asExtended().refCount());
+ EXPECT_EQ(c2.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(ExtendedColor, MoveAssignment)
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx"> EXPECT_TRUE(c1.isExtended());
</span><span class="cx">
</span><span class="cx"> Color c2 = WTFMove(c1);
</span><ins>+
</ins><span class="cx"> // We should have moved the extended color pointer into c2,
</span><span class="cx"> // and set c1 to invalid so that it doesn't cause deletion.
</span><span class="cx"> EXPECT_FALSE(c1.isExtended());
</span><span class="lines">@@ -110,8 +112,8 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c2.asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c2.asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c2.asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c2.asExtended().refCount());
- EXPECT_TRUE(c2.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(1u, c2.asExtended().refCount());
+ EXPECT_EQ(c2.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(ExtendedColor, BasicReferenceCounting)
</span><span class="lines">@@ -126,14 +128,14 @@
</span><span class="cx"> EXPECT_FLOAT_EQ(0.5, c2->asExtended().green());
</span><span class="cx"> EXPECT_FLOAT_EQ(0.25, c2->asExtended().blue());
</span><span class="cx"> EXPECT_FLOAT_EQ(1.0, c2->asExtended().alpha());
</span><del>- EXPECT_EQ(static_cast<unsigned>(3), c2->asExtended().refCount());
- EXPECT_TRUE(c2->cssText() == "color(display-p3 1 0.5 0.25 / 1)");
</del><ins>+ EXPECT_EQ(3u, c2->asExtended().refCount());
+ EXPECT_EQ(c2->cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx">
</span><span class="cx"> delete c1;
</span><del>- EXPECT_EQ(static_cast<unsigned>(2), c2->asExtended().refCount());
</del><ins>+ EXPECT_EQ(2u, c2->asExtended().refCount());
</ins><span class="cx">
</span><span class="cx"> delete c2;
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c3->asExtended().refCount());
</del><ins>+ EXPECT_EQ(1u, c3->asExtended().refCount());
</ins><span class="cx">
</span><span class="cx"> delete c3;
</span><span class="cx"> }
</span><span class="lines">@@ -142,7 +144,7 @@
</span><span class="cx"> {
</span><span class="cx"> Color c1(1.0, 0.5, 0.25, 1.0, ColorSpaceDisplayP3);
</span><span class="cx"> EXPECT_TRUE(c1.isExtended());
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c1.asExtended().refCount());
</del><ins>+ EXPECT_EQ(1u, c1.asExtended().refCount());
</ins><span class="cx">
</span><span class="cx"> return c1;
</span><span class="cx"> }
</span><span class="lines">@@ -152,9 +154,8 @@
</span><span class="cx"> Color c2 = makeColor();
</span><span class="cx"> EXPECT_TRUE(c2.isExtended());
</span><span class="cx">
</span><del>- EXPECT_EQ(static_cast<unsigned>(1), c2.asExtended().refCount());
- EXPECT_TRUE(c2.cssText() == "color(display-p3 1 0.5 0.25 / 1)");
-
</del><ins>+ EXPECT_EQ(1u, c2.asExtended().refCount());
+ EXPECT_EQ(c2.cssText(), "color(display-p3 1 0.5 0.25)");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>