225773 2021-05-13 11:03:44 -0700 Add unit test using WKHTTPCookieStoreObserver and cookies received from HTTP 2021-05-13 15:08:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1759747 0 achristensen 2021-05-13 11:03:44 -0700 Add unit test using WKHTTPCookieStoreObserver and cookies received from HTTP 1759748 1 428534 achristensen 2021-05-13 11:04:37 -0700 Created attachment 428534 Patch 1759753 2 428534 cdumez 2021-05-13 11:12:23 -0700 Comment on attachment 428534 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428534&action=review r=me with suggestions. > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:462 > +static void deleteAllCookies(WKHTTPCookieStore *store, RetainPtr<NSMutableArray> array, BlockPtr<void(void)> completionBlock) Maybe we should call this deleteCookies() instead of deleteAllCookies() given that it only deletes the cookies in the provided array. Maybe we could rename array to cookies too for clarity. > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:466 > + [store deleteCookie:[array lastObject] completionHandler:^(void) { We're not really testing the parallelism here and it is slower than could be. I wish we'd use WTF's CallbackAggregator and do the removals in parallel. > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:479 > + deleteAllCookies(store, adoptNS([cookies mutableCopy]), ^{ Why `adoptNS([cookies mutableCopy]` instead of just `cookies` ? > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:501 > + EXPECT_EQ(cookies.count, 1u); Should probably be ASSERT_EQ() in case we get 0 cookies. 1759756 3 achristensen 2021-05-13 11:15:00 -0700 (In reply to Chris Dumez from comment #2) > Comment on attachment 428534 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=428534&action=review > > r=me with suggestions. > > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:462 > > +static void deleteAllCookies(WKHTTPCookieStore *store, RetainPtr<NSMutableArray> array, BlockPtr<void(void)> completionBlock) > > Maybe we should call this deleteCookies() instead of deleteAllCookies() > given that it only deletes the cookies in the provided array. > > Maybe we could rename array to cookies too for clarity. Brilliant. > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:466 > > + [store deleteCookie:[array lastObject] completionHandler:^(void) { > > We're not really testing the parallelism here and it is slower than could > be. I wish we'd use WTF's CallbackAggregator and do the removals in parallel. Parallelism isn't important here. I'm just removing any leftovers from previous tests. > > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:479 > > + deleteAllCookies(store, adoptNS([cookies mutableCopy]), ^{ > > Why `adoptNS([cookies mutableCopy]` instead of just `cookies` ? It needs to be mutable because I remove them one by one. 1759800 4 428552 achristensen 2021-05-13 13:09:00 -0700 Created attachment 428552 Patch 1759837 5 ews-feeder 2021-05-13 14:28:42 -0700 Committed r277451 (237699@main): <https://commits.webkit.org/237699@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428552. 1759854 6 webkit-bug-importer 2021-05-13 15:08:23 -0700 <rdar://problem/77988762> 428534 2021-05-13 11:04:37 -0700 2021-05-13 13:08:59 -0700 Patch bug-225773-20210513110437.patch text/plain 4079 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmNlYTFhYzBhOThkNGJhNDM4NDY2MDJmYzA1YjUxYTY0 M2MxODBkNS4uNGZiYjg1MmRlYzY2MmNjNmYxMjQ0ZWE1YTk4ZGEwMGNhN2ZhODBjZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTA1LTEzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgQWRkIHVuaXQgdGVzdCB1c2luZyBXS0hUVFBDb29raWVTdG9yZU9ic2Vy dmVyIGFuZCBjb29raWVzIHJlY2VpdmVkIGZyb20gSFRUUAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugb25seSBoYWQgdGVzdHMgdGhhdCBhZGRlZCBj b29raWVzIHRocm91Z2ggdGhlIEFQSSwgbm90IHRocm91Z2ggdGhlIG5ldHdvcmsuCisgICAgICAg IEkgdGhvdWdodCBpdCB3YXMgYnJva2VuIGJ1dCBpdCBpc24ndC4gIFN0aWxsIHdvcnRoIGFkZGlu ZyB0aGUgdGVzdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tIVFRQQ29va2llU3RvcmUubW06CisgICAgICAgIChkZWxldGVBbGxDb29raWVzKToKKyAgICAg ICAgKFRFU1QpOgorCiAyMDIxLTA1LTEyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgW01vdGlvbk1hcmtdIFVwZGF0ZSBwbGFuIGZpbGUgYWZ0ZXIg cjI3NzQwNgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS0hUVFBDb29raWVTdG9yZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV0tIVFRQQ29va2llU3RvcmUubW0KaW5kZXggZDQ5ODBjZmQ0NzAyZWIzYjMyYTE4M2Q1 OWUyYzkwMzQyZjJlM2IxYy4uMDUyNTY1MGE3MTZjNGM3NWJmNzRmNTc5ODAxN2EzODU2OTg0ZWE1 YSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0hU VFBDb29raWVTdG9yZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1dLSFRUUENvb2tpZVN0b3JlLm1tCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbXBvcnQgImNv bmZpZy5oIgogCisjaW1wb3J0ICJIVFRQU2VydmVyLmgiCiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxp dGllcy5oIgogI2ltcG9ydCAiVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5oIgogI2ltcG9ydCAiVGVz dFdLV2ViVmlldy5oIgpAQCAtMzQsNiArMzUsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0 ZURhdGFTdG9yZVByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9fV0tQcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24uaD4KICNpbXBvcnQgPFdlYktpdC9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvbi5oPgorI2ltcG9ydCA8d3RmL0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvUHJvY2Vzc1By aXZpbGVnZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL1NlY29u ZHMuaD4KQEAgLTQ1Nyw2ICs0NTksNTggQEAgVEVTVChXZWJLaXQsIENvb2tpZU9ic2VydmVyQ3Jh c2gpCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZnb3RGbGFnKTsKIH0KIAorc3RhdGlj IHZvaWQgZGVsZXRlQWxsQ29va2llcyhXS0hUVFBDb29raWVTdG9yZSAqc3RvcmUsIFJldGFpblB0 cjxOU011dGFibGVBcnJheT4gYXJyYXksIEJsb2NrUHRyPHZvaWQodm9pZCk+IGNvbXBsZXRpb25C bG9jaykKK3sKKyAgICBpZiAoIVthcnJheSBjb3VudF0pCisgICAgICAgIHJldHVybiBjb21wbGV0 aW9uQmxvY2soKTsKKyAgICBbc3RvcmUgZGVsZXRlQ29va2llOlthcnJheSBsYXN0T2JqZWN0XSBj b21wbGV0aW9uSGFuZGxlcjpeKHZvaWQpIHsKKyAgICAgICAgW2FycmF5IHJlbW92ZUxhc3RPYmpl Y3RdOworICAgICAgICBkZWxldGVBbGxDb29raWVzKHN0b3JlLCBhcnJheSwgY29tcGxldGlvbkJs b2NrKTsKKyAgICB9XTsKK30KKworVEVTVChXS0hUVFBDb29raWVTdG9yZSwgT2JzZXJ2ZUNvb2tp ZXNSZWNlaXZlZEZyb21IVFRQKQoreworICAgIFRlc3RXZWJLaXRBUEk6OkhUVFBTZXJ2ZXIgc2Vy dmVyKHt7ICIvIiwge3t7ICJTZXQtQ29va2llIiwgInRlc3RrZXk9dGVzdHZhbHVlIiB9fSwgImhl bGxvIiB9fX0pOworCisgICAgYXV0byByZW1vdmVBbGxDb29raWVzID0gW10gKFdLSFRUUENvb2tp ZVN0b3JlICpzdG9yZSkgeworICAgICAgICBfX2Jsb2NrIGJvb2wgZGVsZXRlZEFsbENvb2tpZXMg PSBmYWxzZTsKKyAgICAgICAgW3N0b3JlIGdldEFsbENvb2tpZXM6XihOU0FycmF5PE5TSFRUUENv b2tpZSAqPiAqY29va2llcykgeworICAgICAgICAgICAgZGVsZXRlQWxsQ29va2llcyhzdG9yZSwg YWRvcHROUyhbY29va2llcyBtdXRhYmxlQ29weV0pLCBeeworICAgICAgICAgICAgICAgIGRlbGV0 ZWRBbGxDb29raWVzID0gdHJ1ZTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9XTsKKyAgICAg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkZWxldGVkQWxsQ29va2llcyk7CisgICAgfTsK KworICAgIGF1dG8gcnVuVGVzdCA9IFsmXSAoV0tXZWJzaXRlRGF0YVN0b3JlICpkYXRhU3RvcmUp IHsKKyAgICAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBuZXddKTsKKyAgICAgICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0 b3JlID0gZGF0YVN0b3JlOworICAgICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdFplcm8gY29uZmlndXJhdGlvbjpjb25maWd1 cmF0aW9uLmdldCgpXSk7CisgICAgICAgIGF1dG8gb2JzZXJ2ZXIgPSBhZG9wdE5TKFtDb29raWVP YnNlcnZlciBuZXddKTsKKyAgICAgICAgZ2xvYmFsQ29va2llU3RvcmUgPSB3ZWJWaWV3LmdldCgp LmNvbmZpZ3VyYXRpb24ud2Vic2l0ZURhdGFTdG9yZS5odHRwQ29va2llU3RvcmU7CisgICAgICAg IHJlbW92ZUFsbENvb2tpZXMoZ2xvYmFsQ29va2llU3RvcmUuZ2V0KCkpOworICAgICAgICBbZ2xv YmFsQ29va2llU3RvcmUgYWRkT2JzZXJ2ZXI6b2JzZXJ2ZXIuZ2V0KCldOworICAgICAgICBvYnNl cnZlckNhbGxiYWNrcyA9IDA7CisgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnNlcnZlci5y ZXF1ZXN0KCldOworICAgICAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdh dGlvbl07CisgICAgICAgIHdoaWxlICghb2JzZXJ2ZXJDYWxsYmFja3MpCisgICAgICAgICAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOworICAgICAgICBfX2Jsb2NrIGJvb2wg Z290Q29va2llID0gZmFsc2U7CisgICAgICAgIFtnbG9iYWxDb29raWVTdG9yZSBnZXRBbGxDb29r aWVzOl4oTlNBcnJheTxOU0hUVFBDb29raWUgKj4gKmNvb2tpZXMpIHsKKyAgICAgICAgICAgIEVY UEVDVF9FUShjb29raWVzLmNvdW50LCAxdSk7CisgICAgICAgICAgICBFWFBFQ1RfV0tfU1RSRVEo Y29va2llc1swXS5uYW1lLCAidGVzdGtleSIpOworICAgICAgICAgICAgRVhQRUNUX1dLX1NUUkVR KGNvb2tpZXNbMF0udmFsdWUsICJ0ZXN0dmFsdWUiKTsKKyAgICAgICAgICAgIGdvdENvb2tpZSA9 IHRydWU7CisgICAgICAgIH1dOworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmdv dENvb2tpZSk7CisgICAgICAgIEVYUEVDVF9FUShvYnNlcnZlckNhbGxiYWNrcywgMXUpOworICAg IH07CisKKyAgICBydW5UZXN0KFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0p OworICAgIHJ1blRlc3QoW1dLV2Vic2l0ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3Jl XSk7Cit9CisKIHN0YXRpYyBib29sIGZpbmlzaGVkOwogCiBAaW50ZXJmYWNlIENvb2tpZVVJRGVs ZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlPgo= 428552 2021-05-13 13:09:00 -0700 2021-05-13 15:00:48 -0700 Patch bug-225773-20210513130900.patch text/plain 4084 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmNlYTFhYzBhOThkNGJhNDM4NDY2MDJmYzA1YjUxYTY0 M2MxODBkNS4uMTgyYmEwMTJlMTU0NjZhYWEzMWRlMWZhNGM3NDFjZmRiNmU2NDViYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIxLTA1LTEzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgQWRkIHVuaXQgdGVzdCB1c2luZyBXS0hUVFBDb29raWVTdG9yZU9ic2Vy dmVyIGFuZCBjb29raWVzIHJlY2VpdmVkIGZyb20gSFRUUAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1NzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRHVtZXouCisKKyAgICAgICAgV2Ugb25seSBoYWQgdGVzdHMgdGhhdCBhZGRlZCBjb29r aWVzIHRocm91Z2ggdGhlIEFQSSwgbm90IHRocm91Z2ggdGhlIG5ldHdvcmsuCisgICAgICAgIEkg dGhvdWdodCBpdCB3YXMgYnJva2VuIGJ1dCBpdCBpc24ndC4gIFN0aWxsIHdvcnRoIGFkZGluZyB0 aGUgdGVzdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tI VFRQQ29va2llU3RvcmUubW06CisgICAgICAgIChkZWxldGVBbGxDb29raWVzKToKKyAgICAgICAg KFRFU1QpOgorCiAyMDIxLTA1LTEyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW01vdGlvbk1hcmtdIFVwZGF0ZSBwbGFuIGZpbGUgYWZ0ZXIgcjI3 NzQwNgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X S0hUVFBDb29raWVTdG9yZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvV0tIVFRQQ29va2llU3RvcmUubW0KaW5kZXggZDQ5ODBjZmQ0NzAyZWIzYjMyYTE4M2Q1OWUy YzkwMzQyZjJlM2IxYy4uOTBjYWY1MWQxMjg3YTM0Y2JkMjNkN2MxNTQxOWRlOTgwNTE5YTI0NiAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0hUVFBD b29raWVTdG9yZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dLSFRUUENvb2tpZVN0b3JlLm1tCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbXBvcnQgImNvbmZp Zy5oIgogCisjaW1wb3J0ICJIVFRQU2VydmVyLmgiCiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGll cy5oIgogI2ltcG9ydCAiVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5oIgogI2ltcG9ydCAiVGVzdFdL V2ViVmlldy5oIgpAQCAtMzQsNiArMzUsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLV2Vic2l0ZURh dGFTdG9yZVByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9fV0tQcm9jZXNzUG9vbENvbmZpZ3Vy YXRpb24uaD4KICNpbXBvcnQgPFdlYktpdC9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv bi5oPgorI2ltcG9ydCA8d3RmL0Jsb2NrUHRyLmg+CiAjaW1wb3J0IDx3dGYvUHJvY2Vzc1ByaXZp bGVnZS5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8d3RmL1NlY29uZHMu aD4KQEAgLTQ1Nyw2ICs0NTksNTggQEAgVEVTVChXZWJLaXQsIENvb2tpZU9ic2VydmVyQ3Jhc2gp CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZnb3RGbGFnKTsKIH0KIAorc3RhdGljIHZv aWQgZGVsZXRlQ29va2llcyhXS0hUVFBDb29raWVTdG9yZSAqc3RvcmUsIFJldGFpblB0cjxOU011 dGFibGVBcnJheT4gY29va2llcywgQmxvY2tQdHI8dm9pZCh2b2lkKT4gY29tcGxldGlvbkJsb2Nr KQoreworICAgIGlmICghW2Nvb2tpZXMgY291bnRdKQorICAgICAgICByZXR1cm4gY29tcGxldGlv bkJsb2NrKCk7CisgICAgW3N0b3JlIGRlbGV0ZUNvb2tpZTpbY29va2llcyBsYXN0T2JqZWN0XSBj b21wbGV0aW9uSGFuZGxlcjpeKHZvaWQpIHsKKyAgICAgICAgW2Nvb2tpZXMgcmVtb3ZlTGFzdE9i amVjdF07CisgICAgICAgIGRlbGV0ZUNvb2tpZXMoc3RvcmUsIGNvb2tpZXMsIGNvbXBsZXRpb25C bG9jayk7CisgICAgfV07Cit9CisKK1RFU1QoV0tIVFRQQ29va2llU3RvcmUsIE9ic2VydmVDb29r aWVzUmVjZWl2ZWRGcm9tSFRUUCkKK3sKKyAgICBUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyIHNl cnZlcih7eyAiLyIsIHt7eyAiU2V0LUNvb2tpZSIsICJ0ZXN0a2V5PXRlc3R2YWx1ZSIgfX0sICJo ZWxsbyIgfX19KTsKKworICAgIGF1dG8gcmVtb3ZlQWxsQ29va2llcyA9IFtdIChXS0hUVFBDb29r aWVTdG9yZSAqc3RvcmUpIHsKKyAgICAgICAgX19ibG9jayBib29sIGRlbGV0ZWRBbGxDb29raWVz ID0gZmFsc2U7CisgICAgICAgIFtzdG9yZSBnZXRBbGxDb29raWVzOl4oTlNBcnJheTxOU0hUVFBD b29raWUgKj4gKmNvb2tpZXMpIHsKKyAgICAgICAgICAgIGRlbGV0ZUNvb2tpZXMoc3RvcmUsIGFk b3B0TlMoW2Nvb2tpZXMgbXV0YWJsZUNvcHldKSwgXnsKKyAgICAgICAgICAgICAgICBkZWxldGVk QWxsQ29va2llcyA9IHRydWU7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfV07CisgICAgICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGVsZXRlZEFsbENvb2tpZXMpOworICAgIH07CisK KyAgICBhdXRvIHJ1blRlc3QgPSBbJl0gKFdLV2Vic2l0ZURhdGFTdG9yZSAqZGF0YVN0b3JlKSB7 CisgICAgICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gbmV3XSk7CisgICAgICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkud2Vic2l0ZURhdGFTdG9y ZSA9IGRhdGFTdG9yZTsKKyAgICAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJh dGlvbi5nZXQoKV0pOworICAgICAgICBhdXRvIG9ic2VydmVyID0gYWRvcHROUyhbQ29va2llT2Jz ZXJ2ZXIgbmV3XSk7CisgICAgICAgIGdsb2JhbENvb2tpZVN0b3JlID0gd2ViVmlldy5nZXQoKS5j b25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUuaHR0cENvb2tpZVN0b3JlOworICAgICAgICBy ZW1vdmVBbGxDb29raWVzKGdsb2JhbENvb2tpZVN0b3JlLmdldCgpKTsKKyAgICAgICAgW2dsb2Jh bENvb2tpZVN0b3JlIGFkZE9ic2VydmVyOm9ic2VydmVyLmdldCgpXTsKKyAgICAgICAgb2JzZXJ2 ZXJDYWxsYmFja3MgPSAwOworICAgICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpzZXJ2ZXIucmVx dWVzdCgpXTsKKyAgICAgICAgW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRp b25dOworICAgICAgICB3aGlsZSAoIW9ic2VydmVyQ2FsbGJhY2tzKQorICAgICAgICAgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoKTsKKyAgICAgICAgX19ibG9jayBib29sIGdv dENvb2tpZSA9IGZhbHNlOworICAgICAgICBbZ2xvYmFsQ29va2llU3RvcmUgZ2V0QWxsQ29va2ll czpeKE5TQXJyYXk8TlNIVFRQQ29va2llICo+ICpjb29raWVzKSB7CisgICAgICAgICAgICBSRUxF QVNFX0FTU0VSVChjb29raWVzLmNvdW50ID09IDF1KTsKKyAgICAgICAgICAgIEVYUEVDVF9XS19T VFJFUShjb29raWVzWzBdLm5hbWUsICJ0ZXN0a2V5Iik7CisgICAgICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoY29va2llc1swXS52YWx1ZSwgInRlc3R2YWx1ZSIpOworICAgICAgICAgICAgZ290Q29v a2llID0gdHJ1ZTsKKyAgICAgICAgfV07CisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZ290Q29va2llKTsKKyAgICAgICAgRVhQRUNUX0VRKG9ic2VydmVyQ2FsbGJhY2tzLCAxdSk7 CisgICAgfTsKKworICAgIHJ1blRlc3QoW1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0 b3JlXSk7CisgICAgcnVuVGVzdChbV0tXZWJzaXRlRGF0YVN0b3JlIG5vblBlcnNpc3RlbnREYXRh U3RvcmVdKTsKK30KKwogc3RhdGljIGJvb2wgZmluaXNoZWQ7CiAKIEBpbnRlcmZhY2UgQ29va2ll VUlEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGU+Cg==