171698 2017-05-04 15:46:42 -0700 Use EXPECT_EQ() when comparing strings in TestWebKitAPI tests 2017-05-05 11:45:24 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 dbates dbates darin dino lforschler thorton oldest_to_newest 1304870 0 dbates 2017-05-04 15:46:42 -0700 We should use EXPECT_EQ() when comparing WTF::String objects so that we get pretty-printed difference output for both the expected result and actual results. This can help expedite the diagnosis of a regression. == Current Behavior == Suppose we change line <http://trac.webkit.org/browser/trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp?rev=216131#L337> to purposely cause an failure: EXPECT_TRUE(reference.left(1) == String::fromUTF8("Ca")); Then run-api-tests will emit the following output: Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp:337 Value of: reference.left(1) == String::fromUTF8("Ca") Actual: false Expected: true == Proposed Behavior == Suppose we change the same line to purposely failure and use EXPECT_EQ(): EXPECT_EQ(String::fromUTF8("Ca"), reference.left(1)); Then run-api-tests will emit the following output: Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp:337 Value of: reference.left(1) Actual: C Expected: String::fromUTF8("Ca") Which is: Ca 1304872 1 dbates 2017-05-04 15:48:00 -0700 (In reply to Daniel Bates from comment #0) > Suppose we change line > <http://trac.webkit.org/browser/trunk/Tools/TestWebKitAPI/Tests/WTF/ > WTFString.cpp?rev=216131#L337> to purposely cause an failure: The line should be <http://trac.webkit.org/browser/trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp?rev=216131#L336> 1304878 2 309111 dbates 2017-05-04 15:58:45 -0700 Created attachment 309111 Patch 1305236 3 dbates 2017-05-05 11:45:24 -0700 Committed r216255: <http://trac.webkit.org/changeset/216255> 309111 2017-05-04 15:58:45 -0700 2017-05-04 16:49:27 -0700 Patch bug-171698-20170504155844.patch text/plain 6840 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTExMWEyOWQ4YWQ5MGUyZjc2YjU1YWFjMDg2NzZhNGMx ZDk5NmYzYi4uM2JhYzQwYTYzN2M3YmRjYTZlNTgwYmUyNzgwNjYyMmI5OTc4ZTgxNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE3LTA1LTA0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBVc2UgRVhQRUNUX0VRKCkgd2hlbiBjb21wYXJpbmcgc3RyaW5ncyBpbiBUZXN0V2ViS2l0 QVBJIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzE2OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBzaG91bGQgdXNlIEVYUEVDVF9FUSgpIGluc3RlYWQgb2YgRVhQRUNUX1RSVUUoKSB0byBj b21wYXJlIFdURjo6U3RyaW5nKCkgCisgICAgICAgIG9iamVjdCBzbyB0aGF0IHdlIGdldCBwcmV0 dHkgZGlmZiBvdXRwdXQgd2hlbiB0aGUgYWN0dWFsIHN0cmluZyBkaWZmZXJzIGZyb20KKyAgICAg ICAgdGhlIGV4cGVjdGVkIHN0cmluZyBhcyBvcHBvc2VkIHRvIHNlZWluZyBhIGJvb2xlYW4gcmVz dWx0LiBUaGUgZm9ybWVyIG1ha2VzCisgICAgICAgIG1ha2VzIGlzIHN0cmFpZ2h0Zm9yd2FyZCB0 byBkaWFnbm9zZSBhIHJlZ3Jlc3Npb24gd2l0aG91dCByZWFkaW5nIHRoZSBjb2RlCisgICAgICAg IG9yIGluc3RydW1lbnRpbmcgaXQgdG8gZGV0ZXJtaW5lIHRoZSBhY3R1YWwgc3RyaW5nIHRoYXQg d2FzIGNvbXBhcmVkLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvV1RGU3Ry aW5nLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9tYWMvR1BVRnVuY3Rpb24ubW06CisgICAgICAgIChUZXN0 V2ViS2l0QVBJOjpURVNUX0YpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29y ZS9tYWMvR1BVTGlicmFyeS5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6CisK IDIwMTctMDUtMDMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBb V0syXSBFeHRlbmQgcHJvY2Vzc0RpZENyYXNoIGRlbGVnYXRlIHRvIGxldCB0aGUgY2xpZW50IGtu b3cgdGhlIHJlYXNvbiBmb3IgdGhlIGNyYXNoCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dURi9XVEZTdHJpbmcuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X VEYvV1RGU3RyaW5nLmNwcAppbmRleCAyNzY0OTY1OGM5Njk4ZDhmMjBhZGU2MGQ1ZGM4NjMwMTU5 OWJlMzgwLi5jNzE0MDY4MTYwM2U0NDE0YmY2OGI5ZTcyYWNhZWNjYzg3NDU5MDQ0IDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9XVEZTdHJpbmcuY3BwCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL1dURlN0cmluZy5jcHAKQEAgLTI1LDYgKzI1LDcg QEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogCisjaW5jbHVkZSAiV1RGU3RyaW5nVXRpbGl0aWVz LmgiCiAjaW5jbHVkZSA8bGltaXRzPgogI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMzE2LDMzICszMTcsMzMgQEAgVEVTVChXVEYs IFN0cmluZ1VuaWNvZGVFcXVhbFVDaGFyQXJyYXkpCiBURVNUKFdURiwgU3RyaW5nUmlnaHRCYXNp YykKIHsKICAgICBhdXRvIHJlZmVyZW5jZSA9IFN0cmluZzo6ZnJvbVVURjgoIkNhcHB1Y2Npbm8i KTsKLSAgICBFWFBFQ1RfVFJVRShyZWZlcmVuY2UucmlnaHQoMCkgPT0gU3RyaW5nOjpmcm9tVVRG OCgiIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5yaWdodCgxKSA9PSBTdHJpbmc6OmZy b21VVEY4KCJvIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5yaWdodCgyKSA9PSBTdHJp bmc6OmZyb21VVEY4KCJubyIpKTsKLSAgICBFWFBFQ1RfVFJVRShyZWZlcmVuY2UucmlnaHQoMykg PT0gU3RyaW5nOjpmcm9tVVRGOCgiaW5vIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5y aWdodCg0KSA9PSBTdHJpbmc6OmZyb21VVEY4KCJjaW5vIikpOwotICAgIEVYUEVDVF9UUlVFKHJl ZmVyZW5jZS5yaWdodCg1KSA9PSBTdHJpbmc6OmZyb21VVEY4KCJjY2lubyIpKTsKLSAgICBFWFBF Q1RfVFJVRShyZWZlcmVuY2UucmlnaHQoNikgPT0gU3RyaW5nOjpmcm9tVVRGOCgidWNjaW5vIikp OwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5yaWdodCg3KSA9PSBTdHJpbmc6OmZyb21VVEY4 KCJwdWNjaW5vIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5yaWdodCg4KSA9PSBTdHJp bmc6OmZyb21VVEY4KCJwcHVjY2lubyIpKTsKLSAgICBFWFBFQ1RfVFJVRShyZWZlcmVuY2Uucmln aHQoOSkgPT0gU3RyaW5nOjpmcm9tVVRGOCgiYXBwdWNjaW5vIikpOwotICAgIEVYUEVDVF9UUlVF KHJlZmVyZW5jZS5yaWdodCgxMCkgPT0gU3RyaW5nOjpmcm9tVVRGOCgiQ2FwcHVjY2lubyIpKTsK KyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgiIiksIHJlZmVyZW5jZS5yaWdodCgwKSk7 CisgICAgRVhQRUNUX0VRKFN0cmluZzo6ZnJvbVVURjgoIm8iKSwgcmVmZXJlbmNlLnJpZ2h0KDEp KTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgibm8iKSwgcmVmZXJlbmNlLnJpZ2h0 KDIpKTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgiaW5vIiksIHJlZmVyZW5jZS5y aWdodCgzKSk7CisgICAgRVhQRUNUX0VRKFN0cmluZzo6ZnJvbVVURjgoImNpbm8iKSwgcmVmZXJl bmNlLnJpZ2h0KDQpKTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgiY2Npbm8iKSwg cmVmZXJlbmNlLnJpZ2h0KDUpKTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgidWNj aW5vIiksIHJlZmVyZW5jZS5yaWdodCg2KSk7CisgICAgRVhQRUNUX0VRKFN0cmluZzo6ZnJvbVVU RjgoInB1Y2Npbm8iKSwgcmVmZXJlbmNlLnJpZ2h0KDcpKTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5n Ojpmcm9tVVRGOCgicHB1Y2Npbm8iKSwgcmVmZXJlbmNlLnJpZ2h0KDgpKTsKKyAgICBFWFBFQ1Rf RVEoU3RyaW5nOjpmcm9tVVRGOCgiYXBwdWNjaW5vIiksIHJlZmVyZW5jZS5yaWdodCg5KSk7Cisg ICAgRVhQRUNUX0VRKFN0cmluZzo6ZnJvbVVURjgoIkNhcHB1Y2Npbm8iKSwgcmVmZXJlbmNlLnJp Z2h0KDEwKSk7CiB9CiAKIFRFU1QoV1RGLCBTdHJpbmdMZWZ0QmFzaWMpCiB7CiAgICAgYXV0byBy ZWZlcmVuY2UgPSBTdHJpbmc6OmZyb21VVEY4KCJDYXBwdWNjaW5vIik7Ci0gICAgRVhQRUNUX1RS VUUocmVmZXJlbmNlLmxlZnQoMCkgPT0gU3RyaW5nOjpmcm9tVVRGOCgiIikpOwotICAgIEVYUEVD VF9UUlVFKHJlZmVyZW5jZS5sZWZ0KDEpID09IFN0cmluZzo6ZnJvbVVURjgoIkMiKSk7Ci0gICAg RVhQRUNUX1RSVUUocmVmZXJlbmNlLmxlZnQoMikgPT0gU3RyaW5nOjpmcm9tVVRGOCgiQ2EiKSk7 Ci0gICAgRVhQRUNUX1RSVUUocmVmZXJlbmNlLmxlZnQoMykgPT0gU3RyaW5nOjpmcm9tVVRGOCgi Q2FwIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5sZWZ0KDQpID09IFN0cmluZzo6ZnJv bVVURjgoIkNhcHAiKSk7Ci0gICAgRVhQRUNUX1RSVUUocmVmZXJlbmNlLmxlZnQoNSkgPT0gU3Ry aW5nOjpmcm9tVVRGOCgiQ2FwcHUiKSk7Ci0gICAgRVhQRUNUX1RSVUUocmVmZXJlbmNlLmxlZnQo NikgPT0gU3RyaW5nOjpmcm9tVVRGOCgiQ2FwcHVjIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVy ZW5jZS5sZWZ0KDcpID09IFN0cmluZzo6ZnJvbVVURjgoIkNhcHB1Y2MiKSk7Ci0gICAgRVhQRUNU X1RSVUUocmVmZXJlbmNlLmxlZnQoOCkgPT0gU3RyaW5nOjpmcm9tVVRGOCgiQ2FwcHVjY2kiKSk7 Ci0gICAgRVhQRUNUX1RSVUUocmVmZXJlbmNlLmxlZnQoOSkgPT0gU3RyaW5nOjpmcm9tVVRGOCgi Q2FwcHVjY2luIikpOwotICAgIEVYUEVDVF9UUlVFKHJlZmVyZW5jZS5sZWZ0KDEwKSA9PSBTdHJp bmc6OmZyb21VVEY4KCJDYXBwdWNjaW5vIikpOworICAgIEVYUEVDVF9FUShTdHJpbmc6OmZyb21V VEY4KCIiKSwgcmVmZXJlbmNlLmxlZnQoMCkpOworICAgIEVYUEVDVF9FUShTdHJpbmc6OmZyb21V VEY4KCJDIiksIHJlZmVyZW5jZS5sZWZ0KDEpKTsKKyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9t VVRGOCgiQ2EiKSwgcmVmZXJlbmNlLmxlZnQoMikpOworICAgIEVYUEVDVF9FUShTdHJpbmc6OmZy b21VVEY4KCJDYXAiKSwgcmVmZXJlbmNlLmxlZnQoMykpOworICAgIEVYUEVDVF9FUShTdHJpbmc6 OmZyb21VVEY4KCJDYXBwIiksIHJlZmVyZW5jZS5sZWZ0KDQpKTsKKyAgICBFWFBFQ1RfRVEoU3Ry aW5nOjpmcm9tVVRGOCgiQ2FwcHUiKSwgcmVmZXJlbmNlLmxlZnQoNSkpOworICAgIEVYUEVDVF9F UShTdHJpbmc6OmZyb21VVEY4KCJDYXBwdWMiKSwgcmVmZXJlbmNlLmxlZnQoNikpOworICAgIEVY UEVDVF9FUShTdHJpbmc6OmZyb21VVEY4KCJDYXBwdWNjIiksIHJlZmVyZW5jZS5sZWZ0KDcpKTsK KyAgICBFWFBFQ1RfRVEoU3RyaW5nOjpmcm9tVVRGOCgiQ2FwcHVjY2kiKSwgcmVmZXJlbmNlLmxl ZnQoOCkpOworICAgIEVYUEVDVF9FUShTdHJpbmc6OmZyb21VVEY4KCJDYXBwdWNjaW4iKSwgcmVm ZXJlbmNlLmxlZnQoOSkpOworICAgIEVYUEVDVF9FUShTdHJpbmc6OmZyb21VVEY4KCJDYXBwdWNj aW5vIiksIHJlZmVyZW5jZS5sZWZ0KDEwKSk7CiB9CiAKIFRFU1QoV1RGLCBTdHJpbmdSZXZlcnNl RmluZEJhc2ljKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3Jl L21hYy9HUFVGdW5jdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9t YWMvR1BVRnVuY3Rpb24ubW0KaW5kZXggMmI3MjY5OGIxMWM0MDQxMTEyNjMwZjg5MTM5OTE4MmJk OTU0Y2Y3Zi4uYWRlZjczZWFjZGFmZGMxZjc5MmQ2M2VhMDQ5M2IzMDE5MmIzMTc0NiAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL21hYy9HUFVGdW5jdGlvbi5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvbWFjL0dQVUZ1bmN0aW9u Lm1tCkBAIC01NSwxMSArNTUsMTEgQEAgVEVTVF9GKEdQVSwgRnVuY3Rpb25BY2Nlc3NCeU5hbWUp CiAKICAgICBhdXRvIHZlcnRleEZ1bmN0aW9uID0gbGlicmFyeS0+ZnVuY3Rpb25XaXRoTmFtZSgi dmVydGV4X21haW4iKTsKICAgICBFWFBFQ1RfTk9UX05VTEwodmVydGV4RnVuY3Rpb24pOwotICAg IEVYUEVDVF9UUlVFKHZlcnRleEZ1bmN0aW9uLT5uYW1lKCkgPT0gInZlcnRleF9tYWluIik7Cisg ICAgRVhQRUNUX0VRKCJ2ZXJ0ZXhfbWFpbiIsIHZlcnRleEZ1bmN0aW9uLT5uYW1lKCkpOwogCiAg ICAgYXV0byBmcmFnbWVudEZ1bmN0aW9uID0gbGlicmFyeS0+ZnVuY3Rpb25XaXRoTmFtZSgiZnJh Z21lbnRfbWFpbiIpOwogICAgIEVYUEVDVF9OT1RfTlVMTChmcmFnbWVudEZ1bmN0aW9uKTsKLSAg ICBFWFBFQ1RfVFJVRShmcmFnbWVudEZ1bmN0aW9uLT5uYW1lKCkgPT0gImZyYWdtZW50X21haW4i KTsKKyAgICBFWFBFQ1RfRVEoImZyYWdtZW50X21haW4iLCBmcmFnbWVudEZ1bmN0aW9uLT5uYW1l KCkpOwogCiAgICAgYXV0byBub25FeGlzdGVudEZ1bmN0aW9uID0gbGlicmFyeS0+ZnVuY3Rpb25X aXRoTmFtZSgibmFtZV90aGF0X2lzX25vdF9pbl9saWJyYXJ5Iik7CiAgICAgRVhQRUNUX05VTEwo bm9uRXhpc3RlbnRGdW5jdGlvbik7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYkNvcmUvbWFjL0dQVUxpYnJhcnkubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYkNvcmUvbWFjL0dQVUxpYnJhcnkubW0KaW5kZXggYzc1NDFlOTAwMjEwZDJiMGM1ODhhM2Jh ZDNlOTAwNTQ3YjBlOWVlYi4uYjVjMDI3MWY1NzliYjBhMWYxODY4YjMwOWU0MGI2NzgwMTc3M2Vk MSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL21hYy9HUFVM aWJyYXJ5Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9tYWMvR1BV TGlicmFyeS5tbQpAQCAtNjIsNyArNjIsNyBAQCBURVNUX0YoR1BVLCBMaWJyYXJ5U2V0TGFiZWwp CiAgICAgRVhQRUNUX05PVF9OVUxMKGxpYnJhcnkpOwogCiAgICAgbGlicmFyeS0+c2V0TGFiZWwo IlRlc3RMYWJlbCIpOwotICAgIEVYUEVDVF9UUlVFKGxpYnJhcnktPmxhYmVsKCkgPT0gIlRlc3RM YWJlbCIpOworICAgIEVYUEVDVF9FUSgiVGVzdExhYmVsIiwgbGlicmFyeS0+bGFiZWwoKSk7CiB9 CiAKIFRFU1RfRihHUFUsIExpYnJhcnlGdW5jdGlvbk5hbWVzKQpAQCAtNzYsOCArNzYsOCBAQCBU RVNUX0YoR1BVLCBMaWJyYXJ5RnVuY3Rpb25OYW1lcykKIAogICAgIGF1dG8gZnVuY3Rpb25OYW1l cyA9IGxpYnJhcnktPmZ1bmN0aW9uTmFtZXMoKTsKICAgICBFWFBFQ1RfRVEoZnVuY3Rpb25OYW1l cy5zaXplKCksIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxvbmc+KDIpKTsKLSAgICBFWFBFQ1RfVFJV RShmdW5jdGlvbk5hbWVzWzBdID09ICJ2ZXJ0ZXhfbWFpbiIpOwotICAgIEVYUEVDVF9UUlVFKGZ1 bmN0aW9uTmFtZXNbMV0gPT0gImZyYWdtZW50X21haW4iKTsKKyAgICBFWFBFQ1RfRVEoInZlcnRl eF9tYWluIiwgZnVuY3Rpb25OYW1lc1swXSk7CisgICAgRVhQRUNUX0VRKCJmcmFnbWVudF9tYWlu IiwgZnVuY3Rpb25OYW1lc1sxXSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK