Diff
Modified: branches/safari-607-branch/Tools/ChangeLog (239794 => 239795)
--- branches/safari-607-branch/Tools/ChangeLog 2019-01-10 00:40:11 UTC (rev 239794)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-01-10 01:37:52 UTC (rev 239795)
@@ -1,3 +1,36 @@
+2019-01-09 Kocsen Chung <kocsen_ch...@apple.com>
+
+ Cherry-pick r239676. rdar://problem/47158606
+
+ API test broken: TestWebKitAPI.WebKit.CustomDataStorePathsVersusCompletionHandlers
+ https://bugs.webkit.org/show_bug.cgi?id=193175
+
+ Reviewed by Chris Dumez.
+
+ Updated API test as we bumped the SW schema to version 4.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-4.sqlite3: Renamed from Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3.
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-07 Youenn Fablet <you...@apple.com>
+
+ API test broken: TestWebKitAPI.WebKit.CustomDataStorePathsVersusCompletionHandlers
+ https://bugs.webkit.org/show_bug.cgi?id=193175
+
+ Reviewed by Chris Dumez.
+
+ Updated API test as we bumped the SW schema to version 4.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-4.sqlite3: Renamed from Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3.
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (TEST):
+
2019-01-08 Alan Coon <alanc...@apple.com>
Cherry-pick r239726. rdar://problem/47097726
Modified: branches/safari-607-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (239794 => 239795)
--- branches/safari-607-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-01-10 00:40:11 UTC (rev 239794)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2019-01-10 01:37:52 UTC (rev 239795)
@@ -179,7 +179,7 @@
467C565321B5ED130057516D /* GetSessionCookie.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 467C565121B5ECDF0057516D /* GetSessionCookie.html */; };
467C565421B5ED130057516D /* SetSessionCookie.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 467C565221B5ECDF0057516D /* SetSessionCookie.html */; };
46A911592108E6780078D40D /* CustomUserAgent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A911582108E66B0078D40D /* CustomUserAgent.mm */; };
- 46AE5A3720F9066D00E0873E /* SimpleServiceWorkerRegistrations-3.sqlite3 in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-3.sqlite3 */; };
+ 46AE5A3720F9066D00E0873E /* SimpleServiceWorkerRegistrations-4.sqlite3 in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-4.sqlite3 */; };
46C519DA1D355AB200DAA51A /* LocalStorageNullEntries.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46C519D81D355A7300DAA51A /* LocalStorageNullEntries.mm */; };
46C519E61D3563FD00DAA51A /* LocalStorageNullEntries.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 46C519E21D35629600DAA51A /* LocalStorageNullEntries.html */; };
46C519E71D3563FD00DAA51A /* LocalStorageNullEntries.localstorage in Copy Resources */ = {isa = PBXBuildFile; fileRef = 46C519E31D35629600DAA51A /* LocalStorageNullEntries.localstorage */; };
@@ -1233,7 +1233,7 @@
BC909784125571CF00083756 /* simple.html in Copy Resources */,
51E5C7021919C3B200D8B3E1 /* simple2.html in Copy Resources */,
51E5C7031919C3B200D8B3E1 /* simple3.html in Copy Resources */,
- 46AE5A3720F9066D00E0873E /* SimpleServiceWorkerRegistrations-3.sqlite3 in Copy Resources */,
+ 46AE5A3720F9066D00E0873E /* SimpleServiceWorkerRegistrations-4.sqlite3 in Copy Resources */,
F4F405BD1D4C0D1C007A9707 /* skinny-autoplaying-video-with-audio.html in Copy Resources */,
C01A23F21266156700C9ED55 /* spacebar-scrolling.html in Copy Resources */,
E194E1BD177E53C7009C4D4E /* StopLoadingFromDidReceiveResponse.html in Copy Resources */,
@@ -1512,7 +1512,7 @@
4612C2B8210A6ABF00B788A6 /* LoadFileThenReload.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoadFileThenReload.mm; sourceTree = "<group>"; };
46397B941DC2C850009A78AE /* DOMNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMNode.mm; sourceTree = "<group>"; };
4647B1251EBA3B730041D7EF /* ProcessDidTerminate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessDidTerminate.cpp; sourceTree = "<group>"; };
- 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-3.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SimpleServiceWorkerRegistrations-3.sqlite3"; sourceTree = "<group>"; };
+ 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-4.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SimpleServiceWorkerRegistrations-4.sqlite3"; sourceTree = "<group>"; };
466C3842210637CE006A88DE /* notify-resourceLoadObserver.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "notify-resourceLoadObserver.html"; sourceTree = "<group>"; };
467C565121B5ECDF0057516D /* GetSessionCookie.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = GetSessionCookie.html; sourceTree = "<group>"; };
467C565221B5ECDF0057516D /* SetSessionCookie.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = SetSessionCookie.html; sourceTree = "<group>"; };
@@ -2923,7 +2923,7 @@
F4E3D80720F708E4007B58C5 /* significant-text-milestone-article.html */,
F4FC077620F0108100CA043C /* significant-text-milestone.html */,
C9B4AD291ECA6EA500F5FEA0 /* silence-long.m4a */,
- 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-3.sqlite3 */,
+ 4656A75720F9054F0002E21F /* SimpleServiceWorkerRegistrations-4.sqlite3 */,
F4F405BB1D4C0CF8007A9707 /* skinny-autoplaying-video-with-audio.html */,
515BE16E1D4288FF00DD7C68 /* StoreBlobToBeDeleted.html */,
9BD6D3A11F7B202100BD4962 /* sunset-in-cupertino-100px.tiff */,
Deleted: branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3 (239794 => 239795)
--- branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3 2019-01-10 00:40:11 UTC (rev 239794)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3 2019-01-10 01:37:52 UTC (rev 239795)
@@ -1,50 +0,0 @@
-SQLite format 3@ .$\x80
-\xF8
-\x94
-\x94\xC9
\x842\x88;tableRecordsRecordsCREATE TABLE Records (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL, contentSecurit
yPolicy BLOB NOT NULL ON CONFLICT FAIL, scriptResourceMap BLOB NOT NULL ON CONFLICT FAIL)-Aindexsqlite_autoindex_Records_1Records
-
-:
-:
\x8BC
-s7 7S\x94$ https_mdn.github.io__https://mdn.github.io/sw-test/https://mdn.github.io/sw-test/https_mdn.github.io_0A\xD6\xD22o\x9EW\xDEImportshttps://mdn.github.io/sw-test/sw.jsself.addEventListener('install', function(event) {
- event.waitUntil(
- caches.open('v1').then(function(cache) {
- return cache.addAll([
- '/sw-test/',
- '/sw-test/index.html',
- '/sw-test/style.css',
- '/sw-test/app.js',
- '/sw-test/image-list.js',
- '/sw-test/star-wars-logo.jpg',
- '/sw-test/gallery/bountyHunters.jpg',
- '/sw-test/gallery/myLittleVader.jpg',
- '/sw-test/gallery/snowTroopers.jpg'
- ]);
- })
- );
-});
-
-self.addEventListener('fetch', function(event) {
- event.respondWith(caches.match(event.request).then(function(response) {
- // caches.match() always resolves
- // but in case of success response will have value
- if (response !== undefined) {
- return response;
- } else {
- return fetch(event.request).then(function (response) {
- // response may be used only once
- // we need to save clone to put one copy in cache
- // and serve second one
- let responseClone = response.clone();
-
- caches.open('v1').then(function (cache) {
- cache.put(event.request, responseClone);
- });
- return response;
- }).catch(function () {
- return caches.match('/sw-test/gallery/myLittleVader.jpg');
- });
- }
- }));
-});
-Classic\xC8
-\xC9\xC9
6s https_mdn.github.io__https://mdn.github.io/sw-test/
\ No newline at end of file
Copied: branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-4.sqlite3 (from rev 239794, branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-3.sqlite3) (0 => 239795)
--- branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-4.sqlite3 (rev 0)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/SimpleServiceWorkerRegistrations-4.sqlite3 2019-01-10 01:37:52 UTC (rev 239795)
@@ -0,0 +1,50 @@
+SQLite format 3@ .$\x80
+\xF8
+e
+e\xC9
\x84a\x89tableRecordsRecordsCREATE TABLE Records (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, origin TEXT NOT NULL ON CONFLICT FAIL, scopeURL TEXT NOT NULL ON CONFLICT FAIL, topOrigin TEXT NOT NULL ON CONFLICT FAIL, lastUpdateCheckTime DOUBLE NOT NULL ON CONFLICT FAIL, updateViaCache TEXT NOT NULL ON CONFLICT FAIL, scriptURL TEXT NOT NULL ON CONFLICT FAIL, script TEXT NOT NULL ON CONFLICT FAIL, workerType TEXT NOT NULL ON CONFLICT FAIL, contentSecurityPolicy BLOB NOT NULL ON CONFLICT FAIL, referrerPolic
y TEXT NOT NULL ON CONFLICT FAIL, scriptResourceMap BLOB NOT NULL ON CONFLICT FAIL)-Aindexsqlite_autoindex_Records_1Records
+
+9
+9
\x8BDs7 7S\x94$
+ https_mdn.github.io__https://mdn.github.io/sw-test/https://mdn.github.io/sw-test/https_mdn.github.io_0A\xD7 \x94P\xE4^\xE1Importshttps://mdn.github.io/sw-test/sw.jsself.addEventListener('install', function(event) {
+ event.waitUntil(
+ caches.open('v1').then(function(cache) {
+ return cache.addAll([
+ '/sw-test/',
+ '/sw-test/index.html',
+ '/sw-test/style.css',
+ '/sw-test/app.js',
+ '/sw-test/image-list.js',
+ '/sw-test/star-wars-logo.jpg',
+ '/sw-test/gallery/bountyHunters.jpg',
+ '/sw-test/gallery/myLittleVader.jpg',
+ '/sw-test/gallery/snowTroopers.jpg'
+ ]);
+ })
+ );
+});
+
+self.addEventListener('fetch', function(event) {
+ event.respondWith(caches.match(event.request).then(function(response) {
+ // caches.match() always resolves
+ // but in case of success response will have value
+ if (response !== undefined) {
+ return response;
+ } else {
+ return fetch(event.request).then(function (response) {
+ // response may be used only once
+ // we need to save clone to put one copy in cache
+ // and serve second one
+ let responseClone = response.clone();
+
+ caches.open('v1').then(function (cache) {
+ cache.put(event.request, responseClone);
+ });
+ return response;
+ }).catch(function () {
+ return caches.match('/sw-test/gallery/myLittleVader.jpg');
+ });
+ }
+ }));
+});
+Classic\xC8
+\xC9\xC9
6s https_mdn.github.io__https://mdn.github.io/sw-test/
\ No newline at end of file
Modified: branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (239794 => 239795)
--- branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2019-01-10 00:40:11 UTC (rev 239794)
+++ branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2019-01-10 01:37:52 UTC (rev 239795)
@@ -280,7 +280,7 @@
TEST(WebKit, CustomDataStorePathsVersusCompletionHandlers)
{
// Copy the baked database files to the database directory
- NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"SimpleServiceWorkerRegistrations-3" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
+ NSURL *url1 = [[NSBundle mainBundle] URLForResource:@"SimpleServiceWorkerRegistrations-4" withExtension:@"sqlite3" subdirectory:@"TestWebKitAPI.resources"];
NSURL *swPath = [NSURL fileURLWithPath:[@"~/Library/Caches/TestWebKitAPI/WebKit/ServiceWorkers/" stringByExpandingTildeInPath]];
[[NSFileManager defaultManager] removeItemAtURL:swPath error:nil];
@@ -287,7 +287,7 @@
EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:swPath.path]);
[[NSFileManager defaultManager] createDirectoryAtURL:swPath withIntermediateDirectories:YES attributes:nil error:nil];
- [[NSFileManager defaultManager] copyItemAtURL:url1 toURL:[swPath URLByAppendingPathComponent:@"ServiceWorkerRegistrations-3.sqlite3"] error:nil];
+ [[NSFileManager defaultManager] copyItemAtURL:url1 toURL:[swPath URLByAppendingPathComponent:@"ServiceWorkerRegistrations-4.sqlite3"] error:nil];
auto websiteDataStoreConfiguration = adoptNS([[_WKWebsiteDataStoreConfiguration alloc] init]);
websiteDataStoreConfiguration.get()._serviceWorkerRegistrationDirectory = swPath;
