Use verifyProperty in language/arguments-object tests

test/language/arguments-object/10.6-6-2.js

@@ -4,13 +4,14 @@
 /*---
 es5id: 10.6-6-2
 description: "'length' property of arguments object has correct attributes"
+includes: [propertyHelper.js]
 ---*/
 
 function testcase() {
-  var desc = Object.getOwnPropertyDescriptor(arguments,"length");
-
-  assert.sameValue(desc.configurable, true, 'desc.configurable');
-  assert.sameValue(desc.enumerable, false, 'desc.enumerable');
-  assert.sameValue(desc.writable, true, 'desc.writable');
+  verifyProperty(arguments, "length", {
+    writable: true,
+    enumerable: false,
+    configurable: true,
+  });
  }
 testcase();

test/language/arguments-object/mapped/Symbol.iterator.js

@@ -11,11 +11,10 @@ features: [Symbol.iterator]
 ---*/
 
 (function() {
-  var descriptor = Object.getOwnPropertyDescriptor(arguments, Symbol.iterator);
-
-  assert.sameValue(arguments[Symbol.iterator], [][Symbol.iterator]);
-
-  verifyNotEnumerable(Array.prototype, Symbol.iterator);
-  verifyWritable(Array.prototype, Symbol.iterator);
-  verifyConfigurable(Array.prototype, Symbol.iterator);
+  verifyProperty(arguments, Symbol.iterator, {
+    value: [][Symbol.iterator],
+    writable: true,
+    enumerable: false,
+    configurable: true,
+  });
 }());

test/language/arguments-object/mapped/nonconfigurable-descriptors-basic.js

@@ -13,10 +13,11 @@ includes: [propertyHelper.js]
 function argumentsNonConfigurable(a) {
   Object.defineProperty(arguments, "0", {configurable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: true,
+    enumerable: true,
+    configurable: false,
+  });
 }
 argumentsNonConfigurable(1);

test/language/arguments-object/mapped/nonconfigurable-descriptors-set-value-by-arguments.js

@@ -16,12 +16,14 @@ function argumentsAndSetByIndex(a) {
 
   arguments[0] = 2;
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
   assert.sameValue(a, 2);
-  verifyEnumerable(arguments, "0");
-  verifyWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: true,
+    enumerable: true,
+    configurable: false,
+  });
 }
 argumentsAndSetByIndex(1);
 

test/language/arguments-object/mapped/nonconfigurable-descriptors-set-value-with-define-property.js

@@ -16,12 +16,14 @@ function setArgumentValueWithDefineOwnProperty(a) {
 
   Object.defineProperty(arguments, "0", {value: 2});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
   assert.sameValue(a, 2);
-  verifyEnumerable(arguments, "0");
-  verifyWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: true,
+    enumerable: true,
+    configurable: false,
+  });
 }
 setArgumentValueWithDefineOwnProperty(1);
 

test/language/arguments-object/mapped/nonconfigurable-descriptors-with-param-assign.js

