diff options
author | Leo Balter <leonardo.balter@gmail.com> | 2017-09-07 16:50:20 -0400 |
---|---|---|
committer | Rick Waldron <waldron.rick@gmail.com> | 2017-09-08 10:13:36 -0400 |
commit | 31f7b3e21874f497e49cb704c414c56f3f438860 (patch) | |
tree | e849364e226cf3a7839942b5361961f68eb825d7 /src/dstr-assignment | |
parent | 74cfdfcca33b217c6a16789ab3df4468629c00c1 (diff) | |
download | qtdeclarative-testsuites-31f7b3e21874f497e49cb704c414c56f3f438860.tar.gz |
Update test generation files to use verifyProperty instead of legacy helpers
Diffstat (limited to 'src/dstr-assignment')
20 files changed, 137 insertions, 96 deletions
diff --git a/src/dstr-assignment/array-elem-init-fn-name-arrow.case b/src/dstr-assignment/array-elem-init-fn-name-arrow.case index 75d60e512..8f50bfbce 100644 --- a/src/dstr-assignment/array-elem-init-fn-name-arrow.case +++ b/src/dstr-assignment/array-elem-init-fn-name-arrow.case @@ -26,7 +26,9 @@ var arrow; //- vals [] //- body -assert.sameValue(arrow.name, 'arrow'); -verifyNotEnumerable(arrow, 'name'); -verifyNotWritable(arrow, 'name'); -verifyConfigurable(arrow, 'name'); +verifyProperty(arrow, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'arrow' +}); diff --git a/src/dstr-assignment/array-elem-init-fn-name-class.case b/src/dstr-assignment/array-elem-init-fn-name-class.case index 3317c8c0b..5d4dd8d5b 100644 --- a/src/dstr-assignment/array-elem-init-fn-name-class.case +++ b/src/dstr-assignment/array-elem-init-fn-name-class.case @@ -30,7 +30,9 @@ var xCls, cls, xCls2; assert(xCls.name !== 'xCls'); assert(xCls2.name !== 'xCls2'); -assert.sameValue(cls.name, 'cls'); -verifyNotEnumerable(cls, 'name'); -verifyNotWritable(cls, 'name'); -verifyConfigurable(cls, 'name'); +verifyProperty(cls, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cls' +}); diff --git a/src/dstr-assignment/array-elem-init-fn-name-cover.case b/src/dstr-assignment/array-elem-init-fn-name-cover.case index 43cb36948..787b9313a 100644 --- a/src/dstr-assignment/array-elem-init-fn-name-cover.case +++ b/src/dstr-assignment/array-elem-init-fn-name-cover.case @@ -29,7 +29,9 @@ var xCover, cover; //- body assert(xCover.name !== 'xCover'); -assert.sameValue(cover.name, 'cover'); -verifyNotEnumerable(cover, 'name'); -verifyNotWritable(cover, 'name'); -verifyConfigurable(cover, 'name'); +verifyProperty(cover, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cover' +}); diff --git a/src/dstr-assignment/array-elem-init-fn-name-fn.case b/src/dstr-assignment/array-elem-init-fn-name-fn.case index 4493b8e04..f62bf6a93 100644 --- a/src/dstr-assignment/array-elem-init-fn-name-fn.case +++ b/src/dstr-assignment/array-elem-init-fn-name-fn.case @@ -29,7 +29,9 @@ var xFn, fn; //- body assert(xFn.name !== 'xFn'); -assert.sameValue(fn.name, 'fn'); -verifyNotEnumerable(fn, 'name'); -verifyNotWritable(fn, 'name'); -verifyConfigurable(fn, 'name'); +verifyProperty(fn, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'fn' +}); diff --git a/src/dstr-assignment/array-elem-init-fn-name-gen.case b/src/dstr-assignment/array-elem-init-fn-name-gen.case index fea3bbaa2..1a5b9ec7a 100644 --- a/src/dstr-assignment/array-elem-init-fn-name-gen.case +++ b/src/dstr-assignment/array-elem-init-fn-name-gen.case @@ -29,7 +29,9 @@ var xGen, gen; //- body assert.notSameValue(xGen.name, 'xGen'); -assert.sameValue(gen.name, 'gen'); -verifyNotEnumerable(gen, 'name'); -verifyNotWritable(gen, 'name'); -verifyConfigurable(gen, 'name'); +verifyProperty(gen, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'gen' +}); diff --git a/src/dstr-assignment/obj-id-init-fn-name-arrow.case b/src/dstr-assignment/obj-id-init-fn-name-arrow.case index ba923bacb..87646f89f 100644 --- a/src/dstr-assignment/obj-id-init-fn-name-arrow.case +++ b/src/dstr-assignment/obj-id-init-fn-name-arrow.case @@ -25,7 +25,9 @@ var arrow; //- vals {} //- body -assert.sameValue(arrow.name, 'arrow'); -verifyNotEnumerable(arrow, 'name'); -verifyNotWritable(arrow, 'name'); -verifyConfigurable(arrow, 'name'); +verifyProperty(arrow, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'arrow' +}); diff --git a/src/dstr-assignment/obj-id-init-fn-name-class.case b/src/dstr-assignment/obj-id-init-fn-name-class.case index f76aa2ee1..dc54f45bc 100644 --- a/src/dstr-assignment/obj-id-init-fn-name-class.case +++ b/src/dstr-assignment/obj-id-init-fn-name-class.case @@ -29,7 +29,9 @@ var xCls, cls, xCls2; assert.notSameValue(xCls.name, 'xCls'); assert.notSameValue(xCls2.name, 'xCls2'); -assert.sameValue(cls.name, 'cls'); -verifyNotEnumerable(cls, 'name'); -verifyNotWritable(cls, 'name'); -verifyConfigurable(cls, 'name'); +verifyProperty(cls, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cls' +}); diff --git a/src/dstr-assignment/obj-id-init-fn-name-cover.case b/src/dstr-assignment/obj-id-init-fn-name-cover.case index b0d92b229..f5530024a 100644 --- a/src/dstr-assignment/obj-id-init-fn-name-cover.case +++ b/src/dstr-assignment/obj-id-init-fn-name-cover.case @@ -28,7 +28,9 @@ var xCover, cover; //- body assert.notSameValue(xCover.name, 'xCover'); -assert.sameValue(cover.name, 'cover'); -verifyNotEnumerable(cover, 'name'); -verifyNotWritable(cover, 'name'); -verifyConfigurable(cover, 'name'); +verifyProperty(cover, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cover' +}); diff --git a/src/dstr-assignment/obj-id-init-fn-name-fn.case b/src/dstr-assignment/obj-id-init-fn-name-fn.case index 28729746a..0d6ec1378 100644 --- a/src/dstr-assignment/obj-id-init-fn-name-fn.case +++ b/src/dstr-assignment/obj-id-init-fn-name-fn.case @@ -27,7 +27,9 @@ var xFn, fn; //- body assert.notSameValue(xFn.name, 'xFn'); -assert.sameValue(fn.name, 'fn'); -verifyNotEnumerable(fn, 'name'); -verifyNotWritable(fn, 'name'); -verifyConfigurable(fn, 'name'); +verifyProperty(fn, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'fn' +}); diff --git a/src/dstr-assignment/obj-id-init-fn-name-gen.case b/src/dstr-assignment/obj-id-init-fn-name-gen.case index 712672024..bbb3cf901 100644 --- a/src/dstr-assignment/obj-id-init-fn-name-gen.case +++ b/src/dstr-assignment/obj-id-init-fn-name-gen.case @@ -28,7 +28,9 @@ var xGen, gen; //- body assert.notSameValue(xGen.name, 'xGen'); -assert.sameValue(gen.name, 'gen'); -verifyNotEnumerable(gen, 'name'); -verifyNotWritable(gen, 'name'); -verifyConfigurable(gen, 'name'); +verifyProperty(gen, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'gen' +}); diff --git a/src/dstr-assignment/obj-prop-elem-init-fn-name-arrow.case b/src/dstr-assignment/obj-prop-elem-init-fn-name-arrow.case index 3cfff7b2a..70c7574c7 100644 --- a/src/dstr-assignment/obj-prop-elem-init-fn-name-arrow.case +++ b/src/dstr-assignment/obj-prop-elem-init-fn-name-arrow.case @@ -26,7 +26,9 @@ var arrow; //- vals {} //- body -assert.sameValue(arrow.name, 'arrow'); -verifyNotEnumerable(arrow, 'name'); -verifyNotWritable(arrow, 'name'); -verifyConfigurable(arrow, 'name'); +verifyProperty(arrow, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'arrow' +}); diff --git a/src/dstr-assignment/obj-prop-elem-init-fn-name-class.case b/src/dstr-assignment/obj-prop-elem-init-fn-name-class.case index 86f60afc0..e8a5e9540 100644 --- a/src/dstr-assignment/obj-prop-elem-init-fn-name-class.case +++ b/src/dstr-assignment/obj-prop-elem-init-fn-name-class.case @@ -30,7 +30,9 @@ var xCls, cls, xCls2; assert.notSameValue(xCls.name, 'xCls'); assert.notSameValue(xCls2.name, 'xCls2'); -assert.sameValue(cls.name, 'cls'); -verifyNotEnumerable(cls, 'name'); -verifyNotWritable(cls, 'name'); -verifyConfigurable(cls, 'name'); +verifyProperty(cls, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cls' +}); diff --git a/src/dstr-assignment/obj-prop-elem-init-fn-name-cover.case b/src/dstr-assignment/obj-prop-elem-init-fn-name-cover.case index 6e6afc489..0d1867f6b 100644 --- a/src/dstr-assignment/obj-prop-elem-init-fn-name-cover.case +++ b/src/dstr-assignment/obj-prop-elem-init-fn-name-cover.case @@ -29,7 +29,9 @@ var xCover, cover; //- body assert.notSameValue(xCover.name, 'xCover'); -assert.sameValue(cover.name, 'cover'); -verifyNotEnumerable(cover, 'name'); -verifyNotWritable(cover, 'name'); -verifyConfigurable(cover, 'name'); +verifyProperty(cover, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'cover' +}); diff --git a/src/dstr-assignment/obj-prop-elem-init-fn-name-fn.case b/src/dstr-assignment/obj-prop-elem-init-fn-name-fn.case index 7a2290ac6..f5c133341 100644 --- a/src/dstr-assignment/obj-prop-elem-init-fn-name-fn.case +++ b/src/dstr-assignment/obj-prop-elem-init-fn-name-fn.case @@ -28,7 +28,9 @@ var xFn, fn; //- body assert.notSameValue(xFn.name, 'xFn'); -assert.sameValue(fn.name, 'fn'); -verifyNotEnumerable(fn, 'name'); -verifyNotWritable(fn, 'name'); -verifyConfigurable(fn, 'name'); +verifyProperty(fn, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'fn' +}); diff --git a/src/dstr-assignment/obj-prop-elem-init-fn-name-gen.case b/src/dstr-assignment/obj-prop-elem-init-fn-name-gen.case index 292e8c615..e4e8702d0 100644 --- a/src/dstr-assignment/obj-prop-elem-init-fn-name-gen.case +++ b/src/dstr-assignment/obj-prop-elem-init-fn-name-gen.case @@ -29,7 +29,9 @@ var xGen, gen; //- body assert.notSameValue(xGen.name, 'xGen'); -assert.sameValue(gen.name, 'gen'); -verifyNotEnumerable(gen, 'name'); -verifyNotWritable(gen, 'name'); -verifyConfigurable(gen, 'name'); +verifyProperty(gen, 'name', { + enumerable: false, + writable: false, + configurable: true, + value: 'gen' +}); diff --git a/src/dstr-assignment/obj-rest-descriptors.case b/src/dstr-assignment/obj-rest-descriptors.case index 780f895ab..6d13c4ef3 100644 --- a/src/dstr-assignment/obj-rest-descriptors.case +++ b/src/dstr-assignment/obj-rest-descriptors.case @@ -21,14 +21,17 @@ Object.defineProperty(obj, "b", { value: 4, writable: false, enumerable: true }) //- vals obj //- body -assert.sameValue(rest.a, 3); -assert.sameValue(rest.b, 4); +verifyProperty(rest, "a", { + enumerable: true, + writable: true, + configurable: true, + value: 3 +}); -verifyEnumerable(rest, "a"); -verifyWritable(rest, "a"); -verifyConfigurable(rest, "a"); - -verifyEnumerable(rest, "b"); -verifyWritable(rest, "b"); -verifyConfigurable(rest, "b"); +verifyProperty(rest, "b", { + enumerable: true, + writable: true, + configurable: true, + value: 4 +}); diff --git a/src/dstr-assignment/obj-rest-getter.case b/src/dstr-assignment/obj-rest-getter.case index 5dd66039d..8d2db4b35 100644 --- a/src/dstr-assignment/obj-rest-getter.case +++ b/src/dstr-assignment/obj-rest-getter.case @@ -18,10 +18,11 @@ var count = 0; //- vals { get v() { count++; return 2; } } //- body -assert.sameValue(x.v, 2); assert.sameValue(count, 1); -verifyEnumerable(x, "v"); -verifyWritable(x, "v"); -verifyConfigurable(x, "v"); - +verifyProperty(x, "v", { + enumerable: true, + writable: true, + configurable: true, + value: 2 +}); diff --git a/src/dstr-assignment/obj-rest-skip-non-enumerable.case b/src/dstr-assignment/obj-rest-skip-non-enumerable.case index 4acaaca66..79a2ba56f 100644 --- a/src/dstr-assignment/obj-rest-skip-non-enumerable.case +++ b/src/dstr-assignment/obj-rest-skip-non-enumerable.case @@ -19,15 +19,18 @@ Object.defineProperty(obj, "x", { value: 4, enumerable: false }); //- vals obj //- body -assert.sameValue(rest.a, 3); -assert.sameValue(rest.b, 4); assert.sameValue(Object.getOwnPropertyDescriptor(rest, "x"), undefined); -verifyEnumerable(rest, "a"); -verifyWritable(rest, "a"); -verifyConfigurable(rest, "a"); - -verifyEnumerable(rest, "b"); -verifyWritable(rest, "b"); -verifyConfigurable(rest, "b"); +verifyProperty(rest, "a", { + enumerable: true, + writable: true, + configurable: true, + value: 3 +}); +verifyProperty(rest, "b", { + enumerable: true, + writable: true, + configurable: true, + value: 4 +}); diff --git a/src/dstr-assignment/obj-rest-to-property.case b/src/dstr-assignment/obj-rest-to-property.case index c8f6de663..3cfc221b6 100644 --- a/src/dstr-assignment/obj-rest-to-property.case +++ b/src/dstr-assignment/obj-rest-to-property.case @@ -21,7 +21,8 @@ var src = {}; assert.sameValue(src.y.x, 1); assert.sameValue(src.y.y, 2); -verifyEnumerable(src, "y"); -verifyWritable(src, "y"); -verifyConfigurable(src, "y"); - +verifyProperty(src, "y", { + enumerable: true, + writable: true, + configurable: true +}); diff --git a/src/dstr-assignment/obj-rest-valid-object.case b/src/dstr-assignment/obj-rest-valid-object.case index c875c3162..57cc34c09 100644 --- a/src/dstr-assignment/obj-rest-valid-object.case +++ b/src/dstr-assignment/obj-rest-valid-object.case @@ -18,16 +18,19 @@ var rest, a, b; //- vals {x: 1, y: 2, a: 5, b: 3} //- body -assert.sameValue(rest.x, 1); -assert.sameValue(rest.y, 2); assert.sameValue(rest.a, undefined); assert.sameValue(rest.b, undefined); -verifyEnumerable(rest, "x"); -verifyWritable(rest, "x"); -verifyConfigurable(rest, "x"); - -verifyEnumerable(rest, "y"); -verifyWritable(rest, "y"); -verifyConfigurable(rest, "y"); +verifyProperty(rest, "x", { + enumerable: true, + writable: true, + configurable: true, + value: 1 +}); +verifyProperty(rest, "y", { + enumerable: true, + writable: true, + configurable: true, + value: 2 +}); |