<!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>[203436] 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/203436">203436</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 17:29:21 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix API test after <a href="http://trac.webkit.org/projects/webkit/changeset/203426">r203426</a>.
https://bugs.webkit.org/show_bug.cgi?id=159949
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:
(TEST):
If there is website data already on disk, the initial count after putting the AppCache data in place will not be exactly 1.
This is no problem. We want to verify that it is a nonzero number and that it decrements by one when we remove the 1 AppCache data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaLocalStorageClearmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203435 => 203436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-20 00:09:52 UTC (rev 203435)
+++ trunk/Tools/ChangeLog 2016-07-20 00:29:21 UTC (rev 203436)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-19 Alex Christensen <achristensen@webkit.org>
+
+ Fix API test after r203426.
+ https://bugs.webkit.org/show_bug.cgi?id=159949
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:
+ (TEST):
+ If there is website data already on disk, the initial count after putting the AppCache data in place will not be exactly 1.
+ This is no problem. We want to verify that it is a nonzero number and that it decrements by one when we remove the 1 AppCache data.
+
</ins><span class="cx"> 2016-07-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Move WebKitErrorFrameLoadBlockedByContentFilter from WebKitErrors.h to WebKitErrorsPrivate.h
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaLocalStorageClearmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm (203435 => 203436)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm 2016-07-20 00:09:52 UTC (rev 203435)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm 2016-07-20 00:29:21 UTC (rev 203436)
</span><span class="lines">@@ -147,11 +147,14 @@
</span><span class="cx"> EXPECT_GT(fileSize(shmTargetURL), 0);
</span><span class="cx"> EXPECT_GT(fileSize(walTargetURL), 0);
</span><span class="cx">
</span><ins>+ static size_t originalWebsiteDataRecordCount;
+
</ins><span class="cx"> // Make sure there is a record in the WKWebsiteDataStore.
</span><span class="cx"> readyToContinue = false;
</span><span class="cx"> [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
</span><span class="cx"> {
</span><del>- EXPECT_EQ(websiteDataRecords.count, 1ul);
</del><ins>+ EXPECT_GT(websiteDataRecords.count, 0ul);
+ originalWebsiteDataRecordCount = websiteDataRecords.count;
</ins><span class="cx"> readyToContinue = true;
</span><span class="cx"> }];
</span><span class="cx"> TestWebKitAPI::Util::run(&readyToContinue);
</span><span class="lines">@@ -166,7 +169,7 @@
</span><span class="cx"> EXPECT_EQ(fileSize(walTargetURL), 0);
</span><span class="cx"> [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
</span><span class="cx"> {
</span><del>- EXPECT_EQ(websiteDataRecords.count, 0ul);
</del><ins>+ EXPECT_EQ(websiteDataRecords.count, originalWebsiteDataRecordCount - 1);
</ins><span class="cx"> readyToContinue = true;
</span><span class="cx"> }];
</span><span class="cx"> }];
</span></span></pre>
</div>
</div>
</body>
</html>