@@ -15,11 +15,13 @@ function argumentsAndSetMutableBinding(a) {
   Object.defineProperty(arguments, "0", {configurable: false});
 
   a = 2;
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyEnumerable(arguments, "0");
-  verifyWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: true,
+    enumerable: true,
+    configurable: false,
+  });
 }
 argumentsAndSetMutableBinding(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonenumerable-nonwritable-descriptors-basic.js

@@ -17,11 +17,12 @@ function fn(a) {
   // Postcondition: Arguments mapping is removed.
   a = 2;
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonenumerable-nonwritable-descriptors-set-by-arguments.js

@@ -17,20 +17,24 @@ function fn(a) {
   arguments[0] = 2;
   Object.defineProperty(arguments, "0", {writable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
   assert.sameValue(a, 2);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonenumerable-nonwritable-descriptors-set-by-param.js

@@ -18,19 +18,22 @@ function fn(a) {
   a = 2;
   Object.defineProperty(arguments, "0", {writable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-basic.js

@@ -18,11 +18,12 @@ function fn(a) {
   // Postcondition: Arguments mapping is removed.
   a = 2;
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-define-property-consecutive.js

@@ -16,19 +16,22 @@ function fn(a) {
   Object.defineProperty(arguments, "0", {configurable: false});
   Object.defineProperty(arguments, "0", {writable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 2;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-set-by-arguments.js

@@ -18,20 +18,25 @@ function fn(a) {
   Object.defineProperty(arguments, "0", {configurable: false});
   arguments[0] = 2;
   Object.defineProperty(arguments, "0", {writable: false});
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
+
   assert.sameValue(a, 2)
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonconfigurable-nonwritable-descriptors-set-by-param.js

@@ -18,19 +18,22 @@ function fn(a) {
   a = 2;
   Object.defineProperty(arguments, "0", {writable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonwritable-nonconfigurable-descriptors-basic.js

@@ -17,20 +17,24 @@ includes: [propertyHelper.js]
 function fn(a) {
   Object.defineProperty(arguments, "0", {writable: false});
   Object.defineProperty(arguments, "0", {configurable: false});
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed. Descriptors need to be the same
   // as above.
   a = 2;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonwritable-nonconfigurable-descriptors-set-by-arguments.js

@@ -18,20 +18,25 @@ function fn(a) {
   Object.defineProperty(arguments, "0", {writable: false});
   arguments[0] = 2;
   Object.defineProperty(arguments, "0", {configurable: false});
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
+
   assert.sameValue(a, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonwritable-nonconfigurable-descriptors-set-by-param.js

@@ -18,11 +18,13 @@ function fn(a) {
   Object.defineProperty(arguments, "0", {writable: false});
   a = 2;
   Object.defineProperty(arguments, "0", {configurable: false});
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
 }
 fn(1);
 

test/language/arguments-object/mapped/nonwritable-nonenumerable-nonconfigurable-descriptors-basic.js

@@ -18,18 +18,21 @@ function fn(a) {
   Object.defineProperty(arguments, "0", {writable: false, enumerable: false});
   Object.defineProperty(arguments, "0", {configurable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 2;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);

test/language/arguments-object/mapped/nonwritable-nonenumerable-nonconfigurable-descriptors-set-by-arguments.js

@@ -17,18 +17,21 @@ function fn(a) {
   arguments[0] = 2;
   Object.defineProperty(arguments, "0", {configurable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);

test/language/arguments-object/mapped/nonwritable-nonenumerable-nonconfigurable-descriptors-set-by-define-property.js

@@ -17,11 +17,11 @@ includes: [propertyHelper.js]
 function fn(a) {
   Object.defineProperty(arguments, "0", {writable: false, enumerable: false, value: 2, configurable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 2);
-  assert.sameValue(arguments[0], 2);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 2,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);

test/language/arguments-object/mapped/nonwritable-nonenumerable-nonconfigurable-descriptors-set-by-param.js

@@ -18,18 +18,21 @@ function fn(a) {
   a = 2;
   Object.defineProperty(arguments, "0", {configurable: false});
 
-  let propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 
   // Postcondition: Arguments mapping is removed.
   a = 3;
-  propertyDescriptor = Object.getOwnPropertyDescriptor(arguments, "0");
-  assert.sameValue(propertyDescriptor.value, 1);
-  verifyNotEnumerable(arguments, "0");
-  verifyNotWritable(arguments, "0");
-  verifyNotConfigurable(arguments, "0");
+
+  verifyProperty(arguments, "0", {
+    value: 1,
+    writable: false,
+    enumerable: false,
+    configurable: false,
+  });
 }
 fn(1);

test/language/arguments-object/unmapped/Symbol.iterator.js

@@ -12,11 +12,11 @@ features: [Symbol.iterator]
 
 (function() {
   'use strict';
-  var descriptor = Object.getOwnPropertyDescriptor(arguments, Symbol.iterator);
 
-  assert.sameValue(arguments[Symbol.iterator], [][Symbol.iterator]);
-
-  verifyNotEnumerable(Array.prototype, Symbol.iterator);
-  verifyWritable(Array.prototype, Symbol.iterator);
-  verifyConfigurable(Array.prototype, Symbol.iterator);
+  verifyProperty(arguments, Symbol.iterator, {
+    value: [][Symbol.iterator],
+    writable: true,
+    enumerable: false,
+    configurable: true,
+  });
 }());