Index: test/webkit/tostring-exception-in-property-access.js |
diff --git a/test/webkit/concat-while-having-a-bad-time.js b/test/webkit/tostring-exception-in-property-access.js |
similarity index 52% |
copy from test/webkit/concat-while-having-a-bad-time.js |
copy to test/webkit/tostring-exception-in-property-access.js |
index dfda1e08a0b36194b787a44ee12a9693acd8aeaf..2274255057b6b8b8f3dc42329a6d73db321e52b6 100644 |
--- a/test/webkit/concat-while-having-a-bad-time.js |
+++ b/test/webkit/tostring-exception-in-property-access.js |
@@ -21,11 +21,36 @@ |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-description( |
-"Tests the behavior of Array.prototype.concat while the array is having a bad time due to one of the elements we are concatenating." |
-); |
+description("This tests that the various subscript operators handle subscript string conversion exceptions correctly."); |
-Object.defineProperty(Array.prototype, 0, { writable: false }); |
-shouldBe("[42].concat()", "[42]"); |
+var toStringThrower = { toString: function() { throw "Exception thrown by toString"; }}; |
+var target = {"" : "Did not assign to property when setter subscript threw"}; |
+try { |
+ target[toStringThrower] = "Assigned to property on object when subscript threw"; |
+} catch(e) { |
+ testPassed("PASS: Exception caught -- " + e); |
+} |
+shouldBe('target[""]', "'Did not assign to property when setter subscript threw'"); |
+target[""] = "Did not delete property when subscript threw"; |
+try { |
+ delete target[toStringThrower]; |
+} catch(e) { |
+ testPassed("PASS: Exception caught -- " + e); |
+} |
+shouldBe('target[""]', "'Did not delete property when subscript threw'"); |
+ |
+delete target[""]; |
+ |
+target.__defineGetter__("", function(){ |
+ testFailed('FAIL: Loaded property from object when subscript threw.'); |
+ return "FAIL: Assigned to result when subscript threw."; |
+ }); |
+var localTest = "Did not assign to result when subscript threw."; |
+try { |
+ localTest = target[toStringThrower]; |
+} catch(e) { |
+ testPassed("PASS: Exception caught -- " + e); |
+} |
+shouldBe('localTest', "'Did not assign to result when subscript threw.'"); |