<!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>[203429] 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/203429">203429</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 16:06:42 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add regression test for <a href="http://trac.webkit.org/projects/webkit/changeset/203392">r203392</a>
https://bugs.webkit.org/show_bug.cgi?id=159949
Reviewed by Brady Eidson.
* TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:
(fileSize):
(swizzledBundleIdentifierWebBookmarksD):
(defaultApplicationCacheDirectory):
(TEST):
(swizzledBundleIdentifierMobileSafari): Deleted.
This actually tests that webbookmarksd uses the path quirk in WebsiteDataStore::defaultApplicationCacheDirectory.
I wanted to verify that it uses the same path as MobileSafari, but swizzling out the bundleIdentifier twice caused
problems with the static bools that are set once in RuntimeApplicationChecks.mm.</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 (203428 => 203429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-19 22:55:50 UTC (rev 203428)
+++ trunk/Tools/ChangeLog 2016-07-19 23:06:42 UTC (rev 203429)
</span><span class="lines">@@ -5,6 +5,23 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Brady Eidson.
</span><span class="cx">
</span><ins>+ * TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm:
+ (fileSize):
+ (swizzledBundleIdentifierWebBookmarksD):
+ (defaultApplicationCacheDirectory):
+ (TEST):
+ (swizzledBundleIdentifierMobileSafari): Deleted.
+ This actually tests that webbookmarksd uses the path quirk in WebsiteDataStore::defaultApplicationCacheDirectory.
+ I wanted to verify that it uses the same path as MobileSafari, but swizzling out the bundleIdentifier twice caused
+ problems with the static bools that are set once in RuntimeApplicationChecks.mm.
+
+2016-07-19 Alex Christensen <achristensen@webkit.org>
+
+ Add regression test for r203392
+ https://bugs.webkit.org/show_bug.cgi?id=159949
+
+ Reviewed by Brady Eidson.
+
</ins><span class="cx"> * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
</span><span class="cx"> * TestWebKitAPI/Tests/WebKit2Cocoa/ApplicationCache.db: Added.
</span><span class="cx"> * TestWebKitAPI/Tests/WebKit2Cocoa/ApplicationCache.db-shm: Added.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaLocalStorageClearmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm (203428 => 203429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm 2016-07-19 22:55:50 UTC (rev 203428)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LocalStorageClear.mm 2016-07-19 23:06:42 UTC (rev 203429)
</span><span class="lines">@@ -99,11 +99,6 @@
</span><span class="cx"> return [[fileAttributes objectForKey:NSFileSize] longLongValue];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSString *swizzledBundleIdentifierMobileSafari()
-{
- return @"com.apple.mobilesafari";
-}
-
</del><span class="cx"> NSString *swizzledBundleIdentifierWebBookmarksD()
</span><span class="cx"> {
</span><span class="cx"> return @"com.apple.webbookmarksd";
</span><span class="lines">@@ -111,48 +106,55 @@
</span><span class="cx">
</span><span class="cx"> NSString *defaultApplicationCacheDirectory()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ // This is to mirror a quirk in WebsiteDataStore::defaultApplicationCacheDirectory and catch any regressions.
+ return [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
+#else
</ins><span class="cx"> return @"~/Library/Caches/TestWebKitAPI/WebKit/OfflineWebApplicationCache";
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WKWebView, ClearAppCache)
</span><span class="cx"> {
</span><del>- {
- NSURL *dbResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db" subdirectory:@"TestWebKitAPI.resources"];
- NSURL *shmResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db-shm" subdirectory:@"TestWebKitAPI.resources"];
- NSURL *walResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db-wal" subdirectory:@"TestWebKitAPI.resources"];
-
- NSURL *targetURL = [NSURL fileURLWithPath:[defaultApplicationCacheDirectory() stringByExpandingTildeInPath]];
- [[NSFileManager defaultManager] createDirectoryAtURL:targetURL withIntermediateDirectories:YES attributes:nil error:nil];
-
- NSURL *dbTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db"];
- NSURL *walTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db-wal"];
- NSURL *shmTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db-shm"];
</del><ins>+#if PLATFORM(IOS)
+ // On iOS, MobileSafari and webbookmarksd need to share the same AppCache directory.
+ TestWebKitAPI::InstanceMethodSwizzler swizzle([NSBundle class], @selector(bundleIdentifier), reinterpret_cast<IMP>(swizzledBundleIdentifierWebBookmarksD));
+#endif
+ NSURL *dbResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db" subdirectory:@"TestWebKitAPI.resources"];
+ NSURL *shmResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db-shm" subdirectory:@"TestWebKitAPI.resources"];
+ NSURL *walResourceURL = [[NSBundle mainBundle] URLForResource:@"ApplicationCache" withExtension:@"db-wal" subdirectory:@"TestWebKitAPI.resources"];
+
+ NSURL *targetURL = [NSURL fileURLWithPath:[defaultApplicationCacheDirectory() stringByExpandingTildeInPath]];
+ [[NSFileManager defaultManager] createDirectoryAtURL:targetURL withIntermediateDirectories:YES attributes:nil error:nil];
+
+ NSURL *dbTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db"];
+ NSURL *walTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db-wal"];
+ NSURL *shmTargetURL = [targetURL URLByAppendingPathComponent:@"ApplicationCache.db-shm"];
</ins><span class="cx">
</span><del>- // Clean up any files that may have been left from this test failing before.
- [[NSFileManager defaultManager] removeItemAtURL:dbTargetURL error:nil];
- [[NSFileManager defaultManager] removeItemAtURL:walTargetURL error:nil];
- [[NSFileManager defaultManager] removeItemAtURL:shmTargetURL error:nil];
- EXPECT_EQ(fileSize(dbTargetURL), -1);
- EXPECT_EQ(fileSize(walTargetURL), -1);
- EXPECT_EQ(fileSize(shmTargetURL), -1);
-
- // Copy the resources from the bundle to ~/Library/...
- [[NSFileManager defaultManager] copyItemAtURL:dbResourceURL toURL:dbTargetURL error:nil];
- [[NSFileManager defaultManager] copyItemAtURL:shmResourceURL toURL:shmTargetURL error:nil];
- [[NSFileManager defaultManager] copyItemAtURL:walResourceURL toURL:walTargetURL error:nil];
- EXPECT_GT(fileSize(dbTargetURL), 0);
- EXPECT_GT(fileSize(shmTargetURL), 0);
- EXPECT_GT(fileSize(walTargetURL), 0);
</del><ins>+ // Clean up any files that may have been left from this test failing before.
+ [[NSFileManager defaultManager] removeItemAtURL:dbTargetURL error:nil];
+ [[NSFileManager defaultManager] removeItemAtURL:walTargetURL error:nil];
+ [[NSFileManager defaultManager] removeItemAtURL:shmTargetURL error:nil];
+ EXPECT_EQ(fileSize(dbTargetURL), -1);
+ EXPECT_EQ(fileSize(walTargetURL), -1);
+ EXPECT_EQ(fileSize(shmTargetURL), -1);
+
+ // Copy the resources from the bundle to ~/Library/...
+ [[NSFileManager defaultManager] copyItemAtURL:dbResourceURL toURL:dbTargetURL error:nil];
+ [[NSFileManager defaultManager] copyItemAtURL:shmResourceURL toURL:shmTargetURL error:nil];
+ [[NSFileManager defaultManager] copyItemAtURL:walResourceURL toURL:walTargetURL error:nil];
+ EXPECT_GT(fileSize(dbTargetURL), 0);
+ EXPECT_GT(fileSize(shmTargetURL), 0);
+ EXPECT_GT(fileSize(walTargetURL), 0);
</ins><span class="cx">
</span><del>- // Make sure there is a record in the WKWebsiteDataStore.
- readyToContinue = false;
- [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
- {
- EXPECT_EQ(websiteDataRecords.count, 1ul);
- readyToContinue = true;
- }];
- TestWebKitAPI::Util::run(&readyToContinue);
- }
</del><ins>+ // Make sure there is a record in the WKWebsiteDataStore.
+ readyToContinue = false;
+ [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray<WKWebsiteDataRecord *> *websiteDataRecords)
+ {
+ EXPECT_EQ(websiteDataRecords.count, 1ul);
+ readyToContinue = true;
+ }];
+ TestWebKitAPI::Util::run(&readyToContinue);
</ins><span class="cx">
</span><span class="cx"> readyToContinue = false;
</span><span class="cx"> [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^()
</span></span></pre>
</div>
</div>
</body>
</html>