63160 2011-06-22 11:21:20 -0700 Web Inspector: [refacotring] extensions test: replace dispatchOnFrontend with a more generic evaluateOnFrontend() 2011-06-24 01:04:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 425403 0 caseq 2011-06-22 11:21:20 -0700 We used to have somewhat defective mechanism for the tests running in the extension context to invoke some selected methods on the front-end. Over the time the need evolved for a more generic mechanism similar to the way it's done from the tested page. This switches all methods that used to rely on dispatchOnFrontend() to evaluateOnFrontend(), also moves some of the less-used methods from extensions-test.js to particular test files that need them. 425407 1 98205 caseq 2011-06-22 11:24:50 -0700 Created attachment 98205 patch 426081 2 98205 yurys 2011-06-23 04:51:04 -0700 Comment on attachment 98205 patch View in context: https://bugs.webkit.org/attachment.cgi?id=98205&action=review > LayoutTests/http/tests/inspector/extensions-test.js:25 > + var reply = InspectorTest._replyToExtension.bind(null, event.ports[0]); Please add a comment that this variable may be used by the eval'ed code. 426781 3 caseq 2011-06-24 01:04:02 -0700 Manually committed r89656: http://trac.webkit.org/changeset/89656 98205 2011-06-22 11:24:50 -0700 2011-06-23 04:51:04 -0700 patch extensions-test-refactoring.diff text/plain 12778 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNWI0MDMzLi5mMWE4ZmUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDYt MjIgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbcmVmYWNv dHJpbmddIGV4dGVuc2lvbiB0ZXN0czogcmVwbGFjZSBkaXNwYXRjaE9uRnJvbnRlbmQgd2l0aCBh IG1vcmUgZ2VuZXJpYyBldmFsdWF0ZU9uRnJvbnRlbmQoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMxNjAKKworICAgICAgICAqIGh0dHAvdGVzdHMv aW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxpemVfRXh0ZW5z aW9uc1Rlc3QuSW5zcGVjdG9yVGVzdC5fcmVwbHlUb0V4dGVuc2lvbik6CisgICAgICAgIChpbml0 aWFsaXplX0V4dGVuc2lvbnNUZXN0KToKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9y ZXNvdXJjZXMvZXh0ZW5zaW9uLW1haW4uaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3Bl Y3Rvci9yZXNvdXJjZXMvZXh0ZW5zaW9uLW1haW4uanM6CisgICAgICAgIChvbkVycm9yKToKKyAg ICAgICAgKG9uVGVzdHNEb25lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRl bnNpb25zLWF1ZGl0cy10ZXN0cy5qczoKKyAgICAgICAgKGV4dGVuc2lvbl9ydW5BdWRpdHMpOgor ICAgICAgICAoaW5pdGlhbGl6ZV9FeHRlbnNpb25zQXVkaXRzVGVzdC5JbnNwZWN0b3JUZXN0LnN0 YXJ0RXh0ZW5zaW9uQXVkaXRzLm9uQXVkaXRzRG9uZSk6CisgICAgICAgIChpbml0aWFsaXplX0V4 dGVuc2lvbnNBdWRpdHNUZXN0Lkluc3BlY3RvclRlc3Quc3RhcnRFeHRlbnNpb25BdWRpdHMpOgor ICAgICAgICAoaW5pdGlhbGl6ZV9FeHRlbnNpb25zQXVkaXRzVGVzdCk6CisgICAgICAgICogaW5z cGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLmh0bWw6CisKIDIwMTEtMDYtMjIgIFBhdmVsIEZl bGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkg U2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9leHRlbnNpb25zLXRlc3QuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9l eHRlbnNpb25zLXRlc3QuanMKaW5kZXggZmY2MWEyMS4uODBhNGE2MyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy10ZXN0LmpzCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtdGVzdC5qcwpAQCAtMSw4 ICsxLDMgQEAKLWZ1bmN0aW9uIGxvZyhtZXNzYWdlKQotewotICAgIG91dHB1dChtZXNzYWdlKTsK LX0KLQogZnVuY3Rpb24gZXh0ZW5zaW9uRnVuY3Rpb25zKCkKIHsKICAgICB2YXIgZnVuY3Rpb25z ID0gIiI7CkBAIC0xNywyMSArMTIsMjcgQEAgZnVuY3Rpb24gZXh0ZW5zaW9uRnVuY3Rpb25zKCkK IHZhciBpbml0aWFsaXplX0V4dGVuc2lvbnNUZXN0ID0gZnVuY3Rpb24oKQogewogCi1JbnNwZWN0 b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlID0gZnVuY3Rpb24obWVzc2FnZUlkLCBjYWxsYmFjaywg cmVjdXJyaW5nKQorSW5zcGVjdG9yVGVzdC5fcmVwbHlUb0V4dGVuc2lvbiA9IGZ1bmN0aW9uKHBv cnQsIGRhdGEpCiB7Ci0gICAgZnVuY3Rpb24gb25NZXNzYWdlKGV2ZW50KQotICAgIHsKLSAgICAg ICAgaWYgKHR5cGVvZihldmVudC5kYXRhKSAhPT0gIm9iamVjdCIgfHwgZXZlbnQuZGF0YS5jb21t YW5kICE9PSBtZXNzYWdlSWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICghcmVj dXJyaW5nKQotICAgICAgICAgICAgd2luZG93LnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1lc3NhZ2Ui LCBvbk1lc3NhZ2UsIGZhbHNlKTsKLSAgICAgICAgdmFyIHBvcnQgPSBldmVudC5wb3J0cyAmJiBl dmVudC5wb3J0c1swXTsKLSAgICAgICAgaWYgKGNhbGxiYWNrKGV2ZW50LmRhdGEsIHBvcnQpICYm IHBvcnQpCi0gICAgICAgICAgICBwb3J0LnBvc3RNZXNzYWdlKCIiKTsKKyAgICBwb3J0LnBvc3RN ZXNzYWdlKHsgcmVzcG9uc2U6IGRhdGEgfSk7Cit9CisKK2Z1bmN0aW9uIG9uTWVzc2FnZShldmVu dCkKK3sKKyAgICBpZiAodHlwZW9mIGV2ZW50LmRhdGEgIT09ICJvYmplY3QiIHx8ICFldmVudC5k YXRhLmV4cHJlc3Npb24pCisgICAgICAgIHJldHVybjsKKyAgICBpZiAoZXZlbnQucG9ydHMgJiYg ZXZlbnQucG9ydHNbMF0pCisgICAgICAgIHZhciByZXBseSA9IEluc3BlY3RvclRlc3QuX3JlcGx5 VG9FeHRlbnNpb24uYmluZChudWxsLCBldmVudC5wb3J0c1swXSk7CisgICAgdHJ5IHsKKyAgICAg ICAgdmFyIHJlc3VsdCA9IGV2YWwoZXZlbnQuZGF0YS5leHByZXNzaW9uKTsKKyAgICB9IGNhdGNo IChlKSB7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJFeGNlcHRpb24gd2hpbGUg cnVubmluZzogIiArIGV2ZW50LmRhdGEuZXhwcmVzc2lvbiArICJcbiIgKyAoZS5zdGFjayB8fCBl KSk7CisgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CiAgICAgfQotICAgIHdp bmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgb25NZXNzYWdlLCBmYWxzZSk7CiB9CiAK K3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgSW5zcGVjdG9yVGVzdC5zYWZlV3Jh cChvbk1lc3NhZ2UpLCBmYWxzZSk7CisKIEluc3BlY3RvclRlc3QucnVuRXh0ZW5zaW9uVGVzdHMg PSBmdW5jdGlvbigpCiB7CiAgICAgUnVudGltZUFnZW50LmV2YWx1YXRlKCJsb2NhdGlvbi5ocmVm IiwgImNvbnNvbGUiLCBmYWxzZSwgZnVuY3Rpb24oZXJyb3IsIHJlc3VsdCkgewpAQCAtNDYsNTIg KzQ3LDYgQEAgSW5zcGVjdG9yVGVzdC5ydW5FeHRlbnNpb25UZXN0cyA9IGZ1bmN0aW9uKCkKICAg ICB9KTsKIH0KIAotSW5zcGVjdG9yVGVzdC5kaXNwYXRjaE9uTWVzc2FnZSgiZXh0ZW5zaW9uLXRl c3RzLWRvbmUiLCBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCwgdHJ1ZSk7Ci0KLWZ1bmN0aW9u IGV4dGVuc2lvbk91dHB1dChtZXNzYWdlKQotewotICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KG1lc3NhZ2UudGV4dCk7Ci19Ci1JbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlKCJvdXRw dXQiLCBleHRlbnNpb25PdXRwdXQsIHRydWUpOwotCi1mdW5jdGlvbiBkdW1wU2lkZWJhckNvbnRl bnQobWVzc2FnZSwgcG9ydCkKLXsKLSAgICB2YXIgc2lkZWJhclBhbmVzID0gV2ViSW5zcGVjdG9y LnBhbmVscy5lbGVtZW50cy5zaWRlYmFyUGFuZXM7Ci0gICAgLy8gdGhlIHNpZGViYXIgb2YgaW50 ZXJlc3QgaXMgcHJlc3VtZWQgdG8gYWx3YXlzIGJlIGxhc3QuCi0gICAgdmFyIHNpZGViYXIgPSBz aWRlYmFyUGFuZXNbT2JqZWN0LmtleXMoc2lkZWJhclBhbmVzKS5wb3AoKV07Ci0gICAgSW5zcGVj dG9yVGVzdC5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZ1bmN0aW9uKCkgewotICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiU2lkZWJhciBjb250ZW50OiAiICsgc2lkZWJhci5ib2R5 RWxlbWVudC50ZXh0Q29udGVudCk7Ci0gICAgICAgIHBvcnQucG9zdE1lc3NhZ2UoIiIpOwotICAg IH0pOwotfQotSW5zcGVjdG9yVGVzdC5kaXNwYXRjaE9uTWVzc2FnZSgiZHVtcC1zaWRlYmFyLWNv bnRlbnQiLCBkdW1wU2lkZWJhckNvbnRlbnQsIHRydWUpOwotCi1mdW5jdGlvbiBzaG93UGFuZWwo bWVzc2FnZSwgcG9ydCkKLXsKLSAgICB2YXIgcGFuZWxJZCA9IG1lc3NhZ2UucGFuZWxJZDsKLSAg ICBpZiAocGFuZWxJZCA9PT0gImV4dGVuc2lvbiIpCi0gICAgICAgIHBhbmVsSWQgPSBXZWJJbnNw ZWN0b3IucGFuZWxPcmRlcltXZWJJbnNwZWN0b3IucGFuZWxPcmRlci5sZW5ndGggLSAxXS5uYW1l OwotICAgIFdlYkluc3BlY3Rvci5zaG93UGFuZWwocGFuZWxJZCk7Ci0gICAgcG9ydC5wb3N0TWVz c2FnZSgiIik7Ci19Ci1JbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlKCJzaG93LXBhbmVs Iiwgc2hvd1BhbmVsLCB0cnVlKTsKLQotZnVuY3Rpb24gcmVsb2FkUGFnZShkYXRhLCBwb3J0KQot ewotICAgIEluc3BlY3RvclRlc3QucmVsb2FkUGFnZShmdW5jdGlvbigpIHsKLSAgICAgICAgcG9y dC5wb3N0TWVzc2FnZSgiIik7Ci0gICAgfSk7Ci19Ci1JbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25N ZXNzYWdlKCJyZWxvYWQiLCByZWxvYWRQYWdlLCB0cnVlKTsKLQotZnVuY3Rpb24gcnVuV2hlblBh Z2VMb2FkcyhkYXRhLCBwb3J0KQotewotICAgIEluc3BlY3RvclRlc3QucnVuV2hlblBhZ2VMb2Fk cyhmdW5jdGlvbigpIHsKLSAgICAgICAgcG9ydC5wb3N0TWVzc2FnZSgiIik7Ci0gICAgfSk7Ci19 Ci1JbnNwZWN0b3JUZXN0LmRpc3BhdGNoT25NZXNzYWdlKCJydW4td2hlbi1wYWdlLWxvYWRzIiwg cnVuV2hlblBhZ2VMb2FkcywgdHJ1ZSk7Ci0KIH0KIAogdmFyIHRlc3QgPSBmdW5jdGlvbigpCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvZXh0 ZW5zaW9uLW1haW4uaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291 cmNlcy9leHRlbnNpb24tbWFpbi5odG1sCmluZGV4IDkxODcwMjUuLmY0N2YwZWEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9leHRlbnNpb24t bWFpbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNl cy9leHRlbnNpb24tbWFpbi5odG1sCkBAIC0zNSw5ICszNSwyMyBAQCBmdW5jdGlvbiBkdW1wQXJy YXkocmVzdWx0KQogICAgICAgICBvdXRwdXQocmVzdWx0KTsKIH0KIAorZnVuY3Rpb24gZXZhbHVh dGVPbkZyb250ZW5kKGV4cHJlc3Npb24sIGNhbGxiYWNrKQoreworICAgIGZ1bmN0aW9uIGNhbGxi YWNrV3JhcHBlcihldmVudCkKKyAgICB7CisgICAgICAgIGNoYW5uZWwucG9ydDEucmVtb3ZlRXZl bnRMaXN0ZW5lcigibWVzc2FnZSIsIGNhbGxiYWNrV3JhcHBlciwgZmFsc2UpOworICAgICAgICBj YWxsYmFjayhldmVudC5kYXRhLnJlc3BvbnNlKTsKKyAgICB9CisgICAgdmFyIGNoYW5uZWwgPSBu ZXcgTWVzc2FnZUNoYW5uZWwoKTsKKyAgICBjaGFubmVsLnBvcnQxLnN0YXJ0KCk7CisgICAgaWYg KGNhbGxiYWNrKQorICAgICAgICBjaGFubmVsLnBvcnQxLmFkZEV2ZW50TGlzdGVuZXIoIm1lc3Nh Z2UiLCBjYWxsYmFja1dyYXBwZXIsIGZhbHNlKTsKKyAgICB0b3AucG9zdE1lc3NhZ2UoeyBleHBy ZXNzaW9uOiBleHByZXNzaW9uIH0sIFsgY2hhbm5lbC5wb3J0MiBdLCAiKiIpOworfQorCiBmdW5j dGlvbiBvdXRwdXQobWVzc2FnZSkKIHsKLSAgICB0b3AucG9zdE1lc3NhZ2UoeyBjb21tYW5kOiAi b3V0cHV0IiwgdGV4dDogbWVzc2FnZSB9LCAiKiIpOworICAgIGV2YWx1YXRlT25Gcm9udGVuZCgi SW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQodW5lc2NhcGUoJyIgKyBlc2NhcGUobWVzc2FnZSkgKyAi JykpOyIpOwogfQogCiBvdXRwdXQoIlN0YXJ0ZWQgZXh0ZW5zaW9uLiIpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2V4dGVuc2lvbi1tYWlu LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2V4dGVuc2lv bi1tYWluLmpzCmluZGV4IDdhODQzODAuLjU3ZTdhOGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9leHRlbnNpb24tbWFpbi5qcworKysgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvZXh0ZW5zaW9uLW1haW4u anMKQEAgLTIsNyArMiw3IEBAIGZ1bmN0aW9uIG9uRXJyb3IoZXZlbnQpCiB7CiAgICAgd2luZG93 LnJlbW92ZUV2ZW50TGlzdGVuZXIoImVycm9yIiwgb25FcnJvcik7CiAgICAgb3V0cHV0KCJVbmNh dWdodCBleGNlcHRpb24gaW4gZXh0ZW5zaW9uIGNvbnRleHQ6ICIgKyBldmVudC5tZXNzYWdlICsg IiBbIiArIGV2ZW50LmZpbGVuYW1lICsgIjoiICsgZXZlbnQubGluZW5vICsgIl0iKTsKLSAgICB0 b3AucG9zdE1lc3NhZ2UoeyBjb21tYW5kOiAiZXh0ZW5zaW9uLXRlc3RzLWRvbmUiIH0sICIqIik7 CisgICAgZXZhbHVhdGVPbkZyb250ZW5kKCJJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOyIp OwogfQogCiB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigiZXJyb3IiLCBvbkVycm9yKTsKQEAgLTM1 LDcgKzM1LDcgQEAgZnVuY3Rpb24gcnVuVGVzdHMoKQogZnVuY3Rpb24gb25UZXN0c0RvbmUoKQog ewogICAgIG91dHB1dCgiQWxsIHRlc3RzIGRvbmUuIik7Ci0gICAgdG9wLnBvc3RNZXNzYWdlKHsg Y29tbWFuZDogImV4dGVuc2lvbi10ZXN0cy1kb25lIiB9LCAiKiIpOworICAgIGV2YWx1YXRlT25G cm9udGVuZCgiSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsiKTsKIH0KIAogZnVuY3Rpb24g cnVuVGVzdCh0ZXN0LCBuYW1lKQpAQCAtNDgsMjUgKzQ4LDYgQEAgZnVuY3Rpb24gcnVuVGVzdCh0 ZXN0LCBuYW1lKQogICAgIH0KIH0KIAotZnVuY3Rpb24gZGlzcGF0Y2hPbkZyb250ZW5kKG1lc3Nh Z2UsIGNhbGxiYWNrKQotewotICAgIGZ1bmN0aW9uIGNhbGxiYWNrV3JhcHBlcigpCi0gICAgewot ICAgICAgICBjaGFubmVsLnBvcnQxLnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBjYWxs YmFja1dyYXBwZXIsIGZhbHNlKTsKLSAgICAgICAgY2FsbGJhY2soKTsKLSAgICB9Ci0gICAgdmFy IGNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKLSAgICBjaGFubmVsLnBvcnQxLnN0YXJ0 KCk7Ci0gICAgaWYgKGNhbGxiYWNrKQotICAgICAgICBjaGFubmVsLnBvcnQxLmFkZEV2ZW50TGlz dGVuZXIoIm1lc3NhZ2UiLCBjYWxsYmFja1dyYXBwZXIsIGZhbHNlKTsKLSAgICB0b3AucG9zdE1l c3NhZ2UobWVzc2FnZSwgWyBjaGFubmVsLnBvcnQyIF0sICIqIik7Ci19Ci0KLWZ1bmN0aW9uIHNo b3dQYW5lbChwYW5lbElkLCBjYWxsYmFjaykKLXsKLSAgICBkaXNwYXRjaE9uRnJvbnRlbmQoeyBj b21tYW5kOiAic2hvdy1wYW5lbCIsIHBhbmVsSWQ6IHBhbmVsSWQgfSwgY2FsbGJhY2spOwotfQot CiBmdW5jdGlvbiBjYWxsYmFja0FuZE5leHRUZXN0KGNhbGxiYWNrLCBuZXh0VGVzdCkKIHsKICAg ICBmdW5jdGlvbiBjYWxsYmFja1dyYXBwZXIoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1hdWRpdHMtdGVzdHMuanMgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWF1ZGl0cy10ZXN0cy5qcwppbmRleCA5 MmQzZDQzLi5jNDQyZDg2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5z aW9ucy9leHRlbnNpb25zLWF1ZGl0cy10ZXN0cy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWF1ZGl0cy10ZXN0cy5qcwpAQCAtMSwxMiArMSwxMiBA QAogZnVuY3Rpb24gZXh0ZW5zaW9uX3J1bkF1ZGl0cyhjYWxsYmFjaykKIHsKLSAgICBkaXNwYXRj aE9uRnJvbnRlbmQoeyBjb21tYW5kOiAicnVuLWF1ZGl0cyIgfSwgY2FsbGJhY2spOworICAgIGV2 YWx1YXRlT25Gcm9udGVuZCgiSW5zcGVjdG9yVGVzdC5zdGFydEV4dGVuc2lvbkF1ZGl0cyhyZXBs eSk7IiwgY2FsbGJhY2spOwogfQogCiAvLyBydW5zIGluIGZyb250LWVuZAogdmFyIGluaXRpYWxp emVfRXh0ZW5zaW9uc0F1ZGl0c1Rlc3QgPSBmdW5jdGlvbigpCiB7Ci0gICAgSW5zcGVjdG9yVGVz dC5zdGFydEV4dGVuc2lvbkF1ZGl0cyA9IGZ1bmN0aW9uKG1lc3NhZ2UsIHBvcnQpCisgICAgSW5z cGVjdG9yVGVzdC5zdGFydEV4dGVuc2lvbkF1ZGl0cyA9IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAg IHsKICAgICAgICAgY29uc3QgbGF1bmNoZXJWaWV3ID0gV2ViSW5zcGVjdG9yLnBhbmVscy5hdWRp dHMuX2xhdW5jaGVyVmlldzsKICAgICAgICAgbGF1bmNoZXJWaWV3Ll9zZWxlY3RBbGxDbGlja2Vk KGZhbHNlKTsKQEAgLTIxLDE2ICsyMSwxMCBAQCB2YXIgaW5pdGlhbGl6ZV9FeHRlbnNpb25zQXVk aXRzVGVzdCA9IGZ1bmN0aW9uKCkKICAgICAgICAgZnVuY3Rpb24gb25BdWRpdHNEb25lKCkKICAg ICAgICAgewogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb2xsZWN0QXVkaXRSZXN1bHRzKCk7 Ci0gICAgICAgICAgICBwb3J0LnBvc3RNZXNzYWdlKCIiKTsKKyAgICAgICAgICAgIGNhbGxiYWNr KCk7CiAgICAgICAgIH0KICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3Bl Y3Rvci5wYW5lbHMuYXVkaXRzLCAiX2F1ZGl0RmluaXNoZWRDYWxsYmFjayIsIG9uQXVkaXRzRG9u ZSwgdHJ1ZSk7CiAKICAgICAgICAgbGF1bmNoZXJWaWV3Ll9sYXVuY2hCdXR0b25DbGlja2VkKCk7 CiAgICAgfQogfQotCi12YXIgdGVzdCA9IGZ1bmN0aW9uKCkKLXsKLSAgICBJbnNwZWN0b3JUZXN0 LmRpc3BhdGNoT25NZXNzYWdlKCJydW4tYXVkaXRzIiwgSW5zcGVjdG9yVGVzdC5zdGFydEV4dGVu c2lvbkF1ZGl0cyk7Ci0gICAgSW5zcGVjdG9yVGVzdC5ydW5FeHRlbnNpb25UZXN0cygpOwotfQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1l dmVudHMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVuc2lvbnMt ZXZlbnRzLmh0bWwKaW5kZXggYmZlZDM4MS4uNWRjYzVjMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy1ldmVudHMuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLWV2ZW50cy5odG1sCkBAIC00 LDYgKzQsMjEgQEAKIDxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi PgogCitmdW5jdGlvbiBpbml0aWFsaXplX0V4dGVuc2lvbkV2ZW50VGVzdHMoKQoreworICAgIElu c3BlY3RvclRlc3Quc2hvd1BhbmVsID0gZnVuY3Rpb24ocGFuZWxJZCkKKyAgICB7CisgICAgICAg IGlmIChwYW5lbElkID09PSAiZXh0ZW5zaW9uIikKKyAgICAgICAgICAgIHBhbmVsSWQgPSBXZWJJ bnNwZWN0b3IucGFuZWxPcmRlcltXZWJJbnNwZWN0b3IucGFuZWxPcmRlci5sZW5ndGggLSAxXS5u YW1lOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1BhbmVsKHBhbmVsSWQpOworICAgIH0KK30K KworZnVuY3Rpb24gZXh0ZW5zaW9uX3Nob3dQYW5lbChwYW5lbElkLCBjYWxsYmFjaykKK3sKKyAg ICBldmFsdWF0ZU9uRnJvbnRlbmQoIkluc3BlY3RvclRlc3Quc2hvd1BhbmVsKHVuZXNjYXBlKCci ICsgZXNjYXBlKHBhbmVsSWQpICsgIicpKTsgcmVwbHkoKTsiLCBjYWxsYmFjayk7Cit9CisKIGZ1 bmN0aW9uIGV4dGVuc2lvbl90ZXN0T25TZWxlY3Rpb25DaGFuZ2VkKG5leHRUZXN0KQogewogICAg IGZ1bmN0aW9uIG9uU2VsZWN0aW9uQ2hhbmdlZCgpCkBAIC00Myw3ICs1OCw3IEBAIGZ1bmN0aW9u IGV4dGVuc2lvbl90ZXN0T25OYXZpZ2F0ZWQobmV4dFRlc3QpCiAgICAgICAgIGlmIChsb2FkQ291 bnQgIT09IHVybHMubGVuZ3RoKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAobG9h ZENvdW50ID09PSAxKSB7Ci0gICAgICAgICAgICBkaXNwYXRjaE9uRnJvbnRlbmQoeyBjb21tYW5k OiAicnVuLXdoZW4tcGFnZS1sb2FkcyIgfSwgb25Mb2FkKTsKKyAgICAgICAgICAgIGV2YWx1YXRl T25Gcm9udGVuZCgiSW5zcGVjdG9yVGVzdC5ydW5XaGVuUGFnZUxvYWRzKHJlcGx5KTsiLCBvbkxv YWQpOwogICAgICAgICAgICAgd2ViSW5zcGVjdG9yLmluc3BlY3RlZFdpbmRvdy5ldmFsKCJsb2Nh dGlvbi5ocmVmID0gbG9jYXRpb24ub3JpZ2luICsgbG9jYXRpb24ucGF0aG5hbWUiKTsKICAgICAg ICAgfQogICAgICAgICBlbHNlIHsKQEAgLTU5LDcgKzc0LDcgQEAgZnVuY3Rpb24gZXh0ZW5zaW9u X3Rlc3RPbk5hdmlnYXRlZChuZXh0VGVzdCkKICAgICAgICAgcHJvY2Vzc0V2ZW50KCk7CiAgICAg fQogICAgIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMub25OYXZpZ2F0ZWQuYWRkTGlzdGVuZXIob25O YXZpZ2F0ZWQpOwotICAgIGRpc3BhdGNoT25Gcm9udGVuZCh7IGNvbW1hbmQ6ICJydW4td2hlbi1w YWdlLWxvYWRzIiB9LCBvbkxvYWQpOworICAgIGV2YWx1YXRlT25Gcm9udGVuZCgiSW5zcGVjdG9y VGVzdC5ydW5XaGVuUGFnZUxvYWRzKHJlcGx5KTsiLCBvbkxvYWQpOwogICAgIHdlYkluc3BlY3Rv ci5pbnNwZWN0ZWRXaW5kb3cuZXZhbCgibG9jYXRpb24uaHJlZiA9IGxvY2F0aW9uLmhyZWYgKyAn P25hdmlnYXRlZCciKTsKIH0KIApAQCAtNzMsNyArODgsNyBAQCBmdW5jdGlvbiBleHRlbnNpb25f dGVzdFBhbmVsU2hvd0hpZGUobmV4dFRlc3QpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGlmIChwYW5lbElkID09PSAiZXh0ZW5zaW9uIikgewogICAgICAgICAgICAgYWRkTGlzdGVuZXIo d2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50cywgImVsZW1lbnRzIiwgIm9uU2hvd24iKTsKLSAg ICAgICAgICAgIHNob3dQYW5lbCgiZWxlbWVudHMiKTsKKyAgICAgICAgICAgIGV4dGVuc2lvbl9z aG93UGFuZWwoImVsZW1lbnRzIik7CiAgICAgICAgIH0gZWxzZSBpZiAocGFuZWxJZCA9PT0gImVs ZW1lbnRzIikgewogICAgICAgICAgICAgY2xlYW51cExpc3RlbmVycygpOwogICAgICAgICAgICAg bmV4dFRlc3QoKTsKQEAgLTk2LDkgKzExMSw5IEBAIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0UGFu ZWxTaG93SGlkZShuZXh0VGVzdCkKICAgICAgICAgYWRkTGlzdGVuZXIocGFuZWwsICJleHRlbnNp b24iLCAib25TaG93biIpOwogICAgICAgICBhZGRMaXN0ZW5lcihwYW5lbCwgImV4dGVuc2lvbiIs ICJvbkhpZGRlbiIpOwogICAgICAgICBhZGRMaXN0ZW5lcih3ZWJJbnNwZWN0b3IucGFuZWxzLmVs ZW1lbnRzLCAiZWxlbWVudHMiLCAib25IaWRkZW4iKTsKLSAgICAgICAgc2hvd1BhbmVsKCJleHRl bnNpb24iKTsKKyAgICAgICAgZXh0ZW5zaW9uX3Nob3dQYW5lbCgiZXh0ZW5zaW9uIik7CiAgICAg fQotICAgIHNob3dQYW5lbCgiZWxlbWVudHMiKTsKKyAgICBleHRlbnNpb25fc2hvd1BhbmVsKCJl bGVtZW50cyIpOwogICAgIHdlYkluc3BlY3Rvci5wYW5lbHMuY3JlYXRlKCJUZXN0IFBhbmVsIiwg ImV4dGVuc2lvbi1wYW5lbC5wbmciLCAiZXh0ZW5zaW9uLXBhbmVsLmh0bWwiLCBvblBhbmVsQ3Jl YXRlZCk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25z L2V4dGVuc2lvbnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zL2V4dGVu c2lvbnMuaHRtbAppbmRleCA2MzBkOWZlLi5hNTFhZDQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy9leHRlbnNpb25zLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2V4dGVuc2lvbnMvZXh0ZW5zaW9ucy5odG1sCkBAIC00LDYgKzQsMjAgQEAKIDxz Y3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXRlc3QuanMi Pjwvc2NyaXB0PgogPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgogCitmdW5jdGlvbiBp bml0aWFsaXplX2V4dGVuc2lvbnNVSVRlc3QoKQoreworICAgIEluc3BlY3RvclRlc3QuZHVtcFNp ZGViYXJDb250ZW50ID0gZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgc2lk ZWJhclBhbmVzID0gV2ViSW5zcGVjdG9yLnBhbmVscy5lbGVtZW50cy5zaWRlYmFyUGFuZXM7Cisg ICAgICAgIC8vIHRoZSBzaWRlYmFyIG9mIGludGVyZXN0IGlzIHByZXN1bWVkIHRvIGFsd2F5cyBi ZSBsYXN0LgorICAgICAgICB2YXIgc2lkZWJhciA9IHNpZGViYXJQYW5lc1tPYmplY3Qua2V5cyhz aWRlYmFyUGFuZXMpLnBvcCgpXTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5ydW5BZnRlclBlbmRp bmdEaXNwYXRjaGVzKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQoIlNpZGViYXIgY29udGVudDogIiArIHNpZGViYXIuYm9keUVsZW1lbnQudGV4dENvbnRl bnQpOworICAgICAgICAgICAgY2FsbGJhY2soKTsKKyAgICAgICAgfSk7CisgICAgfQorfQorCiBm dW5jdGlvbiBleHRlbnNpb25fdGVzdENyZWF0ZVBhbmVsKG5leHRUZXN0KQogewogICAgIGZ1bmN0 aW9uIG9uUGFuZWxDcmVhdGVkKHBhbmVsKQpAQCAtMjksNyArNDMsNyBAQCBmdW5jdGlvbiBleHRl bnNpb25fdGVzdFNpZGViYXJQYWdlKG5leHRUZXN0KQogCiBmdW5jdGlvbiBleHRlbnNpb25fZHVt cFNpZGViYXJDb250ZW50KG5leHRUZXN0KQogewotICAgIGRpc3BhdGNoT25Gcm9udGVuZCh7IGNv bW1hbmQ6ICJkdW1wLXNpZGViYXItY29udGVudCIgfSwgbmV4dFRlc3QpOworICAgIGV2YWx1YXRl T25Gcm9udGVuZCgiSW5zcGVjdG9yVGVzdC5kdW1wU2lkZWJhckNvbnRlbnQocmVwbHkpOyIsIG5l eHRUZXN0KTsKIH0KIAogZnVuY3Rpb24gZXh0ZW5zaW9uX3Rlc3RTaWRlYmFyV2F0Y2hPYmplY3Qo bmV4dFRlc3QpCg==