[proxies] Adapt and reenable harmony/proxies-for.js test.

test/mjsunit/harmony/proxies-for.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 22 matching lines @@
 function TestWithProxies(test, x, y, z) {
   test(function(h){ return new Proxy({}, h) }, x, y, z)
   test(function(h) {
     return Proxy.createFunction(h, function() {})
   }, x, y, z)
 }
 
 
 // Iterate over a proxy.
 
+Array.prototype.values = function() { return this[Symbol.iterator]() }
+
 function TestForIn(properties, handler) {
   TestWithProxies(TestForIn2, properties, handler)
 }
 
 function TestForIn2(create, properties, handler) {
   var p = create(handler)
   var found = []
   for (var x in p) found.push(x)
   assertArrayEquals(properties, found)
 }
 
 TestForIn(["0", "a"], {
-  enumerate: function() { return [0, "a"] }
+  enumerate: function() { return ["0", "a"].values() }
 })
 
 TestForIn(["null", "a"], {
   enumerate: function() { return this.enumerate2() },
-  enumerate2: function() { return [null, "a"] }
-})
-
-TestForIn(["b", "d"], {
-  getPropertyNames: function() { return ["a", "b", "c", "d", "e"] },
-  getPropertyDescriptor: function(k) {
-    switch (k) {
-      case "a": return {enumerable: false, value: "3", configurable: true};
-      case "b": return {enumerable: true, get get() {}, configurable: true};
-      case "c": return {value: 4, configurable: true};
-      case "d": return {get enumerable() { return true }, configurable: true};
-      default: return undefined;
-    }
-  }
+  enumerate2: function() { return ["null", "a"].values() }
 })
 
 TestForIn(["b", "a", "0", "c"], new Proxy({}, {
   get: function(pr, pk) {
-    return function() { return ["b", "a", 0, "c"] }
+    return function() { return ["b", "a", "0", "c"].values() }
   }
 }))
 
 
 
 // Iterate over an object with a proxy prototype.
 
 function TestForInDerived(properties, handler) {
   TestWithProxies(TestForInDerived2, properties, handler)
 }
 
 function TestForInDerived2(create, properties, handler) {
   var p = create(handler)
   var o = Object.create(p)
   o.z = 0
   var found = []
   for (var x in o) found.push(x)
   assertArrayEquals(["z"].concat(properties), found)
 
   var oo = Object.create(o)
   oo.y = 0
   var found = []
   for (var x in oo) found.push(x)
   assertArrayEquals(["y", "z"].concat(properties), found)
 }
 
 TestForInDerived(["0", "a"], {
-  enumerate: function() { return [0, "a"] },
-  getPropertyDescriptor: function(k) {
-    return k == "0" || k == "a" ? {configurable: true} : undefined
-  }
+  enumerate: function() { return ["0", "a"].values() },
+  has: function(t, k) { return k == "0" || k == "a" }
 })
 
 TestForInDerived(["null", "a"], {
   enumerate: function() { return this.enumerate2() },
-  enumerate2: function() { return [null, "a"] },
-  getPropertyDescriptor: function(k) {
-    return k == "null" || k == "a" ? {configurable: true} : undefined
-  }
-})
-
-TestForInDerived(["b", "d"], {
-  getPropertyNames: function() { return ["a", "b", "c", "d", "e"] },
-  getPropertyDescriptor: function(k) {
-    switch (k) {
-      case "a": return {enumerable: false, value: "3", configurable: true};
-      case "b": return {enumerable: true, get get() {}, configurable: true};
-      case "c": return {value: 4, configurable: true};
-      case "d": return {get enumerable() { return true }, configurable: true};
-      default: return undefined;
-    }
-  }
+  enumerate2: function() { return ["null", "a"].values() },
+  has: function(t, k) { return k == "null" || k == "a" }
 })
 
 
 
 // Throw exception in enumerate trap.
 
 function TestForInThrow(handler) {
   TestWithProxies(TestForInThrow2, handler)
 }
 
 function TestForInThrow2(create, handler) {
   var p = create(handler)
   var o = Object.create(p)
   assertThrows(function(){ for (var x in p) {} }, "myexn")
   assertThrows(function(){ for (var x in o) {} }, "myexn")
 }
 
 TestForInThrow({
   enumerate: function() { throw "myexn" }
 })
 
 TestForInThrow({
   enumerate: function() { return this.enumerate2() },
   enumerate2: function() { throw "myexn" }
 })
 
-TestForInThrow({
-  getPropertyNames: function() { throw "myexn" }
-})
-
-TestForInThrow({
-  getPropertyNames: function() { return ["a"] },
-  getPropertyDescriptor: function() { throw "myexn" }
-})
-
 TestForInThrow(new Proxy({}, {
   get: function(pr, pk) {
     return function() { throw "myexn" }
   }
 }));
 
 (function() {
-  var p = new Proxy({}, {enumerate:function() { return [0]; }});
+  var p = new Proxy({}, {enumerate:function() { return ["0"].values(); }});
   var o = [0];
   o.__proto__ = p;
   var keys = [];
   for (var k in o) { keys.push(k); };
   assertEquals(["0"], keys);
 })();
 
 (function () {
   var p = new Proxy({}, {getOwnPropertyNames:
     function() { return [1, Symbol(), 2] }});
   assertEquals(["1","2"], Object.getOwnPropertyNames(p));
 })();