23366 2009-01-15 16:43:37 -0800 Need to test toggle behavior of editing style commands 2009-01-16 13:53:53 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 17733 20215 22810 1 eric webkit-unassigned deepak.jindal jparent justin.garcia ojan oldest_to_newest 105983 0 eric 2009-01-15 16:43:37 -0800 Need to test toggle behavior of editing style commands I've wrote a test to cover bug 17733, bug 20215, and bug 22810, which I'll attach here. 105985 1 26774 eric 2009-01-15 16:45:21 -0800 Created attachment 26774 the js portion of the test (goes in LayoutTests/editing/execCommand/resources Current Safari results: Test to make sure styles toggle as expected and tag-based styles can be removed by editing commands. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". PASS document.compatMode is "BackCompat" PASS bold toggle PASS bold removing b FAIL bold removing font-weight: bold -- test PASS italic toggle PASS italic removing i FAIL italic removing font-style: italic -- test FAIL subscript toggle: [object HTMLElement] FAIL subscript removing sub -- test FAIL subscript removing vertical-align: subscript -- test FAIL superscript toggle: [object HTMLElement] FAIL superscript removing sup -- test FAIL superscript removing vertical-align: superscript -- test PASS strikethrough toggle FAIL strikethrough removing s -- <s style="">test</s> FAIL strikethrough removing text-decoration: line-through -- test FAIL strikethrough removing strike -- <strike style="">test</strike> PASS underline toggle FAIL underline removing u -- test FAIL underline removing text-decoration: underline -- test PASS successfullyParsed is true TEST COMPLETE Current FF3 results: Test to make sure styles toggle as expected and tag-based styles can be removed by editing commands. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". PASS document.compatMode is "BackCompat" PASS bold toggle PASS bold removing b PASS bold removing font-weight: bold PASS italic toggle PASS italic removing i PASS italic removing font-style: italic PASS subscript toggle PASS subscript removing sub FAIL subscript removing vertical-align: subscript -- test PASS superscript toggle PASS superscript removing sup FAIL superscript removing vertical-align: superscript -- test PASS strikethrough toggle FAIL strikethrough removing s -- <s>test</s> PASS strikethrough removing text-decoration: line-through PASS strikethrough removing strike PASS underline toggle PASS underline removing u PASS underline removing text-decoration: underline PASS successfullyParsed is true TEST COMPLETE 105987 2 eric 2009-01-15 16:46:27 -0800 I'm impressed that FF only fails subscript, superscript and <s> for strikethrough. I've not tried Opera or IE yet. 105989 3 eric 2009-01-15 16:50:46 -0800 I would like to know from you editing gurus if I need to be testing for removal of any additional tags. These come to mind: <big> <center> <tt> I'd like to make a complete test case before I go trying to make sure we support these equivalencies. After we support the equivalencies and toggling correctly we can look at implementing firefox's "css mode" for execCommand 106078 4 ojan 2009-01-16 10:03:37 -0800 em and strong for sure should be tested as well. I don't know if you can actually get any of the other tags from existing execCommands in any browser. Of the top of my head, it seems like you have the complete list here. There are other execCommands that aren't quite toggles that need testing, but maybe it should be a different bug (e.g. JustifyRight followed by JustifyNone, or Indent followed by Outdent). 106096 5 26803 eric 2009-01-16 11:57:33 -0800 Created attachment 26803 Add toggle-styles test for editing. LayoutTests/ChangeLog | 24 +++++ .../editing/execCommand/resources/toggle-styles.js | 97 ++++++++++++++++++++ .../editing/execCommand/toggle-styles-expected.txt | 29 ++++++ LayoutTests/editing/execCommand/toggle-styles.html | 13 +++ 4 files changed, 163 insertions(+), 0 deletions(-) 106097 6 26803 ap 2009-01-16 12:08:13 -0800 Comment on attachment 26803 Add toggle-styles test for editing. > + (): Please help prepare-ChangeLog by correcting its mistake. We usually prefer not to land FAIL results, but Eric says he's going to fix these soon anyway. r=me 106098 7 justin.garcia 2009-01-16 12:18:13 -0800 i can't find the output for testTagRemovalOnToggle("strong", "bold");, there should be a "PASS bold removing strong" in the results, right? 106109 8 eric 2009-01-16 13:52:44 -0800 (In reply to comment #7) > i can't find the output for testTagRemovalOnToggle("strong", "bold");, there > should be a "PASS bold removing strong" in the results, right? The results were wrong in that patch, but were landed correctly. We FAIL to remove strong (then again, so does FF). Thanks! (And sorry I missed you on IRC, I was @ lunch). 106110 9 eric 2009-01-16 13:53:53 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/editing/execCommand/resources/toggle-styles.js A LayoutTests/editing/execCommand/toggle-styles-expected.txt A LayoutTests/editing/execCommand/toggle-styles.html Committed r39986 26774 2009-01-15 16:45:21 -0800 2009-01-16 11:57:47 -0800 the js portion of the test (goes in LayoutTests/editing/execCommand/resources toggle-styles.js application/x-javascript 3508 eric ZGVzY3JpcHRpb24oIlRlc3QgdG8gbWFrZSBzdXJlIHN0eWxlcyB0b2dnbGUgYXMgZXhwZWN0ZWQg YW5kIHRhZy1iYXNlZCBzdHlsZXMgY2FuIGJlIHJlbW92ZWQgYnkgZWRpdGluZyBjb21tYW5kcy4i KQoKLy8gTm90ZSB0aGF0IGVkaXRpbmcgY29tbWFuZHMgaW5zZXJ0IDxiPiBpbnN0ZWFkIG9mCi8v IDxzcGFuIHN0eWxlPSJmb250LXdlaWdodDogYm9sZCI+IHdoZW4gaW4gcXVpcmtzIG1vZGUKLy8g c28gZWRpdHMgdG8gdGhpcyBmaWxlIHNob3VsZCBiZSBhd2FyZSBvZiBwYXJzZSBtb2RlLgpzaG91 bGRCZUVxdWFsVG9TdHJpbmcoImRvY3VtZW50LmNvbXBhdE1vZGUiLCAnQmFja0NvbXBhdCcpOwoK ZnVuY3Rpb24gdGVzdFRvZ2dsZVRvUmVtb3ZlKHRvZ2dsZUNvbW1hbmQsIHRlc3RDb250YWluZXIs IHRlc3RDb250ZW50KQp7CiAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHRlc3RDb250YWlu ZXIpOwogICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNlbGVjdEFsbENoaWxkcmVuKHRlc3RDb250 YWluZXIpOwogICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQodG9nZ2xlQ29tbWFuZCwgZmFsc2UsIG51 bGwpOwogICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0ZXN0Q29udGFpbmVyKTsKICAgIHJl dHVybiAodGVzdENvbnRhaW5lci5maXJzdENoaWxkID09IHRlc3RDb250ZW50KTsKfQoKZnVuY3Rp b24gd3JhcEluVGFnKHRhZ05hbWUsIGNvbnRlbnQpCnsKICAgIHZhciBlbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCh0YWdOYW1lKTsKICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVu dCk7CiAgICByZXR1cm4gZWxlbWVudDsKfQoKZnVuY3Rpb24gd3JhcEluRWRpdGFibGVDb250YWlu ZXIoY29udGVudCkKewogICAgdmFyIHRlc3RDb250YWluZXIgPSB3cmFwSW5UYWcoJ2RpdicsIGNv bnRlbnQpOwogICAgdGVzdENvbnRhaW5lci5jb250ZW50RWRpdGFibGUgPSB0cnVlOwogICAgcmV0 dXJuIHRlc3RDb250YWluZXI7Cn0KCmZ1bmN0aW9uIHdyYXBJbkNTU1RhZyh0ZXN0Q29udGVudCwg Y3NzUHJvcGVydHksIGNzc1ZhbHVlKQp7CiAgICB2YXIgd3JhcHBlckVsZW1lbnQgPSB3cmFwSW5U YWcoJ3NwYW4nLCB0ZXN0Q29udGVudCk7CiAgICB3cmFwcGVyRWxlbWVudC5zdHlsZS5zZXRQcm9w ZXJ0eShjc3NQcm9wZXJ0eSwgY3NzVmFsdWUsICIiKTsKICAgIHJldHVybiB3cmFwcGVyRWxlbWVu dDsKfQoKZnVuY3Rpb24gdGVzdENTU1JlbW92YWxPblRvZ2dsZShjc3NQcm9wZXJ0eSwgY3NzVmFs dWUsIHRvZ2dsZUNvbW1hbmQpCnsKICAgIHZhciB0ZXN0Q29udGVudCA9IGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKCJ0ZXN0Iik7CiAgICB2YXIgdGVzdFdyYXBwZXIgPSB3cmFwSW5DU1NUYWcodGVz dENvbnRlbnQsIGNzc1Byb3BlcnR5LCBjc3NWYWx1ZSk7CiAgICB2YXIgdGVzdENvbnRhaW5lciA9 IHdyYXBJbkVkaXRhYmxlQ29udGFpbmVyKHRlc3RXcmFwcGVyKTsKICAgIGlmICh0ZXN0VG9nZ2xl VG9SZW1vdmUodG9nZ2xlQ29tbWFuZCwgdGVzdENvbnRhaW5lciwgdGVzdENvbnRlbnQpKSB7CiAg ICAgICAgdGVzdFBhc3NlZCh0b2dnbGVDb21tYW5kICsgIiByZW1vdmluZyAiICsgY3NzUHJvcGVy dHkgKyAiOiAiICsgY3NzVmFsdWUpOwogICAgfSBlbHNlIHsKICAgICAgICB0ZXN0RmFpbGVkKHRv Z2dsZUNvbW1hbmQgKyAiIHJlbW92aW5nICIgKyBjc3NQcm9wZXJ0eSArICI6ICIgKyBjc3NWYWx1 ZSArICIgLS0gIiArIHRlc3RDb250YWluZXIuaW5uZXJIVE1MKTsKICAgIH0KfQoKZnVuY3Rpb24g dGVzdFRhZ1JlbW92YWxPblRvZ2dsZSh0YWdOYW1lLCB0b2dnbGVDb21tYW5kKQp7CiAgICB2YXIg dGVzdENvbnRlbnQgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgidGVzdCIpOwogICAgdmFyIHRl c3RXcmFwcGVyID0gd3JhcEluVGFnKHRhZ05hbWUsIHRlc3RDb250ZW50KTsKICAgIHZhciB0ZXN0 Q29udGFpbmVyID0gd3JhcEluRWRpdGFibGVDb250YWluZXIodGVzdFdyYXBwZXIpOwogICAgaWYg KHRlc3RUb2dnbGVUb1JlbW92ZSh0b2dnbGVDb21tYW5kLCB0ZXN0Q29udGFpbmVyLCB0ZXN0Q29u dGVudCkpIHsKICAgICAgICB0ZXN0UGFzc2VkKHRvZ2dsZUNvbW1hbmQgKyAiIHJlbW92aW5nICIg KyB0YWdOYW1lKTsKICAgIH0gZWxzZSB7CiAgICAgICAgdGVzdEZhaWxlZCh0b2dnbGVDb21tYW5k ICsgIiByZW1vdmluZyAiICsgdGFnTmFtZSArICIgLS0gIiArIHRlc3RDb250YWluZXIuaW5uZXJI VE1MKTsKICAgIH0KfQoKZnVuY3Rpb24gdGVzdEJhc2ljVG9nZ2xlKHRvZ2dsZUNvbW1hbmQpCnsK ICAgIHZhciB0ZXN0Q29udGVudCA9IGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJ0ZXN0Iik7CiAg ICB2YXIgdGVzdENvbnRhaW5lciA9IHdyYXBJbkVkaXRhYmxlQ29udGFpbmVyKHRlc3RDb250ZW50 KTsKICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGVzdENvbnRhaW5lcik7CiAgICB3aW5k b3cuZ2V0U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hpbGRyZW4odGVzdENvbnRhaW5lcik7CiAgICBk b2N1bWVudC5leGVjQ29tbWFuZCh0b2dnbGVDb21tYW5kLCBmYWxzZSwgbnVsbCk7CiAgICBkb2N1 bWVudC5leGVjQ29tbWFuZCh0b2dnbGVDb21tYW5kLCBmYWxzZSwgbnVsbCk7CiAgICBpZiAodGVz dENvbnRhaW5lci5maXJzdENoaWxkID09IHRlc3RDb250ZW50KSB7CiAgICAgICAgdGVzdFBhc3Nl ZCh0b2dnbGVDb21tYW5kICsgIiB0b2dnbGUiKTsKICAgIH0gZWxzZSB7CiAgICAgICAgdGVzdEZh aWxlZCh0b2dnbGVDb21tYW5kICsgIiB0b2dnbGU6ICIgKyB0ZXN0Q29udGFpbmVyLmZpcnN0Q2hp bGQpOwogICAgfQogICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0ZXN0Q29udGFpbmVyKTsK fQoKZnVuY3Rpb24gcnVuVGVzdHModG9nZ2xlQ29tbWFuZCwgdGFnTmFtZSwgY3NzUHJvcGVydHks IGNzc1ZhbHVlKQp7CiAgICB0ZXN0QmFzaWNUb2dnbGUodG9nZ2xlQ29tbWFuZCk7CiAgICB0ZXN0 VGFnUmVtb3ZhbE9uVG9nZ2xlKHRhZ05hbWUsIHRvZ2dsZUNvbW1hbmQpOwogICAgdGVzdENTU1Jl bW92YWxPblRvZ2dsZShjc3NQcm9wZXJ0eSwgY3NzVmFsdWUsIHRvZ2dsZUNvbW1hbmQpOwp9Cgpy dW5UZXN0cygiYm9sZCIsICJiIiwgImZvbnQtd2VpZ2h0IiwgImJvbGQiKTsKcnVuVGVzdHMoIml0 YWxpYyIsICJpIiwgImZvbnQtc3R5bGUiLCAiaXRhbGljIik7CnJ1blRlc3RzKCJzdWJzY3JpcHQi LCAic3ViIiwgInZlcnRpY2FsLWFsaWduIiwgInN1YnNjcmlwdCIpOwpydW5UZXN0cygic3VwZXJz Y3JpcHQiLCAic3VwIiwgInZlcnRpY2FsLWFsaWduIiwgInN1cGVyc2NyaXB0Iik7CnJ1blRlc3Rz KCJzdHJpa2V0aHJvdWdoIiwgInMiLCAidGV4dC1kZWNvcmF0aW9uIiwgImxpbmUtdGhyb3VnaCIp Owp0ZXN0VGFnUmVtb3ZhbE9uVG9nZ2xlKCJzdHJpa2UiLCAic3RyaWtldGhyb3VnaCIpOwpydW5U ZXN0cygidW5kZXJsaW5lIiwgInUiLCAidGV4dC1kZWNvcmF0aW9uIiwgInVuZGVybGluZSIpOwoK dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cg== 26803 2009-01-16 11:57:33 -0800 2009-01-16 12:08:13 -0800 Add toggle-styles test for editing. Add-toggle-styles-test-for-editing..patch text/plain 7980 eric ZjVkNjA2MjA4NWZjYWQ3N2Q3ZjYyNDczZTg5ODc2MjAyZTc1NjkyNQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDRmMmYxYjAu LjJhYzQyY2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAwOS0wMS0xNiAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRvZ2dsZS1zdHlsZXMgdGVzdCBmb3IgZWRpdGluZy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY2CisKKyAgICAgICAg VGhpcyB0ZXN0IGRlbW9uc3RyYXRlcyBhdCBsZWFzdCB0aGVzZSAzIGVkaXRpbmcgYnVnczoKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzMzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIxNQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTAKKworICAgICAg ICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvcmVzb3VyY2VzL3RvZ2dsZS1zdHlsZXMuanM6IEFkZGVk LgorICAgICAgICAodGVzdFRvZ2dsZVRvUmVtb3ZlKToKKyAgICAgICAgKCk6CisgICAgICAgICh3 cmFwSW5FZGl0YWJsZUNvbnRhaW5lcik6CisgICAgICAgICh3cmFwSW5DU1NUYWcpOgorICAgICAg ICAodGVzdENTU1JlbW92YWxPblRvZ2dsZSk6CisgICAgICAgICh0ZXN0VGFnUmVtb3ZhbE9uVG9n Z2xlKToKKyAgICAgICAgKHRlc3RCYXNpY1RvZ2dsZSk6CisgICAgICAgIChydW5UZXN0cyk6Cisg ICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC90b2dnbGUtc3R5bGVzLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC90b2dnbGUtc3R5bGVzLmh0bWw6 IEFkZGVkLgorCiAyMDA5LTAxLTE2ICBDaHJpcyBNYXJyaW4gIDxjbWFycmluQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvcmVzb3VyY2VzL3RvZ2dsZS1zdHlsZXMuanMgYi9MYXlv dXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3Jlc291cmNlcy90b2dnbGUtc3R5bGVzLmpzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4M2EyYWYKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3Jlc291cmNlcy90b2dnbGUtc3R5 bGVzLmpzCkBAIC0wLDAgKzEsOTcgQEAKK2Rlc2NyaXB0aW9uKCJUZXN0IHRvIG1ha2Ugc3VyZSBz dHlsZXMgdG9nZ2xlIGFzIGV4cGVjdGVkIGFuZCB0YWctYmFzZWQgc3R5bGVzIGNhbiBiZSByZW1v dmVkIGJ5IGVkaXRpbmcgY29tbWFuZHMuIikKKworLy8gTm90ZSB0aGF0IGVkaXRpbmcgY29tbWFu ZHMgaW5zZXJ0IDxiPiBpbnN0ZWFkIG9mCisvLyA8c3BhbiBzdHlsZT0iZm9udC13ZWlnaHQ6IGJv bGQiPiB3aGVuIGluIHF1aXJrcyBtb2RlCisvLyBzbyBlZGl0cyB0byB0aGlzIGZpbGUgc2hvdWxk IGJlIGF3YXJlIG9mIHBhcnNlIG1vZGUuCisvLyBGSVhNRTogVGhpcyB0ZXN0IGNvdWxkIHVzZSBp ZnJhbWUgc3ViZG9jdW1lbnRzIHRvIGF2b2lkCisvLyBuZWVkaW5nIHRvIGRlcGVuZCBvbiB0aGUg Y29tcGF0TW9kZSBvZiB0aGlzIGRvY3VtZW50CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoImRvY3Vt ZW50LmNvbXBhdE1vZGUiLCAnQmFja0NvbXBhdCcpOworCitmdW5jdGlvbiB0ZXN0VG9nZ2xlVG9S ZW1vdmUodG9nZ2xlQ29tbWFuZCwgdGVzdENvbnRhaW5lciwgdGVzdENvbnRlbnQpCit7CisgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0ZXN0Q29udGFpbmVyKTsKKyAgICB3aW5kb3cuZ2V0 U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hpbGRyZW4odGVzdENvbnRhaW5lcik7CisgICAgZG9jdW1l bnQuZXhlY0NvbW1hbmQodG9nZ2xlQ29tbWFuZCwgZmFsc2UsIG51bGwpOworICAgIGRvY3VtZW50 LmJvZHkucmVtb3ZlQ2hpbGQodGVzdENvbnRhaW5lcik7CisgICAgcmV0dXJuICh0ZXN0Q29udGFp bmVyLmZpcnN0Q2hpbGQgPT0gdGVzdENvbnRlbnQpOworfQorCitmdW5jdGlvbiB3cmFwSW5UYWco dGFnTmFtZSwgY29udGVudCkKK3sKKyAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQodGFnTmFtZSk7CisgICAgZWxlbWVudC5hcHBlbmRDaGlsZChjb250ZW50KTsKKyAgICBy ZXR1cm4gZWxlbWVudDsKK30KKworZnVuY3Rpb24gd3JhcEluRWRpdGFibGVDb250YWluZXIoY29u dGVudCkKK3sKKyAgICB2YXIgdGVzdENvbnRhaW5lciA9IHdyYXBJblRhZygnZGl2JywgY29udGVu dCk7CisgICAgdGVzdENvbnRhaW5lci5jb250ZW50RWRpdGFibGUgPSB0cnVlOworICAgIHJldHVy biB0ZXN0Q29udGFpbmVyOworfQorCitmdW5jdGlvbiB3cmFwSW5DU1NUYWcodGVzdENvbnRlbnQs IGNzc1Byb3BlcnR5LCBjc3NWYWx1ZSkKK3sKKyAgICB2YXIgd3JhcHBlckVsZW1lbnQgPSB3cmFw SW5UYWcoJ3NwYW4nLCB0ZXN0Q29udGVudCk7CisgICAgd3JhcHBlckVsZW1lbnQuc3R5bGUuc2V0 UHJvcGVydHkoY3NzUHJvcGVydHksIGNzc1ZhbHVlLCAiIik7CisgICAgcmV0dXJuIHdyYXBwZXJF bGVtZW50OworfQorCitmdW5jdGlvbiB0ZXN0Q1NTUmVtb3ZhbE9uVG9nZ2xlKGNzc1Byb3BlcnR5 LCBjc3NWYWx1ZSwgdG9nZ2xlQ29tbWFuZCkKK3sKKyAgICB2YXIgdGVzdENvbnRlbnQgPSBkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZSgidGVzdCIpOworICAgIHZhciB0ZXN0V3JhcHBlciA9IHdyYXBJ bkNTU1RhZyh0ZXN0Q29udGVudCwgY3NzUHJvcGVydHksIGNzc1ZhbHVlKTsKKyAgICB2YXIgdGVz dENvbnRhaW5lciA9IHdyYXBJbkVkaXRhYmxlQ29udGFpbmVyKHRlc3RXcmFwcGVyKTsKKyAgICBp ZiAodGVzdFRvZ2dsZVRvUmVtb3ZlKHRvZ2dsZUNvbW1hbmQsIHRlc3RDb250YWluZXIsIHRlc3RD b250ZW50KSkgeworICAgICAgICB0ZXN0UGFzc2VkKHRvZ2dsZUNvbW1hbmQgKyAiIHJlbW92aW5n ICIgKyBjc3NQcm9wZXJ0eSArICI6ICIgKyBjc3NWYWx1ZSk7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgdGVzdEZhaWxlZCh0b2dnbGVDb21tYW5kICsgIiByZW1vdmluZyAiICsgY3NzUHJvcGVydHkg KyAiOiAiICsgY3NzVmFsdWUgKyAiIC0tICIgKyB0ZXN0Q29udGFpbmVyLmlubmVySFRNTCk7Cisg ICAgfQorfQorCitmdW5jdGlvbiB0ZXN0VGFnUmVtb3ZhbE9uVG9nZ2xlKHRhZ05hbWUsIHRvZ2ds ZUNvbW1hbmQpCit7CisgICAgdmFyIHRlc3RDb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlVGV4dE5v ZGUoInRlc3QiKTsKKyAgICB2YXIgdGVzdFdyYXBwZXIgPSB3cmFwSW5UYWcodGFnTmFtZSwgdGVz dENvbnRlbnQpOworICAgIHZhciB0ZXN0Q29udGFpbmVyID0gd3JhcEluRWRpdGFibGVDb250YWlu ZXIodGVzdFdyYXBwZXIpOworICAgIGlmICh0ZXN0VG9nZ2xlVG9SZW1vdmUodG9nZ2xlQ29tbWFu ZCwgdGVzdENvbnRhaW5lciwgdGVzdENvbnRlbnQpKSB7CisgICAgICAgIHRlc3RQYXNzZWQodG9n Z2xlQ29tbWFuZCArICIgcmVtb3ZpbmcgIiArIHRhZ05hbWUpOworICAgIH0gZWxzZSB7CisgICAg ICAgIHRlc3RGYWlsZWQodG9nZ2xlQ29tbWFuZCArICIgcmVtb3ZpbmcgIiArIHRhZ05hbWUgKyAi IC0tICIgKyB0ZXN0Q29udGFpbmVyLmlubmVySFRNTCk7CisgICAgfQorfQorCitmdW5jdGlvbiB0 ZXN0QmFzaWNUb2dnbGUodG9nZ2xlQ29tbWFuZCkKK3sKKyAgICB2YXIgdGVzdENvbnRlbnQgPSBk b2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgidGVzdCIpOworICAgIHZhciB0ZXN0Q29udGFpbmVyID0g d3JhcEluRWRpdGFibGVDb250YWluZXIodGVzdENvbnRlbnQpOworICAgIGRvY3VtZW50LmJvZHku YXBwZW5kQ2hpbGQodGVzdENvbnRhaW5lcik7CisgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNl bGVjdEFsbENoaWxkcmVuKHRlc3RDb250YWluZXIpOworICAgIGRvY3VtZW50LmV4ZWNDb21tYW5k KHRvZ2dsZUNvbW1hbmQsIGZhbHNlLCBudWxsKTsKKyAgICBkb2N1bWVudC5leGVjQ29tbWFuZCh0 b2dnbGVDb21tYW5kLCBmYWxzZSwgbnVsbCk7CisgICAgaWYgKHRlc3RDb250YWluZXIuZmlyc3RD aGlsZCA9PSB0ZXN0Q29udGVudCkgeworICAgICAgICB0ZXN0UGFzc2VkKHRvZ2dsZUNvbW1hbmQg KyAiIHRvZ2dsZSIpOworICAgIH0gZWxzZSB7CisgICAgICAgIHRlc3RGYWlsZWQodG9nZ2xlQ29t bWFuZCArICIgdG9nZ2xlOiAiICsgdGVzdENvbnRhaW5lci5pbm5lckhUTUwpOworICAgIH0KKyAg ICBkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRlc3RDb250YWluZXIpOworfQorCitmdW5jdGlv biBydW5UZXN0cyh0b2dnbGVDb21tYW5kLCB0YWdOYW1lLCBjc3NQcm9wZXJ0eSwgY3NzVmFsdWUp Cit7CisgICAgdGVzdEJhc2ljVG9nZ2xlKHRvZ2dsZUNvbW1hbmQpOworICAgIHRlc3RUYWdSZW1v dmFsT25Ub2dnbGUodGFnTmFtZSwgdG9nZ2xlQ29tbWFuZCk7CisgICAgdGVzdENTU1JlbW92YWxP blRvZ2dsZShjc3NQcm9wZXJ0eSwgY3NzVmFsdWUsIHRvZ2dsZUNvbW1hbmQpOworfQorCitydW5U ZXN0cygiYm9sZCIsICJiIiwgImZvbnQtd2VpZ2h0IiwgImJvbGQiKTsKK3Rlc3RUYWdSZW1vdmFs T25Ub2dnbGUoInN0cm9uZyIsICJib2xkIik7IC8vIElFIGFkZHMgInN0cm9uZyIgdGFncyBmb3Ig Ym9sZCwgc28gd2Ugc2hvdWxkIHJlbW92ZSB0aGVtIChldmVuIHRob3VnaCBGRiBkb2Vzbid0KQor cnVuVGVzdHMoIml0YWxpYyIsICJpIiwgImZvbnQtc3R5bGUiLCAiaXRhbGljIik7Cit0ZXN0VGFn UmVtb3ZhbE9uVG9nZ2xlKCJlbSIsICJpdGFsaWMiKTsgLy8gSUUgYWRkcyAiZW0iIHRhZ3MgZm9y IGl0YWxpYywgc28gd2Ugc2hvdWxkIHJlbW92ZSB0aGVtIChldmVuIHRob3VnaCBGRiBkb2Vzbid0 KQorcnVuVGVzdHMoInN1YnNjcmlwdCIsICJzdWIiLCAidmVydGljYWwtYWxpZ24iLCAic3Vic2Ny aXB0Iik7CitydW5UZXN0cygic3VwZXJzY3JpcHQiLCAic3VwIiwgInZlcnRpY2FsLWFsaWduIiwg InN1cGVyc2NyaXB0Iik7CitydW5UZXN0cygic3RyaWtldGhyb3VnaCIsICJzdHJpa2UiLCAidGV4 dC1kZWNvcmF0aW9uIiwgImxpbmUtdGhyb3VnaCIpOwordGVzdFRhZ1JlbW92YWxPblRvZ2dsZSgi cyIsICJzdHJpa2V0aHJvdWdoIik7CitydW5UZXN0cygidW5kZXJsaW5lIiwgInUiLCAidGV4dC1k ZWNvcmF0aW9uIiwgInVuZGVybGluZSIpOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1 ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvdG9nZ2xlLXN0 eWxlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3RvZ2ds ZS1zdHlsZXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmRhZGIzNjYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21t YW5kL3RvZ2dsZS1zdHlsZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjkgQEAKK1Rlc3QgdG8g bWFrZSBzdXJlIHN0eWxlcyB0b2dnbGUgYXMgZXhwZWN0ZWQgYW5kIHRhZy1iYXNlZCBzdHlsZXMg Y2FuIGJlIHJlbW92ZWQgYnkgZWRpdGluZyBjb21tYW5kcy4KKworT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09N UExFVEUiLgorCisKK1BBU1MgZG9jdW1lbnQuY29tcGF0TW9kZSBpcyAiQmFja0NvbXBhdCIKK1BB U1MgYm9sZCB0b2dnbGUKK1BBU1MgYm9sZCByZW1vdmluZyBiCitGQUlMIGJvbGQgcmVtb3Zpbmcg Zm9udC13ZWlnaHQ6IGJvbGQgLS0gPHNwYW4gc3R5bGU9IiI+dGVzdDwvc3Bhbj4KK1BBU1MgaXRh bGljIHRvZ2dsZQorUEFTUyBpdGFsaWMgcmVtb3ZpbmcgaQorRkFJTCBpdGFsaWMgcmVtb3Zpbmcg Zm9udC1zdHlsZTogaXRhbGljIC0tIDxzcGFuIHN0eWxlPSIiPnRlc3Q8L3NwYW4+CitGQUlMIHN1 YnNjcmlwdCB0b2dnbGU6IDxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0idmVy dGljYWwtYWxpZ246IHN1YjsiPnRlc3Q8L3NwYW4+CitGQUlMIHN1YnNjcmlwdCByZW1vdmluZyBz dWIgLS0gPHN1Yj50ZXN0PC9zdWI+CitGQUlMIHN1YnNjcmlwdCByZW1vdmluZyB2ZXJ0aWNhbC1h bGlnbjogc3Vic2NyaXB0IC0tIDxzcGFuPjxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBz dHlsZT0idmVydGljYWwtYWxpZ246IHN1YjsiPnRlc3Q8L3NwYW4+PC9zcGFuPgorRkFJTCBzdXBl cnNjcmlwdCB0b2dnbGU6IDxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0idmVy dGljYWwtYWxpZ246IHN1cGVyOyI+dGVzdDwvc3Bhbj4KK0ZBSUwgc3VwZXJzY3JpcHQgcmVtb3Zp bmcgc3VwIC0tIDxzdXA+dGVzdDwvc3VwPgorRkFJTCBzdXBlcnNjcmlwdCByZW1vdmluZyB2ZXJ0 aWNhbC1hbGlnbjogc3VwZXJzY3JpcHQgLS0gPHNwYW4+PHNwYW4gY2xhc3M9IkFwcGxlLXN0eWxl LXNwYW4iIHN0eWxlPSJ2ZXJ0aWNhbC1hbGlnbjogc3VwZXI7Ij50ZXN0PC9zcGFuPjwvc3Bhbj4K K1BBU1Mgc3RyaWtldGhyb3VnaCB0b2dnbGUKK0ZBSUwgc3RyaWtldGhyb3VnaCByZW1vdmluZyBz IC0tIDxzIHN0eWxlPSIiPjxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0idGV4 dC1kZWNvcmF0aW9uOiBub25lOyI+dGVzdDwvc3Bhbj48L3M+CitGQUlMIHN0cmlrZXRocm91Z2gg cmVtb3ZpbmcgdGV4dC1kZWNvcmF0aW9uOiBsaW5lLXRocm91Z2ggLS0gPHNwYW4gc3R5bGU9IiI+ dGVzdDwvc3Bhbj4KK0ZBSUwgc3RyaWtldGhyb3VnaCByZW1vdmluZyBzdHJpa2UgLS0gPHN0cmlr ZSBzdHlsZT0iIj48c3BhbiBjbGFzcz0iQXBwbGUtc3R5bGUtc3BhbiIgc3R5bGU9InRleHQtZGVj b3JhdGlvbjogbm9uZTsiPnRlc3Q8L3NwYW4+PC9zdHJpa2U+CitQQVNTIHVuZGVybGluZSB0b2dn bGUKK0ZBSUwgdW5kZXJsaW5lIHJlbW92aW5nIHUgLS0gPHUgc3R5bGU9IiI+PHNwYW4gY2xhc3M9 IkFwcGxlLXN0eWxlLXNwYW4iIHN0eWxlPSJ0ZXh0LWRlY29yYXRpb246IG5vbmU7Ij50ZXN0PC9z cGFuPjwvdT4KK0ZBSUwgdW5kZXJsaW5lIHJlbW92aW5nIHRleHQtZGVjb3JhdGlvbjogdW5kZXJs aW5lIC0tIDxzcGFuIHN0eWxlPSIiPnRlc3Q8L3NwYW4+CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC90b2dnbGUtc3R5bGVzLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL3RvZ2dsZS1zdHlsZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi5hYTczMDI4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGlu Zy9leGVjQ29tbWFuZC90b2dnbGUtc3R5bGVzLmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPCFET0NU WVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4K KzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMt dGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pz LXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0 aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJyZXNvdXJj ZXMvdG9nZ2xlLXN0eWxlcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vZmFzdC9q cy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K