Use verifyProperty on test/annexB/ files

test/annexB/built-ins/Date/prototype/getYear/B.2.4.js

@@ -9,6 +9,8 @@ description: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyWritable(Date.prototype, "getYear");
+verifyProperty(Date.prototype, "getYear", {
-verifyNotEnumerable(Date.prototype, "getYear");
+  enumerable: false,
-verifyConfigurable(Date.prototype, "getYear");
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/Date/prototype/getYear/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Date.prototype.getYear.length, 0);
+verifyProperty(Date.prototype.getYear, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Date.prototype.getYear, "length");
+  writable: false,
-verifyNotWritable(Date.prototype.getYear, "length");
+  configurable: true,
-verifyConfigurable(Date.prototype.getYear, "length");
+  value: 0
+});

test/annexB/built-ins/Date/prototype/getYear/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Date.prototype.getYear.name, "getYear");
+verifyProperty(Date.prototype.getYear, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Date.prototype.getYear, "name");
+  writable: false,
-verifyNotWritable(Date.prototype.getYear, "name");
+  configurable: true,
-verifyConfigurable(Date.prototype.getYear, "name");
+  value: "getYear"
+});

test/annexB/built-ins/Date/prototype/setYear/B.2.5.js

@@ -9,6 +9,8 @@ description: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyWritable(Date.prototype, "setYear");
+verifyProperty(Date.prototype, "setYear", {
-verifyNotEnumerable(Date.prototype, "setYear");
+  enumerable: false,
-verifyConfigurable(Date.prototype, "setYear");
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/Date/prototype/setYear/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Date.prototype.setYear.length, 1);
+verifyProperty(Date.prototype.setYear, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Date.prototype.setYear, "length");
+  writable: false,
-verifyNotWritable(Date.prototype.setYear, "length");
+  configurable: true,
-verifyConfigurable(Date.prototype.setYear, "length");
+  value: 1
+});

test/annexB/built-ins/Date/prototype/setYear/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Date.prototype.setYear.name, "setYear");
+verifyProperty(Date.prototype.setYear, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Date.prototype.setYear, "name");
+  writable: false,
-verifyNotWritable(Date.prototype.setYear, "name");
+  configurable: true,
-verifyConfigurable(Date.prototype.setYear, "name");
+  value: "setYear"
+});

test/annexB/built-ins/Date/prototype/toGMTString/prop-desc.js

@@ -10,6 +10,8 @@ includes: [propertyHelper.js]
 
 ---*/
 
-verifyWritable(Date.prototype, "toGMTString");
+verifyProperty(Date.prototype, "toGMTString", {
-verifyNotEnumerable(Date.prototype, "toGMTString");
+  enumerable: false,
-verifyConfigurable(Date.prototype, "toGMTString");
+  writable: true,
+  configurable: true,
+});

test/annexB/built-ins/Object/prototype/__defineGetter__/define-existing.js

@@ -29,8 +29,11 @@ Object.defineProperty(subject, 'stringAcsr', {
 result = subject.__defineGetter__('stringAcsr', newGet);
 
 desc = Object.getOwnPropertyDescriptor(subject, 'stringAcsr');
-verifyEnumerable(subject, 'stringAcsr');
+
-verifyConfigurable(subject, 'stringAcsr');
+verifyProperty(subject, "stringAcsr", {
+  enumerable: true,
+  configurable: true
+});
 
 assert.sameValue(desc.get, newGet, 'descriptor `get` method');
 assert.sameValue(desc.set, originalSet, 'descriptor `set` method');

test/annexB/built-ins/Object/prototype/__defineGetter__/define-new.js

@@ -20,8 +20,11 @@ var desc, result;
 result = subject.__defineGetter__('stringAcsr', get);
 
 desc = Object.getOwnPropertyDescriptor(subject, 'stringAcsr');
-verifyEnumerable(subject, 'stringAcsr');
+
-verifyConfigurable(subject, 'stringAcsr');
+verifyProperty(subject, "stringAcsr", {
+  enumerable: true,
+  configurable: true
+});
 
 assert.sameValue(desc.get, get, 'descriptor `get` method');
 assert.sameValue(desc.set, undefined, 'descriptor `set` method');

test/annexB/built-ins/Object/prototype/__defineGetter__/length.js

@@ -18,8 +18,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__defineGetter__.length, 2);
+verifyProperty(Object.prototype.__defineGetter__, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__defineGetter__, 'length');
+  writable: false,
-verifyNotWritable(Object.prototype.__defineGetter__, 'length');
+  configurable: true,
-verifyConfigurable(Object.prototype.__defineGetter__, 'length');
+  value: 2
+});

