Update built-ins/Object/defineProperty to use verifyProperty

test/built-ins/Object/defineProperty/15.2.3.6-3-100.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: null
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-102.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: false
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-103.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: 0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-104.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: +0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-105.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: -0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-106.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: NaN
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-109.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: ""
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-152.js

@@ -17,6 +17,7 @@ var attr = {
 
 Object.defineProperty(obj, "property", attr);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-153.js

@@ -17,5 +17,6 @@ var attr = {
 
 Object.defineProperty(obj, "property", attr);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-162.js

@@ -18,5 +18,6 @@ Object.defineProperty(attr, "writable", {
 
 Object.defineProperty(obj, "property", attr);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-163.js

@@ -29,5 +29,6 @@ Object.defineProperty(child, "writable", {
 
 Object.defineProperty(obj, "property", child);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-164.js

@@ -24,5 +24,6 @@ var child = new ConstructFun();
 
 Object.defineProperty(obj, "property", child);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js

@@ -17,8 +17,10 @@ try {
   var dateObj = new Date();
 
   Object.defineProperty(obj, "property", dateObj);
-  verifyWritable(obj, "property");
 
+  verifyProperty(obj, "property", {
+    writable: true,
+  });
 } finally {
   delete Date.prototype.writable;
 }

test/built-ins/Object/defineProperty/15.2.3.6-3-178.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: undefined
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-179.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: null
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-181.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: false
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-182.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: 0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-183.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: +0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-184.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: -0
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-185.js

@@ -15,8 +15,7 @@ Object.defineProperty(obj, "property", {
   writable: NaN
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-
+  value: undefined,
-verifyNotWritable(obj, "property");
+  writable: false,
-
+});
-assert.sameValue(typeof(obj.property), "undefined");

test/built-ins/Object/defineProperty/15.2.3.6-3-188.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   writable: ""
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotWritable(obj, "property");
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-73.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: false
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-74.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   value: 100
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-76.js

@@ -22,10 +22,7 @@ var child = new ConstructFun();
 
 Object.defineProperty(obj, "property", child);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-
+  value: undefined,
-verifyNotConfigurable(obj, "property");
+  configurable: false,
-
+});
-assert(obj.hasOwnProperty("property"));
-
-assert.sameValue(typeof(obj.property), "undefined");

test/built-ins/Object/defineProperty/15.2.3.6-3-83.js

@@ -18,5 +18,6 @@ Object.defineProperty(attr, "configurable", {
 
 Object.defineProperty(obj, "property", attr);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-84.js

@@ -29,5 +29,6 @@ Object.defineProperty(child, "configurable", {
 
 Object.defineProperty(obj, "property", child);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-3-85.js

@@ -24,9 +24,8 @@ var child = new ConstructFun();
 
 Object.defineProperty(obj, "property", child);
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
+  configurable: false,
+});
 
-verifyNotConfigurable(obj, "property");
-
-assert(obj.hasOwnProperty("property"));
 assert.sameValue(typeof(obj.property), "undefined");

test/built-ins/Object/defineProperty/15.2.3.6-3-99.js

@@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", {
   configurable: undefined
 });
 
-assert(obj.hasOwnProperty("property"));
+verifyProperty(obj, "property", {
-verifyNotConfigurable(obj, "property");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-100.js

@@ -16,10 +16,10 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru
 Object.defineProperty(obj, "foo", {
   value: 200
 });
-verifyEqualTo(obj, "foo", 200);
 
-verifyWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: 200,
-verifyEnumerable(obj, "foo");
+  writable: true,
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-101.js

@@ -16,10 +16,10 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru
 Object.defineProperty(obj, "foo", {
   value: undefined
 });
-verifyEqualTo(obj, "foo", undefined);
 
-verifyWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: undefined,
-verifyEnumerable(obj, "foo");
+  writable: true,
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-102.js

@@ -16,10 +16,10 @@ obj.foo = undefined; // default value of attributes: writable: true, configurabl
 Object.defineProperty(obj, "foo", {
   value: 100
 });
-verifyEqualTo(obj, "foo", 100);
 
-verifyWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: 100,
-verifyEnumerable(obj, "foo");
+  writable: true,
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-103.js

@@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", {
 Object.defineProperty(obj, "foo", {
   writable: true
 });
-verifyEqualTo(obj, "foo", undefined);
 
-verifyWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: undefined,
-verifyNotEnumerable(obj, "foo");
+  writable: true,
-
+  enumerable: false,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-104.js

@@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", {
 Object.defineProperty(obj, "foo", {
   enumerable: true
 });
-verifyEqualTo(obj, "foo", undefined);
 
-verifyNotWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: undefined,
-verifyEnumerable(obj, "foo");
+  writable: false,
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-105.js

@@ -23,10 +23,9 @@ Object.defineProperty(obj, "foo", {
   configurable: false
 });
 
-verifyEqualTo(obj, "foo", 200);
+verifyProperty(obj, "foo", {
-
+  value: 200,
-verifyWritable(obj, "foo");
+  writable: true,
-
+  enumerable: true,
-verifyEnumerable(obj, "foo");
+  configurable: false,
-
+});
-verifyNotConfigurable(obj, "foo");

test/built-ins/Object/defineProperty/15.2.3.6-4-106.js

@@ -24,10 +24,10 @@ Object.defineProperty(obj, "foo", {
   writable: false,
   enumerable: false
 });
-verifyEqualTo(obj, "foo", 200);
 
-verifyNotWritable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  value: 200,
-verifyNotEnumerable(obj, "foo");
+  writable: false,
-
+  enumerable: false,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-107.js

@@ -38,6 +38,7 @@ verifyEqualTo(obj, "foo", getFunc2());
 
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyNotEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: false,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-108.js

@@ -34,6 +34,7 @@ Object.defineProperty(obj, "foo", {
 });
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-109.js

@@ -34,6 +34,7 @@ verifyEqualTo(obj, "foo", getFunc());
 
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-110.js

@@ -32,6 +32,7 @@ Object.defineProperty(obj, "foo", {
 });
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-112.js

@@ -35,6 +35,7 @@ verifyEqualTo(obj, "foo", getFunc());
 
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: true,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-113.js

@@ -30,6 +30,7 @@ Object.defineProperty(obj, "foo", {
 
 verifyEqualTo(obj, "foo", getFunc());
 
-verifyNotEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: false,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-114.js

@@ -35,6 +35,7 @@ verifyEqualTo(obj, "foo", getFunc());
 
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyNotEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: false,
-verifyNotConfigurable(obj, "foo");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-115.js

@@ -42,6 +42,7 @@ verifyEqualTo(obj, "foo", getFunc2());
 
 verifyWritable(obj, "foo", "setVerifyHelpProp");
 
-verifyNotEnumerable(obj, "foo");
+verifyProperty(obj, "foo", {
-
+  enumerable: false,
-verifyConfigurable(obj, "foo");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-118.js

@@ -16,6 +16,9 @@ Object.defineProperty(arrObj, "length", {});
 
 assert.sameValue(arrObj.length, 0);
 arrObj.length = 2;
-assert.sameValue(arrObj.length, 2);
+
-verifyNotEnumerable(arrObj, "length");
+verifyProperty(arrObj, "length", {
-verifyNotConfigurable(arrObj, "length");
+  value: 2,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-119.js

@@ -21,6 +21,9 @@ Object.defineProperty(arrObj, "length", {
 
 assert.sameValue(arrObj.length, 0);
 arrObj.length = 2;
-assert.sameValue(arrObj.length, 2);
+
-verifyNotEnumerable(arrObj, "length");
+verifyProperty(arrObj, "length", {
-verifyNotConfigurable(arrObj, "length");
+  value: 2,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-124.js

@@ -16,10 +16,10 @@ var arrObj = [];
 Object.defineProperty(arrObj, "length", {
   writable: false
 });
-verifyEqualTo(arrObj, "length", 0);
 
-verifyNotWritable(arrObj, "length");
+verifyProperty(arrObj, "length", {
-
+  value: 0,
-verifyNotEnumerable(arrObj, "length");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "length");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-167.js

@@ -22,5 +22,8 @@ Object.defineProperty(arrObj, "length", {
 });
 
 assert(!arrObj.hasOwnProperty("1"))
-assert.sameValue(arrObj.length, 1);
+
-verifyNotWritable(arrObj, "length");
+verifyProperty(arrObj, "length", {
+  value: 1,
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-181.js

@@ -21,7 +21,9 @@ Object.defineProperty(arrObj, "length", {
   writable: false
 });
 
-verifyNotWritable(arrObj, "length");
-
 assert(!arrObj.hasOwnProperty("1"));
-assert.sameValue(arrObj.length, 0);
+
+verifyProperty(arrObj, "length", {
+  value: 0,
+  writable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-190.js

@@ -24,15 +24,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", "ownDataProperty");
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
 }
+
+verifyProperty(arrObj, "0", {
+  value: "ownDataProperty",
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-194.js

@@ -29,12 +29,12 @@ try {
 } catch (e) {
   verifyEqualTo(arrObj, "0", getFunc());
 
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e.name);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-195.js

@@ -41,9 +41,10 @@ try {
 
   verifyWritable(arrObj, "0", "helpVerifySet");
 
-  verifyNotEnumerable(arrObj, "0");
+  verifyProperty(arrObj, "0", {
-
+    enumerable: false,
-  verifyNotConfigurable(arrObj, "0");
+    configurable: false,
+  });
 } finally {
   delete Array.prototype[0];
 }

test/built-ins/Object/defineProperty/15.2.3.6-4-199.js

@@ -17,10 +17,9 @@ Object.defineProperty(arrObj, "0", {
   enumerable: true
 });
 
-verifyEqualTo(arrObj, "0", undefined);
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotWritable(arrObj, "0");
+  writable: false,
-
+  enumerable: true,
-verifyEnumerable(arrObj, "0");
+  configurable: false,
-
+});
-verifyNotConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-200.js

@@ -20,10 +20,9 @@ Object.defineProperty(arrObj, "0", {
   configurable: false
 });
 
-verifyEqualTo(arrObj, "0", undefined);
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyWritable(arrObj, "0");
+  writable: true,
-
+  enumerable: true,
-verifyEnumerable(arrObj, "0");
+  configurable: false,
-
+});
-verifyNotConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-201.js

@@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", {
   enumerable: true,
   configurable: false
 });
-verifyEqualTo(arrObj, "0", 1001);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: 1001,
-verifyEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: true,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-202.js

@@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", {
   writable: true,
   configurable: true
 });
-verifyEqualTo(arrObj, "0", 1001);
 
-verifyWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: 1001,
-verifyNotEnumerable(arrObj, "0");
+  writable: true,
-
+  enumerable: false,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-203.js

@@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", {
   writable: true,
   enumerable: true
 });
-verifyEqualTo(arrObj, "0", 1001);
 
-verifyWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: 1001,
-verifyEnumerable(arrObj, "0");
+  writable: true,
-
+  enumerable: true,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-204.js

@@ -19,10 +19,9 @@ Object.defineProperty(arrObj, "0", {
   configurable: false
 });
 
-verifyEqualTo(arrObj, "0", 1001);
+verifyProperty(arrObj, "0", {
-
+  value: 1001,
-verifyNotWritable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotEnumerable(arrObj, "0");
+  configurable: false,
-
+});
-verifyNotConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-205.js

@@ -24,6 +24,7 @@ Object.defineProperty(arrObj, "0", {
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-207.js

@@ -28,6 +28,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-208.js

@@ -27,6 +27,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: true,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-209.js

@@ -38,6 +38,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-210.js

@@ -15,10 +15,10 @@ var arrObj = [];
 arrObj[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
 
 Object.defineProperty(arrObj, "0", {});
-verifyEqualTo(arrObj, "0", 101);
 
-verifyWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: 101,
-verifyEnumerable(arrObj, "0");
+  writable: true,
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-211.js

@@ -32,6 +32,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-212.js

@@ -22,10 +22,9 @@ Object.defineProperty(arrObj, "0", {
   configurable: true
 });
 
-verifyEqualTo(arrObj, "0", 100);
+verifyProperty(arrObj, "0", {
-
+  value: 100,
-verifyWritable(arrObj, "0");
+  writable: true,
-
+  enumerable: true,
-verifyEnumerable(arrObj, "0");
+  configurable: true,
-
+});
-verifyConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-213.js

@@ -39,6 +39,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-214.js

@@ -26,16 +26,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", 101);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: 101,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-215.js

@@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: undefined
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-216.js

@@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: null
 });
-verifyEqualTo(arrObj, "0", null);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: null,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-217.js

@@ -20,9 +20,9 @@ Object.defineProperty(arrObj, "0", {
   value: NaN
 });
 
-assert(arrObj.hasOwnProperty("0"));
+verifyProperty(arrObj, "0", {
-assert(arrObj[0] !== arrObj[0]);
+  value: NaN,
-
+  writable: false,
-verifyNotWritable(arrObj, "0");
+  enumerable: false,
-verifyNotEnumerable(arrObj, "0");
+  configurable: false,
-verifyNotConfigurable(arrObj, "0");
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-218.js

@@ -23,16 +23,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", -0);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: -0,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-219.js

@@ -23,16 +23,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", +0);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: +0,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-220.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: 101
 });
-verifyEqualTo(arrObj, "0", 101);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: 101,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-221.js

@@ -25,16 +25,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", 101);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: 101,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-222.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: "abcd"
 });
-verifyEqualTo(arrObj, "0", "abcd");
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: "abcd",
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-223.js

@@ -25,16 +25,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", "abcd");
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: "abcd",
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-224.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: true
 });
-verifyEqualTo(arrObj, "0", true);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: true,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-225.js

@@ -25,16 +25,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", true);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: true,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-226.js

@@ -24,10 +24,11 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   value: obj1
 });
-verifyEqualTo(arrObj, "0", obj1);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
+  value: obj1,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});
 
-verifyNotEnumerable(arrObj, "0");
-
-verifyNotConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-227.js

@@ -32,16 +32,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "0", obj1);
-
-  verifyNotWritable(arrObj, "0");
-
-  verifyNotEnumerable(arrObj, "0");
-
-  verifyNotConfigurable(arrObj, "0");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "0", {
+  value: obj1,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-228.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   writable: false
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-229.js

@@ -21,10 +21,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   writable: true
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: true,
-
+  enumerable: false,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-230.js

@@ -34,6 +34,7 @@ verifyEqualTo(arrObj, "0", getFunc());
 
 verifyWritable(arrObj, "0", "helpVerifySet");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-231.js

@@ -40,6 +40,7 @@ verifyEqualTo(arrObj, "0", getFunc2());
 
 verifyWritable(arrObj, "0", "helpVerifySet");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-232.js

@@ -26,6 +26,7 @@ Object.defineProperty(arrObj, "0", {
 });
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-233.js

@@ -29,6 +29,7 @@ Object.defineProperty(arrObj, "0", {
 });
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyNotEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: false,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-234.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   enumerable: false
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-235.js

@@ -21,10 +21,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   enumerable: true
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-236.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   configurable: false
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-237.js

@@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", {
 Object.defineProperty(arrObj, "0", {
   configurable: false
 });
-verifyEqualTo(arrObj, "0", undefined);
 
-verifyNotWritable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  value: undefined,
-verifyNotEnumerable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotConfigurable(arrObj, "0");
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-238.js

@@ -27,18 +27,15 @@ try {
     configurable: true
   });
   throw new Test262Error("Expected an exception.");
-
 } catch (e) {
-  verifyEqualTo(arrObj, "1", 3);
-
-  verifyWritable(arrObj, "1");
-
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  value: 3,
+  writable: true,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-239.js

@@ -29,18 +29,15 @@ try {
     enumerable: true
   });
   throw new Test262Error("Expected an exception.");
-
 } catch (e) {
-  verifyEqualTo(arrObj, "1", 3);
-
-  verifyWritable(arrObj, "1");
-
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  value: 3,
+  writable: true,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-240.js

@@ -32,12 +32,12 @@ try {
 } catch (e) {
   verifyWritable(arrObj, "1", "setVerifyHelpProp");
 
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-241.js

@@ -24,18 +24,15 @@ try {
     set: function() {}
   });
   throw new Test262Error("Expected an exception.");
-
 } catch (e) {
-  verifyEqualTo(arrObj, "1", 3);
-
-  verifyNotWritable(arrObj, "1");
-
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  value: 3,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js

@@ -20,10 +20,9 @@ Object.defineProperty(arrObj, "0", {
   enumerable: false
 });
 
-verifyEqualTo(arrObj, "0", 1001);
+verifyProperty(arrObj, "0", {
-
+  value: 1001,
-verifyNotWritable(arrObj, "0");
+  writable: false,
-
+  enumerable: false,
-verifyNotEnumerable(arrObj, "0");
+  configurable: true,
-
+});
-verifyConfigurable(arrObj, "0");

test/built-ins/Object/defineProperty/15.2.3.6-4-242.js

@@ -24,6 +24,7 @@ Object.defineProperty(arrObj, "0", {
 
 verifyWritable(arrObj, "0", "setVerifyHelpProp");
 
-verifyEnumerable(arrObj, "0");
+verifyProperty(arrObj, "0", {
-
+  enumerable: true,
-verifyConfigurable(arrObj, "0");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js

@@ -27,6 +27,7 @@ arrObj[1] = 4;
 
 verifyEqualTo(arrObj, "1", getFunc());
 
-verifyNotEnumerable(arrObj, "1");
+verifyProperty(arrObj, "1", {
-
+  enumerable: false,
-verifyConfigurable(arrObj, "1");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-243-2.js

@@ -28,6 +28,7 @@ assert.throws(TypeError, function() {
 });
 verifyEqualTo(arrObj, "1", getFunc());
 
-verifyNotEnumerable(arrObj, "1");
+verifyProperty(arrObj, "1", {
-
+  enumerable: false,
-verifyConfigurable(arrObj, "1");
+  configurable: true,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-243.js

@@ -27,10 +27,9 @@ Object.defineProperty(arrObj, "1", {
   value: 12
 });
 
-verifyEqualTo(arrObj, "1", 12);
+verifyProperty(arrObj, "1", {
-
+  value: 12,
-verifyNotWritable(arrObj, "1");
+  writable: false,
-
+  enumerable: false,
-verifyNotEnumerable(arrObj, "1");
+  configurable: true,
-
+});
-verifyConfigurable(arrObj, "1");

test/built-ins/Object/defineProperty/15.2.3.6-4-244.js

@@ -22,23 +22,19 @@ Object.defineProperty(arrObj, "1", {
 });
 
 try {
-
   Object.defineProperty(arrObj, "1", {
     writable: true
   });
   throw new Test262Error("Expected an exception.");
-
 } catch (e) {
-  verifyEqualTo(arrObj, "1", undefined);
-
-  verifyNotWritable(arrObj, "1");
-
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  value: undefined,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});

test/built-ins/Object/defineProperty/15.2.3.6-4-245.js

@@ -29,16 +29,14 @@ try {
   });
   throw new Test262Error("Expected an exception.");
 } catch (e) {
-  verifyEqualTo(arrObj, "1", 3);
-
-  verifyNotWritable(arrObj, "1");
-
-  verifyNotEnumerable(arrObj, "1");
-
-  verifyNotConfigurable(arrObj, "1");
-
   if (!(e instanceof TypeError)) {
     throw new Test262Error("Expected TypeError, got " + e);
   }
-
 }
+
+verifyProperty(arrObj, "1", {
+  value: 3,
+  writable: false,
+  enumerable: false,
+  configurable: false,
+});