[proxy] fixing harmony/proxy.js tests and improving error messages + some drive-by fixes

test/mjsunit/harmony/proxies-with.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 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --harmony-proxies
 
 
 // Helper.
 
 function TestWithProxies(test, x, y, z) {
   test(function(h) { return new Proxy({}, h) }, x, y, z)
   test(function(h) {
-      return Proxy.createFunction(h, function() {})
+      return new Proxy(function() {}, h)
   }, x, y, z)
 }
 
 
 
 // Getting.
 
 function TestWithGet(handler) {
   TestWithProxies(TestWithGet2, handler)
 }
 
 var c = "global"
 var key = ""
 
 function TestWithGet2(create, handler) {
   var b = "local"
 
-  var p = create(handler)
+  var p = create(handler);
+  assertEquals("onproxy", p.a);
+  assertEquals(undefined, p.b);
+  assertEquals(undefined, p.c);
+
   with (p) {
-    assertEquals("onproxy", a)
-    assertEquals("local", b)
-    assertEquals("global", c)
+    assertEquals("onproxy", a);
+    assertEquals("local", b);
+    assertEquals("global", c);
   }
 
   var o = Object.create(p, {d: {value: "own"}})
   with (o) {
     assertEquals("onproxy", a)
-    assertEquals("local", b)
+    assertEquals("local", b);
     assertEquals("global", c)
     assertEquals("own", d)
   }
 }
 
 TestWithGet({
-  get: function(r, k) {
+  get(target, k) {
     key = k;
     return k === "a" ? "onproxy" : undefined
   },
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: "onproxy", configurable: true} : undefined
-  }
+  has(target, k) { return k === 'a' }
 })
 
 TestWithGet({
   get: function(r, k) { return this.get2(r, k) },
   get2: function(r, k) { key = k; return k === "a" ? "onproxy" : undefined },
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: "onproxy", configurable: true} : undefined
-  }
-})
-
-TestWithGet({
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: "onproxy", configurable: true} : undefined
-  }
-})
-
-TestWithGet({
-  getPropertyDescriptor: function(k) { return this.getPropertyDescriptor2(k) },
-  getPropertyDescriptor2: function(k) {
-    key = k;
-    return k === "a" ? {value: "onproxy", configurable: true} : undefined
-  }
-})
-
-TestWithGet({
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ?
-        {get value() { return "onproxy" }, configurable: true} : undefined
-  }
-})
-
-TestWithGet({
-  get: undefined,
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: "onproxy", configurable: true} : undefined
-  }
+  has(target, k) { return k === 'a' }
 })
 
 
 