test/annexB/built-ins/Object/prototype/__defineGetter__/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__defineGetter__.name, '__defineGetter__');
+verifyProperty(Object.prototype.__defineGetter__, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__defineGetter__, 'name');
+  writable: false,
-verifyNotWritable(Object.prototype.__defineGetter__, 'name');
+  configurable: true,
-verifyConfigurable(Object.prototype.__defineGetter__, 'name');
+  value: "__defineGetter__"
+});

test/annexB/built-ins/Object/prototype/__defineGetter__/prop-desc.js

@@ -10,6 +10,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(Object.prototype, '__defineGetter__');
+verifyProperty(Object.prototype, "__defineGetter__", {
-verifyWritable(Object.prototype, '__defineGetter__');
+  enumerable: false,
-verifyConfigurable(Object.prototype, '__defineGetter__');
+  writable: true,
+  configurable: true,
+});

test/annexB/built-ins/Object/prototype/__defineSetter__/define-existing.js

@@ -29,8 +29,11 @@ Object.defineProperty(subject, 'stringAcsr', {
 result = subject.__defineSetter__('stringAcsr', newSet);
 
 desc = Object.getOwnPropertyDescriptor(subject, 'stringAcsr');
-verifyEnumerable(subject, 'stringAcsr');
+
-verifyConfigurable(subject, 'stringAcsr');
+verifyProperty(subject, "stringAcsr", {
+  enumerable: true,
+  configurable: true
+});
 
 assert.sameValue(desc.get, originalGet, 'descriptor `get` method');
 assert.sameValue(desc.set, newSet, 'descriptor `set` method');

test/annexB/built-ins/Object/prototype/__defineSetter__/define-new.js

@@ -20,8 +20,11 @@ var desc, result;
 result = subject.__defineSetter__('stringAcsr', set);
 
 desc = Object.getOwnPropertyDescriptor(subject, 'stringAcsr');
-verifyEnumerable(subject, 'stringAcsr');
+
-verifyConfigurable(subject, 'stringAcsr');
+verifyProperty(subject, "stringAcsr", {
+  enumerable: true,
+  configurable: true,
+});
 
 assert.sameValue(desc.get, undefined, 'descriptor `get` method');
 assert.sameValue(desc.set, set, 'descriptor `set` method');

test/annexB/built-ins/Object/prototype/__defineSetter__/length.js

@@ -18,8 +18,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__defineSetter__.length, 2);
+verifyProperty(Object.prototype.__defineSetter__, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__defineSetter__, 'length');
+  writable: false,
-verifyNotWritable(Object.prototype.__defineSetter__, 'length');
+  configurable: true,
-verifyConfigurable(Object.prototype.__defineSetter__, 'length');
+  value: 2
+});

test/annexB/built-ins/Object/prototype/__defineSetter__/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__defineSetter__.name, '__defineSetter__');
+verifyProperty(Object.prototype.__defineSetter__, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__defineSetter__, 'name');
+  writable: false,
-verifyNotWritable(Object.prototype.__defineSetter__, 'name');
+  configurable: true,
-verifyConfigurable(Object.prototype.__defineSetter__, 'name');
+  value: "__defineSetter__"
+});

test/annexB/built-ins/Object/prototype/__defineSetter__/prop-desc.js

@@ -10,6 +10,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(Object.prototype, '__defineSetter__');
+verifyProperty(Object.prototype, "__defineSetter__", {
-verifyWritable(Object.prototype, '__defineSetter__');
+  enumerable: false,
-verifyConfigurable(Object.prototype, '__defineSetter__');
+  writable: true,
+  configurable: true,
+});

test/annexB/built-ins/Object/prototype/__lookupGetter__/length.js

