[proxies] Adapt and reenable remaining tests in proxies.js

test/mjsunit/harmony/proxies.js

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1307 matching lines @@
   getOwnPropertyDescriptor(k) { throw "myexn" }
 })
 
 
 
 // ---------------------------------------------------------------------------
 // String conversion (Object.prototype.toString,
 //                    Object.prototype.toLocaleString,
 //                    Function.prototype.toString)
 
-//TODO(cbruni): enable once fixed.
-/*
 var key
 
 function TestToString(handler) {
   var p = new Proxy({}, handler)
   key = ""
   assertEquals("[object Object]", Object.prototype.toString.call(p))
-  assertEquals("", key)
+  assertEquals(Symbol.toStringTag, key)
   assertEquals("my_proxy", Object.prototype.toLocaleString.call(p))
   assertEquals("toString", key)
 
-  var f = new Proxy(handler, function() {})
+  var f = new Proxy(function() {}, handler)
   key = ""
   assertEquals("[object Function]", Object.prototype.toString.call(f))
-  assertEquals("", key)
+  assertEquals(Symbol.toStringTag, key)
   assertEquals("my_proxy", Object.prototype.toLocaleString.call(f))
   assertEquals("toString", key)
-  assertDoesNotThrow(function(){ Function.prototype.toString.call(f) })
+  assertThrows(function(){ Function.prototype.toString.call(f) })
 
   var o = Object.create(p)
   key = ""
   assertEquals("[object Object]", Object.prototype.toString.call(o))
-  assertEquals("", key)
+  assertEquals(Symbol.toStringTag, key)
   assertEquals("my_proxy", Object.prototype.toLocaleString.call(o))
   assertEquals("toString", key)
 }
 
 TestToString({
   get: function(r, k) { key = k; return function() { return "my_proxy" } }
 })
 
 TestToString({
   get: function(r, k) { return this.get2(r, k) },
   get2: function(r, k) { key = k; return function() { return "my_proxy" } }
 })
 
 TestToString(new Proxy({}, {
   get: function(pr, pk) {
     return function(r, k) { key = k; return function() { return "my_proxy" } }
   }
 }))
 
 
 function TestToStringThrow(handler) {
   var p = new Proxy({}, handler)
-  assertEquals("[object Object]", Object.prototype.toString.call(p))
+  assertThrows(() => Object.prototype.toString.call(p))

[Camillo Bruni, 2015/12/21 12:50:04]

Could you check explicitly for the thrown error?

   assertThrows(function(){ Object.prototype.toLocaleString.call(p) }, "myexn")
 
   var f = new Proxy(function(){}, handler)
-  assertEquals("[object Function]", Object.prototype.toString.call(f))
+  assertThrows(() => Object.prototype.toString.call(f))
   assertThrows(function(){ Object.prototype.toLocaleString.call(f) }, "myexn")
 
   var o = Object.create(p)
-  assertEquals("[object Object]", Object.prototype.toString.call(o))
+  assertThrows(() => Object.prototype.toString.call(o))
   assertThrows(function(){ Object.prototype.toLocaleString.call(o) }, "myexn")
 }
 
 TestToStringThrow({
   get: function(r, k) { throw "myexn" }
 })
 
 TestToStringThrow({
-  get: function(r, k) { return function() { throw "myexn" } }
-})
-
-TestToStringThrow({
   get: function(r, k) { return this.get2(r, k) },
   get2: function(r, k) { throw "myexn" }
 })
 
 TestToStringThrow(new Proxy({}, {
   get: function(pr, pk) { throw "myexn" }
 }))
 
 TestToStringThrow(new Proxy({}, {
   get: function(pr, pk) {
     return function(r, k) { throw "myexn" }
   }
 }))
-*/
 
 
 // ---------------------------------------------------------------------------
 // Value conversion (Object.prototype.toValue)
 
 function TestValueOf(handler) {
   TestWithProxies(TestValueOf2, handler)
 }
 
 function TestValueOf2(create, handler) {
@@ skipping 133 matching lines @@
   var o = new C();
 
   function f() {
     return o.x;
   }
   assertEquals(10, f());
   assertEquals(10, f());
   %OptimizeFunctionOnNextCall(f);
   assertEquals(10, f());
 })();