+
 // Invoking.
 
 function TestWithGetCall(handler) {
   TestWithProxies(TestWithGetCall2, handler)
 }
 
 var receiver = null
 var c = function() { return "global" }
 
 function TestWithGetCall2(create, handler) {
@@ skipping 16 matching lines @@
     assertEquals("local", b())
     assertEquals("global", c())
     assertEquals("own", d())
   }
 }
 
 function onproxy() { receiver = this; return "onproxy" }
 
 TestWithGetCall({
   get: function(r, k) { key = k; return k === "a" ? onproxy : undefined },
-  getPropertyDescriptor: function(k) {
+  has: function(t, k) {
     key = k;
-    return k === "a" ? {value: onproxy, configurable: true} : undefined
+    return k === "a";
   }
 })
 
 TestWithGetCall({
   get: function(r, k) { return this.get2(r, k) },
   get2: function(r, k) { key = k; return k === "a" ? onproxy : undefined },
-  getPropertyDescriptor: function(k) {
+  has: function(t, k) {
     key = k;
-    return k === "a" ? {value: onproxy, configurable: true} : undefined
+    return k === "a";
   }
 })
 
 TestWithGetCall({
-  getPropertyDescriptor: function(k) {
+  get: function(r, k) { key = k; return k === "a" ? onproxy : undefined },
+  has: function(t, k) {
+    return this.has2(k)
+  },
+  has2: function(k) {
     key = k;
-    return k === "a" ? {value: onproxy, configurable: true} : undefined
+    return k === "a";
   }
 })
 
 TestWithGetCall({
-  getPropertyDescriptor: function(k) { return this.getPropertyDescriptor2(k) },
-  getPropertyDescriptor2: function(k) {
+  get: function(r, k) { key = k; return k === "a" ? onproxy : undefined },
+  has: function(t, k) {
     key = k;
-    return k === "a" ? {value: onproxy, configurable: true} : undefined
+    return k === "a";
   }
 })
 
-TestWithGetCall({
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ?
-        {get value() { return onproxy }, configurable: true} : undefined
-  }
-})
-
-TestWithGetCall({
-  get: undefined,
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxy, configurable: true} : undefined
-  }
-})
-
 
 function TestWithGetCallThrow(handler) {
   TestWithProxies(TestWithGetCallThrow2, handler)
 }
 
 function TestWithGetCallThrow2(create, handler) {
   var b = function() { return "local" }
 
   var p = create(handler)
   with (p) {
     assertThrows(function(){ a() }, "myexn")
     assertEquals("local", b())
     assertEquals("global", c())
   }
 
   var o = Object.create(p, {d: {value: function() { return "own" }}})
   with (o) {
     assertThrows(function(){ a() }, "myexn")
     assertEquals("local", b())
     assertEquals("global", c())
     assertEquals("own", d())
   }
 }
 
 function onproxythrow() { throw "myexn" }
 
 TestWithGetCallThrow({
   get: function(r, k) { key = k; return k === "a" ? onproxythrow : undefined },
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxythrow, configurable: true} : undefined
-  }
 })
 
 TestWithGetCallThrow({
   get: function(r, k) { return this.get2(r, k) },
   get2: function(r, k) { key = k; return k === "a" ? onproxythrow : undefined },
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxythrow, configurable: true} : undefined
-  }
-})
-
-TestWithGetCallThrow({
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxythrow, configurable: true} : undefined
-  }
-})
-
-TestWithGetCallThrow({
-  getPropertyDescriptor: function(k) { return this.getPropertyDescriptor2(k) },
-  getPropertyDescriptor2: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxythrow, configurable: true} : undefined
-  }
-})
-
-TestWithGetCallThrow({
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ?
-        {get value() { return onproxythrow }, configurable: true} : undefined
-  }
-})
-
-TestWithGetCallThrow({
-  get: undefined,
-  getPropertyDescriptor: function(k) {
-    key = k;
-    return k === "a" ? {value: onproxythrow, configurable: true} : undefined
-  }
 })
 
 
 
 // Setting.
 
 var key
 var val
 
 function TestWithSet(handler, hasSetter) {
@@ skipping 33 matching lines @@
     b = "local"
     c = "global"
     d = "own"
     assertEquals("a", key)
     assertEquals("set", val)
   }
 }
 
 TestWithSet({
   set: function(r, k, v) { key = k; val = v; return true },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
+  has: function(t, k) {
+    return k === "a"
   }
 })
 
 TestWithSet({
   set: function(r, k, v) { return this.set2(r, k, v) },
   set2: function(r, k, v) { key = k; val = v; return true },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
+  has: function(t, k) {
+    return k === "a"
   }
 })
 
 TestWithSet({
-  getPropertyDescriptor: function(k) {
-    return this.getOwnPropertyDescriptor(k)
+  has: function(t, k) {
+    return k === "a"
   },
-  getOwnPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
-  },
-  defineProperty: function(k, desc) { key = k; val = desc.value }
+  defineProperty: function(t, k, desc) { key = k; val = desc.value }
 })
 
 TestWithSet({
-  getOwnPropertyDescriptor: function(k) {
-    return this.getPropertyDescriptor2(k)
+  has: function(t, k) {
+    return this.has2(k)
   },
-  getPropertyDescriptor: function(k) { return this.getPropertyDescriptor2(k) },
-  getPropertyDescriptor2: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
+  has2: function(k) {
+    return k === "a"
   },
-  defineProperty: function(k, desc) { this.defineProperty2(k, desc) },
+  defineProperty: function(t, k, desc) { this.defineProperty2(k, desc) },
   defineProperty2: function(k, desc) { key = k; val = desc.value }
 })
 
 TestWithSet({
-  getOwnPropertyDescriptor: function(k) {
-    return this.getPropertyDescriptor(k)
+  has: function(t, k) {
+    return k === "a"
   },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ?
-        {get writable() { return true }, configurable: true} : undefined
-  },
-  defineProperty: function(k, desc) { key = k; val = desc.value }
+  defineProperty: function(t, k, desc) { key = k; val = desc.value }
 })
 
 TestWithSet({
-  getOwnPropertyDescriptor: function(k) {
-    return this.getPropertyDescriptor(k)
+  has: function(t, k) {
+    return this.has2(k) },
+  has2: function(k) {
+    return k === "a"
   },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ?
-        {set: function(v) { key = k; val = v }, configurable: true} : undefined
-  }
+  set: function(t, k, v) { key = k; val = v; return true }
 }, true)
 
 TestWithSet({
-  getOwnPropertyDescriptor: function(k) {
-    return this.getPropertyDescriptor(k)
+  has: function(t, k) {
+    return k === "a"
   },
-  getPropertyDescriptor: function(k) { return this.getPropertyDescriptor2(k) },
-  getPropertyDescriptor2: function(k) {
-    return k === "a" ?
-        {set: function(v) { key = k; val = v }, configurable: true} : undefined
-  }
-}, true)
-
-TestWithSet({
-  getOwnPropertyDescriptor: function(k) { return null },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
-  },
-  defineProperty: function(k, desc) { key = k; val = desc.value }
+  defineProperty: function(t, k, desc) { key = k; val = desc.value }
 })
 
 
 function TestWithSetThrow(handler, hasSetter) {
   TestWithProxies(TestWithSetThrow2, handler, hasSetter)
 }
 
 function TestWithSetThrow2(create, handler, hasSetter) {
   var p = create(handler)
   assertThrows(function(){
     with (p) {
       a = 1
     }
   }, "myexn")
 
   if (!hasSetter) return
 
   var o = Object.create(p, {})
   assertThrows(function(){
     with (o) {
       a = 1
     }
   }, "myexn")
 }
 
 TestWithSetThrow({
-  set: function(r, k, v) { throw "myexn" },
-  getPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
+  set: function() { throw "myexn" },
+  has: function(t, k) {
+    return k === "a"
   }
 })
 
 TestWithSetThrow({
-  getPropertyDescriptor: function(k) { throw "myexn" },
+  has: function() { throw "myexn" },
 })
 
 TestWithSetThrow({
-  getPropertyDescriptor: function(k) {
-    return k === "a" ? {writable: true, configurable: true} : undefined
-  },
-  defineProperty: function(k, desc) { throw "myexn" }
+  has: function() { throw "myexn" },
 })
 
 TestWithSetThrow({
-  getPropertyDescriptor: function(k) {
-    return k === "a" ?
-        {set: function() { throw "myexn" }, configurable: true} : undefined
-  }
+  has: function(t, k) {
+    return k === "a"
+  },
+  defineProperty: function() { throw "myexn" }
+})
+
+TestWithSetThrow({
+  has: function(t, k) {
+    return k === "a"
+  },
+  set: function() { throw "myexn" }
 }, true)