@@ -18,8 +18,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__lookupGetter__.length, 1);
+verifyProperty(Object.prototype.__lookupGetter__, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__lookupGetter__, 'length');
+  writable: false,
-verifyNotWritable(Object.prototype.__lookupGetter__, 'length');
+  configurable: true,
-verifyConfigurable(Object.prototype.__lookupGetter__, 'length');
+  value: 1
+});

test/annexB/built-ins/Object/prototype/__lookupGetter__/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__lookupGetter__.name, '__lookupGetter__');
+verifyProperty(Object.prototype.__lookupGetter__, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__lookupGetter__, 'name');
+  writable: false,
-verifyNotWritable(Object.prototype.__lookupGetter__, 'name');
+  configurable: true,
-verifyConfigurable(Object.prototype.__lookupGetter__, 'name');
+  value: "__lookupGetter__"
+});

test/annexB/built-ins/Object/prototype/__lookupGetter__/prop-desc.js

@@ -10,6 +10,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(Object.prototype, '__lookupGetter__');
+verifyProperty(Object.prototype, "__lookupGetter__", {
-verifyWritable(Object.prototype, '__lookupGetter__');
+  enumerable: false,
-verifyConfigurable(Object.prototype, '__lookupGetter__');
+  writable: true,
+  configurable: true,
+});

test/annexB/built-ins/Object/prototype/__lookupSetter__/length.js

@@ -18,8 +18,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__lookupSetter__.length, 1);
+verifyProperty(Object.prototype.__lookupSetter__, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__lookupSetter__, 'length');
+  writable: false,
-verifyNotWritable(Object.prototype.__lookupSetter__, 'length');
+  configurable: true,
-verifyConfigurable(Object.prototype.__lookupSetter__, 'length');
+  value: 1
+});

test/annexB/built-ins/Object/prototype/__lookupSetter__/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.__lookupSetter__.name, '__lookupSetter__');
+verifyProperty(Object.prototype.__lookupSetter__, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(Object.prototype.__lookupSetter__, 'name');
+  writable: false,
-verifyNotWritable(Object.prototype.__lookupSetter__, 'name');
+  configurable: true,
-verifyConfigurable(Object.prototype.__lookupSetter__, 'name');
+  value: "__lookupSetter__"
+});

test/annexB/built-ins/Object/prototype/__lookupSetter__/prop-desc.js

@@ -10,6 +10,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(Object.prototype, '__lookupSetter__');
+verifyProperty(Object.prototype, "__lookupSetter__", {
-verifyWritable(Object.prototype, '__lookupSetter__');
+  enumerable: false,
-verifyConfigurable(Object.prototype, '__lookupSetter__');
+  writable: true,
+  configurable: true,
+});

test/annexB/built-ins/Object/prototype/__proto__/get-fn-name.js

@@ -13,14 +13,11 @@ description: >
 includes: [propertyHelper.js]
 ---*/
 
-var descriptor = Object.getOwnPropertyDescriptor(Object.prototype, '__proto__');
+var descriptor = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__");
 
-
+verifyProperty(descriptor.get, "name", {
-assert.sameValue(
+  enumerable: false,
-  descriptor.get.name, 'get __proto__',
+  writable: false,
-  'The value of `descriptor.get.name` is `"get __proto__"`'
+  configurable: true,
-);
+  value: "get __proto__"
-
+});
-verifyNotEnumerable(descriptor.get, 'name');
-verifyNotWritable(descriptor.get, 'name');
-verifyConfigurable(descriptor.get, 'name');

test/annexB/built-ins/Object/prototype/__proto__/prop-desc.js

@@ -13,9 +13,11 @@ includes: [propertyHelper.js]
 
 var desc = Object.getOwnPropertyDescriptor(Object.prototype, '__proto__');
 
-verifyNotEnumerable(Object.prototype, '__proto__');
-verifyConfigurable(Object.prototype, '__proto__');
-
 assert.sameValue(desc.value, undefined, '`value` property');
 assert.sameValue(typeof desc.get, 'function', '`get` property');
 assert.sameValue(typeof desc.set, 'function', '`set` property');
+
+verifyProperty(Object.prototype, "__proto__", {
+  enumerable: false,
+  configurable: true
+});

test/annexB/built-ins/Object/prototype/__proto__/set-fn-name.js

@@ -15,12 +15,9 @@ includes: [propertyHelper.js]
 
 var descriptor = Object.getOwnPropertyDescriptor(Object.prototype, '__proto__');
 
-
+verifyProperty(descriptor.set, "name", {
-assert.sameValue(
+  enumerable: false,
-  descriptor.set.name, 'set __proto__',
+  writable: false,
-  'The value of `descriptor.set.name` is `"set __proto__"`'
+  configurable: true,
-);
+  value: "set __proto__"
-
+});
-verifyNotEnumerable(descriptor.set, 'name');
-verifyNotWritable(descriptor.set, 'name');
-verifyConfigurable(descriptor.set, 'name');

test/annexB/built-ins/RegExp/prototype/compile/B.RegExp.prototype.compile.js

@@ -9,6 +9,8 @@ description: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyWritable(RegExp.prototype, "compile");
+verifyProperty(RegExp.prototype, "compile", {
-verifyNotEnumerable(RegExp.prototype, "compile");
+  enumerable: false,
-verifyConfigurable(RegExp.prototype, "compile");
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/RegExp/prototype/compile/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(RegExp.prototype.compile.length, 2);
+verifyProperty(RegExp.prototype.compile, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(RegExp.prototype.compile, "length");
+  writable: false,
-verifyNotWritable(RegExp.prototype.compile, "length");
+  configurable: true,
-verifyConfigurable(RegExp.prototype.compile, "length");
+  value: 2
+});

test/annexB/built-ins/RegExp/prototype/compile/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(RegExp.prototype.compile.name, "compile");
+verifyProperty(RegExp.prototype.compile, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(RegExp.prototype.compile, "name");
+  writable: false,
-verifyNotWritable(RegExp.prototype.compile, "name");
+  configurable: true,
-verifyConfigurable(RegExp.prototype.compile, "name");
+  value: "compile"
+});

test/annexB/built-ins/String/prototype/anchor/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.anchor.length, 1);
+verifyProperty(String.prototype.anchor, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.anchor, "length");
+  writable: false,
-verifyNotWritable(String.prototype.anchor, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.anchor, "length");
+  value: 1
+});

test/annexB/built-ins/String/prototype/anchor/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.anchor.name, "anchor");
+verifyProperty(String.prototype.anchor, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.anchor, "name");
+  writable: false,
-verifyNotWritable(String.prototype.anchor, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.anchor, "name");
+  value: "anchor"
+});

test/annexB/built-ins/String/prototype/anchor/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'anchor');
+verifyProperty(String.prototype, "anchor", {
-verifyWritable(String.prototype, 'anchor');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'anchor');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/big/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.big.length, 0);
+verifyProperty(String.prototype.big, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.big, "length");
+  writable: false,
-verifyNotWritable(String.prototype.big, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.big, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/big/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.big.name, "big");
+verifyProperty(String.prototype.big, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.big, "name");
+  writable: false,
-verifyNotWritable(String.prototype.big, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.big, "name");
+  value: "big"
+});

test/annexB/built-ins/String/prototype/big/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'big');
+verifyProperty(String.prototype, "big", {
-verifyWritable(String.prototype, 'big');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'big');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/blink/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.blink.length, 0);
+verifyProperty(String.prototype.blink, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.blink, "length");
+  writable: false,
-verifyNotWritable(String.prototype.blink, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.blink, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/blink/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.blink.name, "blink");
+verifyProperty(String.prototype.blink, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.blink, "name");
+  writable: false,
-verifyNotWritable(String.prototype.blink, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.blink, "name");
+  value: "blink"
+});

test/annexB/built-ins/String/prototype/blink/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'blink');
+verifyProperty(String.prototype, "blink", {
-verifyWritable(String.prototype, 'blink');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'blink');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/bold/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.bold.length, 0);
+verifyProperty(String.prototype.bold, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.bold, "length");
+  writable: false,
-verifyNotWritable(String.prototype.bold, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.bold, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/bold/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.bold.name, "bold");
+verifyProperty(String.prototype.bold, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.bold, "name");
+  writable: false,
-verifyNotWritable(String.prototype.bold, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.bold, "name");
+  value: "bold"
+});

test/annexB/built-ins/String/prototype/bold/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'bold');
+verifyProperty(String.prototype, "bold", {
-verifyWritable(String.prototype, 'bold');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'bold');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/fixed/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fixed.length, 0);
+verifyProperty(String.prototype.fixed, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fixed, "length");
+  writable: false,
-verifyNotWritable(String.prototype.fixed, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.fixed, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/fixed/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fixed.name, "fixed");
+verifyProperty(String.prototype.fixed, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fixed, "name");
+  writable: false,
-verifyNotWritable(String.prototype.fixed, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.fixed, "name");
+  value: "fixed"
+});

test/annexB/built-ins/String/prototype/fixed/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'fixed');
+verifyProperty(String.prototype, "fixed", {
-verifyWritable(String.prototype, 'fixed');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'fixed');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/fontcolor/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fontcolor.length, 1);
+verifyProperty(String.prototype.fontcolor, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fontcolor, "length");
+  writable: false,
-verifyNotWritable(String.prototype.fontcolor, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.fontcolor, "length");
+  value: 1
+});

test/annexB/built-ins/String/prototype/fontcolor/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fontcolor.name, "fontcolor");
+verifyProperty(String.prototype.fontcolor, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fontcolor, "name");
+  writable: false,
-verifyNotWritable(String.prototype.fontcolor, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.fontcolor, "name");
+  value: "fontcolor"
+});

test/annexB/built-ins/String/prototype/fontcolor/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'fontcolor');
+verifyProperty(String.prototype, "fontcolor", {
-verifyWritable(String.prototype, 'fontcolor');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'fontcolor');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/fontsize/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fontsize.length, 1);
+verifyProperty(String.prototype.fontsize, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fontsize, "length");
+  writable: false,
-verifyNotWritable(String.prototype.fontsize, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.fontsize, "length");
+  value: 1
+});

test/annexB/built-ins/String/prototype/fontsize/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.fontsize.name, "fontsize");
+verifyProperty(String.prototype.fontsize, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.fontsize, "name");
+  writable: false,
-verifyNotWritable(String.prototype.fontsize, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.fontsize, "name");
+  value: "fontsize"
+});

test/annexB/built-ins/String/prototype/fontsize/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'fontsize');
+verifyProperty(String.prototype, "fontsize", {
-verifyWritable(String.prototype, 'fontsize');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'fontsize');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/italics/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.italics.length, 0);
+verifyProperty(String.prototype.italics, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.italics, "length");
+  writable: false,
-verifyNotWritable(String.prototype.italics, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.italics, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/italics/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.italics.name, "italics");
+verifyProperty(String.prototype.italics, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.italics, "name");
+  writable: false,
-verifyNotWritable(String.prototype.italics, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.italics, "name");
+  value: "italics"
+});

test/annexB/built-ins/String/prototype/italics/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'italics');
+verifyProperty(String.prototype, "italics", {
-verifyWritable(String.prototype, 'italics');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'italics');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/link/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.link.length, 1);
+verifyProperty(String.prototype.link, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.link, "length");
+  writable: false,
-verifyNotWritable(String.prototype.link, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.link, "length");
+  value: 1
+});

test/annexB/built-ins/String/prototype/link/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.link.name, "link");
+verifyProperty(String.prototype.link, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.link, "name");
+  writable: false,
-verifyNotWritable(String.prototype.link, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.link, "name");
+  value: "link"
+});

test/annexB/built-ins/String/prototype/link/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'link');
+verifyProperty(String.prototype, "link", {
-verifyWritable(String.prototype, 'link');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'link');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/small/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.small.length, 0);
+verifyProperty(String.prototype.small, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.small, "length");
+  writable: false,
-verifyNotWritable(String.prototype.small, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.small, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/small/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.small.name, "small");
+verifyProperty(String.prototype.small, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.small, "name");
+  writable: false,
-verifyNotWritable(String.prototype.small, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.small, "name");
+  value: "small"
+});

test/annexB/built-ins/String/prototype/small/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'small');
+verifyProperty(String.prototype, "small", {
-verifyWritable(String.prototype, 'small');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'small');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/strike/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.strike.length, 0);
+verifyProperty(String.prototype.strike, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.strike, "length");
+  writable: false,
-verifyNotWritable(String.prototype.strike, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.strike, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/strike/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.strike.name, "strike");
+verifyProperty(String.prototype.strike, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.strike, "name");
+  writable: false,
-verifyNotWritable(String.prototype.strike, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.strike, "name");
+  value: "strike"
+});

test/annexB/built-ins/String/prototype/strike/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'strike');
+verifyProperty(String.prototype, "strike", {
-verifyWritable(String.prototype, 'strike');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'strike');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/sub/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.sub.length, 0);
+verifyProperty(String.prototype.sub, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.sub, "length");
+  writable: false,
-verifyNotWritable(String.prototype.sub, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.sub, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/sub/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.sub.name, "sub");
+verifyProperty(String.prototype.sub, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.sub, "name");
+  writable: false,
-verifyNotWritable(String.prototype.sub, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.sub, "name");
+  value: "sub"
+});

test/annexB/built-ins/String/prototype/sub/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'sub');
+verifyProperty(String.prototype, "sub", {
-verifyWritable(String.prototype, 'sub');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'sub');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/substr/B.2.3.js

@@ -9,6 +9,8 @@ description: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyWritable(String.prototype, "substr");
+verifyProperty(String.prototype, "substr", {
-verifyNotEnumerable(String.prototype, "substr");
+  enumerable: false,
-verifyConfigurable(String.prototype, "substr");
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/String/prototype/substr/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.substr.length, 2);
+verifyProperty(String.prototype.substr, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.substr, "length");
+  writable: false,
-verifyNotWritable(String.prototype.substr, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.substr, "length");
+  value: 2
+});

test/annexB/built-ins/String/prototype/substr/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.substr.name, "substr");
+verifyProperty(String.prototype.substr, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.substr, "name");
+  writable: false,
-verifyNotWritable(String.prototype.substr, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.substr, "name");
+  value: "substr"
+});

test/annexB/built-ins/String/prototype/sup/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.sup.length, 0);
+verifyProperty(String.prototype.sup, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.sup, "length");
+  writable: false,
-verifyNotWritable(String.prototype.sup, "length");
+  configurable: true,
-verifyConfigurable(String.prototype.sup, "length");
+  value: 0
+});

test/annexB/built-ins/String/prototype/sup/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(String.prototype.sup.name, "sup");
+verifyProperty(String.prototype.sup, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(String.prototype.sup, "name");
+  writable: false,
-verifyNotWritable(String.prototype.sup, "name");
+  configurable: true,
-verifyConfigurable(String.prototype.sup, "name");
+  value: "sup"
+});

test/annexB/built-ins/String/prototype/sup/prop-desc.js

@@ -11,6 +11,8 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-verifyNotEnumerable(String.prototype, 'sup');
+verifyProperty(String.prototype, "sup", {
-verifyWritable(String.prototype, 'sup');
+  enumerable: false,
-verifyConfigurable(String.prototype, 'sup');
+  writable: true,
+  configurable: true
+});

test/annexB/built-ins/escape/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(escape.length, 1);
+verifyProperty(escape, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(escape, "length");
+  writable: false,
-verifyNotWritable(escape, "length");
+  configurable: true,
-verifyConfigurable(escape, "length");
+  value: 1
+});

test/annexB/built-ins/escape/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(escape.name, "escape");
+verifyProperty(escape, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(escape, "name");
+  writable: false,
-verifyNotWritable(escape, "name");
+  configurable: true,
-verifyConfigurable(escape, "name");
+  value: "escape"
+});

test/annexB/built-ins/unescape/length.js

@@ -22,8 +22,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(unescape.length, 1);
+verifyProperty(unescape, "length", {
-
+  enumerable: false,
-verifyNotEnumerable(unescape, "length");
+  writable: false,
-verifyNotWritable(unescape, "length");
+  configurable: true,
-verifyConfigurable(unescape, "length");
+  value: 1
+});

test/annexB/built-ins/unescape/name.js

@@ -19,8 +19,9 @@ info: >
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(unescape.name, "unescape");
+verifyProperty(unescape, "name", {
-
+  enumerable: false,
-verifyNotEnumerable(unescape, "name");
+  writable: false,
-verifyNotWritable(unescape, "name");
+  configurable: true,
-verifyConfigurable(unescape, "name");
+  value: "unescape"
+});