From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- .../Object/defineProperties/15.2.3.7-5-b-138.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-139.js | 4 ++- .../Object/defineProperties/15.2.3.7-5-b-140.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-141.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-142.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-143.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-144.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-146.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-147.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-148.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-149.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-150.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-151.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-152.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-153.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-154.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-155.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-156.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-157.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-158.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-159.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-160.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-161.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-163.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-164.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-165.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-167.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-168.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-169.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-170.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-171.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-174.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-60.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-63.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-64.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-67.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-68.js | 6 ++--- .../Object/defineProperties/15.2.3.7-5-b-69.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-70.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-71.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-85.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-86.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-88.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-89.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-90.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-91.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-92.js | 5 ++-- .../Object/defineProperties/15.2.3.7-5-b-95.js | 5 ++-- .../Object/defineProperties/15.2.3.7-6-a-100.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-101.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-102.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-103.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-104.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-105.js | 20 +++++--------- .../Object/defineProperties/15.2.3.7-6-a-106.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-107.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-108.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-109.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-110.js | 18 +++++++------ .../Object/defineProperties/15.2.3.7-6-a-114-b.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-114.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-115.js | 9 ++++--- .../Object/defineProperties/15.2.3.7-6-a-12.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-120.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-13.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-14.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-15.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-16.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-163.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-164.js | 7 +++-- .../Object/defineProperties/15.2.3.7-6-a-176.js | 15 +++++++---- .../Object/defineProperties/15.2.3.7-6-a-177.js | 7 +++-- .../Object/defineProperties/15.2.3.7-6-a-18.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-19.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-195.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-197.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-199.js | 6 ++--- .../Object/defineProperties/15.2.3.7-6-a-2.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-200.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-202.js | 19 ++++--------- .../Object/defineProperties/15.2.3.7-6-a-204.js | 4 ++- .../Object/defineProperties/15.2.3.7-6-a-205.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-206.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-207.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-208.js | 14 +++++----- .../Object/defineProperties/15.2.3.7-6-a-209.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-21.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-210.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-211.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-212.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-213.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-214.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-215.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-216.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-217.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-218.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-219.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-220.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-221.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-222.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-223.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-224.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-225.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-226.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-227.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-228.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-229.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-230.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-231.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-232.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-233.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-234.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-235.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-236.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-237.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-238.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-239.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-24.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-240.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-241.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-242.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-243.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-244.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-245.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-246.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-247.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-248.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-249.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-250.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-251.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-252.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-253.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-254.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-255.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-256.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-257.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-258.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-259.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-260.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-261.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-262.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-266.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-267.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-268.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-269.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-270.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-271.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-272.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-273.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-274.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-275.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-276.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-277.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-278.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-279.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-28.js | 13 +++------ .../Object/defineProperties/15.2.3.7-6-a-281.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-282.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-283.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-284.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-285.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-288.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-289.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-290.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-291.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-292.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-293.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-294.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-295.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-296.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-297.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-298.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-299.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-30.js | 13 +++------ .../Object/defineProperties/15.2.3.7-6-a-300.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-301.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-302.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-303.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-304.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-305.js | 13 +++++---- .../Object/defineProperties/15.2.3.7-6-a-306.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-307.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-308.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-309.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-31.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-310.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-311.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-312.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-313.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-33.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-35.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-36.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-37.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-38-1.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-38.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-39.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-40.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-41.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-42.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-43.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-44.js | 8 +++--- .../Object/defineProperties/15.2.3.7-6-a-45.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-46.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-47.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-48.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-49.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-5.js | 14 +++++----- .../Object/defineProperties/15.2.3.7-6-a-50.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-51.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-52.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-53.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-54.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-55.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-56.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-57.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-58.js | 21 +++++---------- .../Object/defineProperties/15.2.3.7-6-a-59.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-60.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-61.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-62.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-63.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-64.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-65.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-66-1.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-66.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-67.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-68.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-69.js | 21 +++++---------- .../Object/defineProperties/15.2.3.7-6-a-70.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-71.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-72.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-73.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-74.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-75.js | 8 +++--- .../Object/defineProperties/15.2.3.7-6-a-76.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-77.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-78.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-79.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-80.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-81.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-82.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-83.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-84-1.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-84.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-85.js | 16 +++++------ .../Object/defineProperties/15.2.3.7-6-a-86-1.js | 14 +++++----- .../Object/defineProperties/15.2.3.7-6-a-86.js | 6 +++-- .../Object/defineProperties/15.2.3.7-6-a-87.js | 14 +++++----- .../Object/defineProperties/15.2.3.7-6-a-88.js | 20 +++++++------- .../Object/defineProperties/15.2.3.7-6-a-89.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-90.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-91.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-92.js | 10 +++---- .../Object/defineProperties/15.2.3.7-6-a-93-1.js | 30 ++++++++++----------- .../Object/defineProperties/15.2.3.7-6-a-93-2.js | 30 ++++++++++----------- .../Object/defineProperties/15.2.3.7-6-a-93-3.js | 31 ++++++++++------------ .../Object/defineProperties/15.2.3.7-6-a-93-4.js | 30 ++++++++++----------- .../Object/defineProperties/15.2.3.7-6-a-93.js | 7 ++--- .../Object/defineProperties/15.2.3.7-6-a-94.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-95.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-96.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-97.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-98.js | 12 ++++----- .../Object/defineProperties/15.2.3.7-6-a-99.js | 12 ++++----- .../built-ins/Object/defineProperties/name.js | 11 ++++---- .../Object/defineProperties/not-a-constructor.js | 2 +- 266 files changed, 1409 insertions(+), 1453 deletions(-) (limited to 'js/src/tests/test262/built-ins/Object/defineProperties') diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js index 1ca3793d7b..65fada01d7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js index f73e256111..a0522ec731 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js @@ -17,6 +17,8 @@ Object.defineProperties(obj, { } }); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js index 5e059a4a76..bc0aaee31f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js index da71de2a5e..9be76bcecf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js @@ -24,7 +24,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js index 226a32e614..7f68e3a3d3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js @@ -27,7 +27,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js index 0336ed473b..e22d52d4f8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js @@ -35,7 +35,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js index 1fc7a18431..db1f2541fd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js @@ -23,7 +23,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js index 4cd423d4aa..c1bfdc8238 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js @@ -31,7 +31,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js index 8d1b4a1b50..a6a0dc8021 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js @@ -35,7 +35,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js index 63cb98e814..393b64d1bf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js @@ -21,7 +21,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js index 1c2556cbc8..069f8267ce 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js @@ -33,7 +33,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js index 4c4b1717dc..dd4c0627c2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js @@ -27,7 +27,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js index 65c386d29e..52b27802bb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js @@ -22,7 +22,8 @@ Object.defineProperties(obj, { property: func }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js index 8c48fb76e7..9f41fd0f16 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: arr }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js index bb53c4479c..8350b76d13 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: str }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js index 9169fecaa5..f525efe3bc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js index 9e00beb444..4c9fc79514 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js index 2ecb58c0ff..32f35ad65a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js @@ -19,7 +19,8 @@ Object.defineProperties(obj, { property: Math }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js index f59bf901cf..2f8b893640 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js index 3dfaede9c5..d496fb8c3f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js index 8aa6779cc4..0caea972f3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js @@ -18,7 +18,8 @@ Object.defineProperties(obj, { property: JSON }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js index 5b32ddb731..4c25c2e3f8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js index 1b952cf469..b716822825 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js @@ -19,8 +19,9 @@ var func = function(a, b) { property: arguments }); - assert(obj.hasOwnProperty("property")); - verifyNotWritable(obj, "property"); + verifyProperty(obj, "property", { + writable: false, + }); }; func(); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js index 16940fe042..0592cacc01 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js @@ -19,7 +19,8 @@ Object.defineProperties(obj, { property: this }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js index 46ee75a0b4..e02de2a1c8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js index 4c84d6a35f..88f2995544 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js index 93001e24f6..edcadba7ad 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js index 59e2d01fe4..e7e798f730 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js index 1482e22d29..b0f1b30c4a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js index 44fcd2d56f..8027fce780 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js index 5a4d2a2dda..b77bbe2b3d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js index d018248861..dbadab16b2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js index a213b737e8..3764293f9b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js @@ -16,7 +16,8 @@ Object.defineProperties(obj, { prop: {} }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js index 3564a3c259..fcf969e5eb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js @@ -28,7 +28,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js index 895a3897ef..f3dd14d728 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js @@ -31,7 +31,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js index b9abacb080..513a5bdd5f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js @@ -30,7 +30,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js index bc74560e09..53d33da07e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js @@ -33,8 +33,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js index baa2e16a9c..d2f6ee592e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js @@ -20,7 +20,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js index ef2e2468f2..5a354476bb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js @@ -31,7 +31,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js index b0915952d0..a610b091ca 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js @@ -25,7 +25,8 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js index 4417c630c6..94c392693d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js index 2745ab8dc5..a856931390 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js index 461bc8e7eb..c7f4adced9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js index 79c808f491..be36e00228 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js index 198d61ea03..ccb64939b7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js index 701fe1df53..40b32a4e38 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js index b7997b1714..cda32f5710 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js index db02d8a4c9..277eea621a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js @@ -17,7 +17,8 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js index 47bc46e287..dfe8e37455 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js @@ -25,12 +25,12 @@ Object.defineProperties(obj, { configurable: false } }); -verifyEqualTo(obj, "foo", 200); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js index 462fb436d4..a0292d8c7f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js @@ -41,8 +41,9 @@ verifyEqualTo(obj, "foo", get_func2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js index a52e3b7580..6691b4e82e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js @@ -34,8 +34,9 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js index 69239b2647..6963afe790 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js @@ -36,8 +36,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js index 9723898ac6..75e893ec15 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js @@ -41,8 +41,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js index e8557c7375..5e04bee2d5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js @@ -6,6 +6,7 @@ es5id: 15.2.3.7-6-a-105 description: > Object.defineProperties - 'P' is accessor property, P.[[Set]] is present and properties.[[Set]] is undefined (8.12.9 step 12) +includes: [propertyHelper.js] ---*/ var obj = {}; @@ -31,7 +32,6 @@ Object.defineProperties(obj, { } }); -var hasProperty = obj.hasOwnProperty("property"); var verifyGet = false; verifyGet = (obj.property === 10); @@ -39,21 +39,13 @@ var verifySet = false; var desc = Object.getOwnPropertyDescriptor(obj, "property"); verifySet = (typeof desc.set === 'undefined'); -var verifyEnumerable = false; -for (var p in obj) { - if (p === "property") { - verifyEnumerable = true; - } -} - -var verifyConfigurable = false; -delete obj.property; -verifyConfigurable = obj.hasOwnProperty("property"); +verifyProperty(obj, "property", { + enumerable: true, + configurable: true, +}); -assert(hasProperty, 'hasProperty !== true'); assert(verifyGet, 'verifyGet !== true'); assert(verifySet, 'verifySet !== true'); -assert(verifyEnumerable, 'verifyEnumerable !== true'); -assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js index 67cf09ee28..fff80e4e60 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js @@ -36,8 +36,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js index 87f7990aaa..95f6f95731 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js @@ -36,8 +36,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js index cf434bfbd8..63f1b17621 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js @@ -36,8 +36,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js index 021bf58825..ccce309d3b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js @@ -44,8 +44,9 @@ verifyEqualTo(obj, "foo", get_func2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js index 1dca6bcb2f..71a658e156 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js @@ -36,19 +36,21 @@ var properties = { }; Object.defineProperties(obj, properties); -verifyEqualTo(obj, "foo1", 200); -verifyWritable(obj, "foo1"); +verifyProperty(obj, "foo1", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); -verifyEnumerable(obj, "foo1"); - -verifyConfigurable(obj, "foo1"); verifyEqualTo(obj, "foo2", get_func()); verifyWritable(obj, "foo2", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo2"); - -verifyConfigurable(obj, "foo2"); +verifyProperty(obj, "foo2", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js index dd6222e964..fe50a5bf47 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js @@ -24,8 +24,9 @@ verifyEqualTo(arr, "length", 0); verifyWritable(arr, "length", "length", 1); -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js index 2afb374774..d11ce306db 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js @@ -26,8 +26,9 @@ verifyEqualTo(arr, "length", 2); verifyWritable(arr, "length", "length", 5); -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js index 239ba3bb3e..7bd6e47c8d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js @@ -24,10 +24,11 @@ Object.defineProperties(arr, { assert.sameValue(arr.length, 0); arr.length = 2; -assert.sameValue(arr.length, 2); -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + value: 2, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js index 0c195e5e0d..323e2e3f49 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(fun, "prop", 11); - - verifyNotWritable(fun, "prop"); - - verifyNotEnumerable(fun, "prop"); - - verifyNotConfigurable(fun, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(fun, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js index 4704109b46..0b7585f683 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js @@ -19,12 +19,11 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "length", 0); - -verifyNotWritable(arr, "length"); - -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js index be22cb8d81..daf0c3e4ec 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "prop", 11); - - verifyNotWritable(arr, "prop"); - - verifyNotEnumerable(arr, "prop"); - - verifyNotConfigurable(arr, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js index 3ecd73ab51..3de547f1e7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(str, "prop", 11); - - verifyNotWritable(str, "prop"); - - verifyNotEnumerable(str, "prop"); - - verifyNotConfigurable(str, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(str, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js index a86aaa2ec5..ede416b548 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", 11); - - verifyNotWritable(obj, "prop"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js index e78dcaa3e2..1e72361437 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", 11); - - verifyNotWritable(obj, "prop"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js index cbe3a65ff3..7359782f32 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js @@ -24,10 +24,12 @@ Object.defineProperties(arr, { }); //try to overwrite length value of arr -verifyNotWritable(arr, "length") +verifyProperty(arr, "length", { + value: 1, + writable: false, +}); assert(!arr.hasOwnProperty("1")); -assert.sameValue(arr.length, 1); assert.sameValue(arr[0], 0); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js index f699551ca6..f7bd847919 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js @@ -31,8 +31,11 @@ try { throw new Test262Error("expected to throw TypeError") } catch (e) { assert(e instanceof TypeError); - assert.sameValue(arr.length, 2); - verifyNotWritable(arr, "length"); } +verifyProperty(arr, "length", { + value: 2, + writable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js index 7117baebef..cbcebe0b84 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js @@ -31,11 +31,16 @@ try { throw new Test262Error("Expected to throw TypeError"); } catch (e) { assert(e instanceof TypeError); - assert(arr.hasOwnProperty("1")); - verifyNotWritable(arr, "length"); - assert.sameValue(arr[0], 0); - assert.sameValue(arr[1], 1); - assert.sameValue(arr.length, 2) } +assert(arr.hasOwnProperty("1")); + +verifyProperty(arr, "length", { + value: 2, + writable: false, +}); + +assert.sameValue(arr[0], 0); +assert.sameValue(arr[1], 1); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js index 1ebd1320be..5bcbd47137 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js @@ -24,8 +24,11 @@ Object.defineProperties(arr, { }); assert(!arr.hasOwnProperty("1")); -assert.sameValue(arr.length, 0); assert(!arr.hasOwnProperty("0")); -verifyNotWritable(arr, "length"); + +verifyProperty(arr, "length", { + value: 0, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js index fcd1e5d0d7..0c037c61f7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", 11); - - verifyNotWritable(obj, "prop"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js index 9d5111dd19..f4a223d68e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", 11); - - verifyNotWritable(obj, "prop"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js index 46e202818f..7ba221bf61 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js @@ -19,12 +19,11 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "0", undefined); - -verifyNotWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js index c95e92a883..b4b4f90351 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js @@ -24,8 +24,9 @@ Object.defineProperties(arr, { } }); -assert(arr.hasOwnProperty("0")); -verifyNotWritable(arr, "0"); -assert.sameValue(arr[0], 1001); +verifyProperty(arr, "0", { + value: 1001, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js index 5d24369753..97417e1683 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js @@ -24,8 +24,8 @@ Object.defineProperties(arr, { } }); -assert(arr.hasOwnProperty("0")); -verifyNotConfigurable(arr, "0"); -assert(arr.hasOwnProperty("0")); +verifyProperty(arr, "0", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js index 19de43a79c..883e70de76 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js @@ -26,12 +26,11 @@ Object.defineProperties(obj, { } }); -verifyEqualTo(obj, "prop", 12); - -verifyNotWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js index b382c908c7..7c43a21b62 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js @@ -21,12 +21,11 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "0", 1001); - -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js index 6997fab614..8a1c4998e5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js @@ -8,6 +8,7 @@ description: > named property, 'P' property doesn't exist in 'O', test [[Set]] of 'P' property in 'Attributes' is set as undefined value if [[Set]] is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c) +includes: [propertyHelper.js] ---*/ var arr = []; @@ -23,24 +24,14 @@ Object.defineProperties(arr, { } }); -var verifyEnumerable = false; -for (var i in arr) { - if (i === "0" && arr.hasOwnProperty("0")) { - verifyEnumerable = true; - } -} - var desc = Object.getOwnPropertyDescriptor(arr, "0"); -var propertyDefineCorrect = arr.hasOwnProperty("0"); -var verifyConfigurable = false; -delete arr[0]; -verifyConfigurable = arr.hasOwnProperty("0"); +verifyProperty(arr, "0", { + enumerable: true, + configurable: true, +}); assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); -assert(propertyDefineCorrect, 'propertyDefineCorrect !== true'); assert.sameValue(desc.get, getFunc, 'desc.get'); -assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); -assert(verifyEnumerable, 'verifyEnumerable !== true'); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js index ef679dcc11..1cddaa0ff7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js @@ -39,6 +39,8 @@ if (arr.verifySetter !== 101) { throw new Test262Error('Expected arr.verifySetter === 101, actually ' + arr.verifySetter); } -verifyNotConfigurable(arr, 0); +verifyProperty(arr, "0", { + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js index 46d98ea0a0..1ebeaac1f8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js @@ -42,8 +42,9 @@ verifyEqualTo(arr, "0", getFun()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js index a322992ba4..30e0beb774 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js @@ -18,12 +18,12 @@ arr[0] = 101; // default value of attributes: writable: true, configurable: true Object.defineProperties(arr, { "0": {} }); -verifyEqualTo(arr, "0", 101); -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 101, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js index 46d88c42e1..19ab6047b9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js @@ -34,8 +34,9 @@ verifyEqualTo(arr, "0", get_func()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js index 7d7f6ae685..33b1beff19 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js @@ -24,12 +24,12 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "0", 100); - -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js index 48d71fdc94..1935f25ea8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js @@ -38,8 +38,9 @@ verifyEqualTo(arr, "0", get_func()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js index 174de35bac..6f58cf7632 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", 11); - - verifyNotWritable(obj, "prop"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "prop", { + value: 11, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js index 5d74f4dfd0..2809a05d15 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { value: undefined } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js index 163eb6c69f..f1f02085c9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { value: null } }); -verifyEqualTo(arr, "0", null); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js index d6aa9bdf5b..7d32ce4958 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js @@ -22,12 +22,11 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "0", NaN); - -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js index b9bff48f9d..000b189084 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js @@ -24,18 +24,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "0", -0); - - verifyNotWritable(arr, "0"); - - verifyNotEnumerable(arr, "0"); - - verifyNotConfigurable(arr, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "0", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js index 356f64d1bd..934d03d507 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js @@ -24,18 +24,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "0", +0); - - verifyNotWritable(arr, "0"); - - verifyNotEnumerable(arr, "0"); - - verifyNotConfigurable(arr, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "0", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js index ea5c1a2d3f..4cc0c47522 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { value: 101 } }); -verifyEqualTo(arr, "0", 101); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js index b658b05038..bda83e12a4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { value: "abcd" } }); -verifyEqualTo(arr, "0", "abcd"); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js index 94e975a2cb..cf81d69f53 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { value: true } }); -verifyEqualTo(arr, "0", true); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js index 9fefdec9a6..c8998fdd88 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js @@ -27,12 +27,12 @@ var properties = { }; Object.defineProperties(arr, properties); -verifyEqualTo(arr, "0", obj1); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js index 50afb5f2b0..7e53f2f81f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { writable: true } }); -verifyEqualTo(arr, "0", undefined); -verifyWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js index e655774ae2..b6a031738f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { writable: false } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js index f3d107084e..a2ee179aba 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js @@ -28,8 +28,9 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_func()); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js index b9f60bdb8f..eaaf719083 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js @@ -28,8 +28,9 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js index 25c4ab4089..f66435c528 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { enumerable: true } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js index 127f8f89dd..e27cf9f8dd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js @@ -22,12 +22,12 @@ Object.defineProperties(arr, { enumerable: false } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js index 9db9a3514d..ecd4214862 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { configurable: true } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js index 0b839c70e3..783378d959 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { configurable: false } }); -verifyEqualTo(arr, "0", undefined); -verifyNotWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js index 7e0a0eb3b8..2df44c3abe 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js @@ -27,18 +27,16 @@ try { } }); } catch (e) { - verifyEqualTo(arr, "1", 3); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js index ae93f23bb1..66fcadb131 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js @@ -31,18 +31,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", 3); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js index 52eeb0b5ef..08df4167f5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js @@ -35,14 +35,14 @@ try { } catch (e) { verifyWritable(arr, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js index 70c1ebbcab..5b385533ed 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", 3); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js index 77e43c731c..58ab02eb54 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js @@ -27,8 +27,9 @@ Object.defineProperties(arr, { verifyWritable(arr, "1", "setVerifyHelpProp"); -verifyEnumerable(arr, "1"); - -verifyConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js index a8f2187f8c..f585634fa1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js @@ -28,12 +28,11 @@ Object.defineProperties(arr, { } }); -verifyEqualTo(arr, "1", 12); - -verifyNotWritable(arr, "1"); - -verifyNotEnumerable(arr, "1"); - -verifyConfigurable(arr, "1"); +verifyProperty(arr, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js index cc3247a9c7..5aa8ecd912 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js @@ -30,18 +30,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", undefined); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js index 668e02eb0f..15279c0e89 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js @@ -32,18 +32,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", 3); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js index a4becc4796..63526b84e9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", +0); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js index 7a76261002..8ccd912ed0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js @@ -27,18 +27,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", -0); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js index 9914b27c44..5332d11ce9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js @@ -28,18 +28,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", 12); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js index 5928b5b299..5e6177b726 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", "abcd"); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js index e27cf66f6e..a696416afe 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js @@ -28,18 +28,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", true); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js index f57eb5d1db..8b95fea263 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js @@ -24,13 +24,12 @@ Object.defineProperties(this, { } }); -verifyEqualTo(this, "prop", 12); - -verifyWritable(this, "prop"); - -verifyEnumerable(this, "prop"); - -verifyConfigurable(this, "prop"); +verifyProperty(this, "prop", { + value: 12, + writable: true, + enumerable: true, + configurable: true, +}); delete this.prop; diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js index 3e22e8bf14..ce8c4c36a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js @@ -34,18 +34,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "1", obj1); - - verifyNotWritable(arr, "1"); - - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js index 6167a6ee64..17bb7efd40 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js @@ -34,14 +34,14 @@ try { } catch (e) { verifyWritable(arr, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js index a794b04f0d..937341c5a5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js @@ -33,14 +33,14 @@ try { } catch (e) { verifyWritable(arr, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js index 4f8ba301c4..9f1b7a70a2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js @@ -25,8 +25,9 @@ Object.defineProperties(arr, { } }); -verifyNotEnumerable(arr, "1"); - -verifyNotConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js index 12d578b86f..4b7394ea5b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js @@ -36,14 +36,14 @@ try { } catch (e) { verifyEqualTo(arr, "1", get_fun()); - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js index 046fc367f8..bb8670ee80 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyEqualTo(arr, "1", get_fun()); - verifyNotEnumerable(arr, "1"); - - verifyNotConfigurable(arr, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js index f7bd329a1e..193596163a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js @@ -26,8 +26,9 @@ Object.defineProperties(arr, { } }); -verifyNotEnumerable(arr, "1"); - -verifyNotConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js index f597aaf1af..99151a6eb0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { value: 36 } }); -verifyEqualTo(arr, "0", 36); -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 36, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js index 547713544d..a5ec7a2b73 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { value: undefined } }); -verifyEqualTo(arr, "0", undefined); -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js index 36907737c5..8a3179cc5b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { value: 12 } }); -verifyEqualTo(arr, "0", 12); -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 12, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js index f247cfd64b..5332c7076e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { writable: false } }); -verifyEqualTo(arr, "0", 100); -verifyNotWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 100, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js index d8e2e29bf4..1ffc966b9f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { enumerable: false } }); -verifyEqualTo(arr, "0", 12); -verifyWritable(arr, "0"); - -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 12, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js index c74dba3fb4..dea3971ab4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js @@ -19,12 +19,12 @@ Object.defineProperties(arr, { configurable: false } }); -verifyEqualTo(arr, "0", 12); -verifyWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 12, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js index bec2effb09..4ec4199c2a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js @@ -21,12 +21,12 @@ Object.defineProperties(arr, { configurable: false } }); -verifyEqualTo(arr, "0", 36); -verifyNotWritable(arr, "0"); - -verifyEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + value: 36, + writable: false, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js index 5ff7603393..52dfbc2240 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js @@ -32,8 +32,9 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_fun()); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js index ca5c0bb33f..e10cec2a3f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js @@ -26,8 +26,10 @@ Object.defineProperties(arr, { get: undefined } }); -verifyNotEnumerable(arr, "0"); -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js index 5f2eec519b..5578340283 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js @@ -30,8 +30,9 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_fun()); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js index 24ebf36025..6400a30657 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js @@ -30,8 +30,9 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js index 0cb48c5eb7..45d2f9322b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js @@ -24,8 +24,10 @@ Object.defineProperties(arr, { set: undefined } }); -verifyNotEnumerable(arr, "0"); -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js index 0e846489aa..9ea293761b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js @@ -29,8 +29,9 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js index 62e09ab0f2..441fd014bf 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js @@ -30,8 +30,9 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js index 3a4aeaac10..a89d450ef1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js @@ -29,8 +29,9 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js index ee319f6ff2..6ba5bf8bfc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js @@ -41,8 +41,9 @@ verifyEqualTo(arr, "0", get_fun()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js index 689bec9b21..a81edc844e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js @@ -22,13 +22,13 @@ Object.defineProperties(arr, { configurable: true } }); -verifyEqualTo(arr, "property", 12); -verifyWritable(arr, "property"); - -verifyEnumerable(arr, "property"); - -verifyConfigurable(arr, "property"); +verifyProperty(arr, "property", { + value: 12, + writable: true, + enumerable: true, + configurable: true, +}); if (arr.length !== 0) { throw new Test262Error('Expected arr.length === 0, actually ' + arr.length); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js index c81aad2b3f..293f8f33a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js @@ -33,9 +33,10 @@ verifyEqualTo(arr, "property", get_fun()); verifyWritable(arr, "property", "setVerifyHelpProp"); -verifyEnumerable(arr, "property"); - -verifyConfigurable(arr, "property"); +verifyProperty(arr, "property", { + enumerable: true, + configurable: true, +}); if (arr.length !== 0) { throw new Test262Error('Expected arr.length === 0, actually ' + arr.length); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js index 3f27c8552a..6ef189d40f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js @@ -38,8 +38,9 @@ verifyEqualTo(arr, "property", get_fun()); verifyWritable(arr, "property", "verifySetFun"); -verifyNotEnumerable(arr, "property"); - -verifyConfigurable(arr, "property"); +verifyProperty(arr, "property", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js index 217cd5b052..24d9bf430e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js @@ -21,13 +21,13 @@ Object.defineProperties(arr, { configurable: false } }); -verifyEqualTo(arr, "property", 12); -verifyNotWritable(arr, "property"); - -verifyNotEnumerable(arr, "property"); - -verifyNotConfigurable(arr, "property"); +verifyProperty(arr, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); if (arr.length !== 0) { throw new Test262Error('Expected arr.length === 0, actually ' + arr.length); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js index 1fb83b1df8..2750ef8cbd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "property", 12); - - verifyNotWritable(arr, "property"); - - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js index 01af4ede13..9ebe3f3c87 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "property", undefined); - - verifyNotWritable(arr, "property"); - - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js index 1235a3604d..8bff8fee16 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "property", 12); - - verifyNotWritable(arr, "property"); - - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js index 9d8807a77f..0108cff387 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js @@ -26,18 +26,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arr, "property", 12); - - verifyNotWritable(arr, "property"); - - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js index 87b8c4cb9a..0cab0ced4b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js @@ -39,14 +39,14 @@ try { verifyWritable(arr, "property", "verifySetFun"); - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js index 73a3eb6ff6..7a13d69ddc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js @@ -30,14 +30,14 @@ try { } catch (e) { verifyWritable(arr, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js index 4f44eedb27..cc4b257824 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyWritable(arr, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js index 6015feab01..88cd60fb56 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js @@ -32,14 +32,14 @@ try { } catch (e) { verifyWritable(arr, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arr, "property"); - - verifyNotConfigurable(arr, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arr, "property", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js index ee646acae0..380cbf887c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js @@ -30,12 +30,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "0", 10); - -verifyWritable(arg, "0"); - -verifyEnumerable(arg, "0"); - -verifyConfigurable(arg, "0"); +verifyProperty(arg, "0", { + value: 10, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js index 69aff91049..a225f9458f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js @@ -42,8 +42,9 @@ verifyEqualTo(arg, "0", get_func()); verifyWritable(arg, "0", "setVerifyHelpProp"); -verifyEnumerable(arg, "0"); - -verifyConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js index 1b1b00f14b..f46733e9b5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js @@ -18,14 +18,9 @@ Object.defineProperties(obj, { } }); -verifyNotWritable(obj, "prop"); - -if (!obj.hasOwnProperty("prop")) { - throw new Test262Error('Expected obj.hasOwnProperty("prop") to be true, actually ' + obj.hasOwnProperty("prop")); -} - -if (obj.prop !== 1001) { - throw new Test262Error('Expected obj.prop === 1001, actually ' + obj.prop); -} +verifyProperty(obj, "prop", { + value: 1001, + writable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js index 4df7240d9c..87f70353e5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js @@ -27,12 +27,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "0", 20); - -verifyNotWritable(arg, "0"); - -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js index 11d6e36781..10322f5329 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js @@ -34,18 +34,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js index 8ac9b4f704..ccdf040553 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js index 9fed19833a..6a449ac3d9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js index a22f1a59ba..b375ce09a4 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js index a5a2feeecd..bb2843f668 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js @@ -40,14 +40,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func()); - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js index 58daa19af6..b6ce95181d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js @@ -40,14 +40,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func()); - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js index f03e73674a..0b8e42adfe 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js @@ -30,12 +30,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "0", 10); - -verifyNotWritable(arg, "0"); - -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js index 1319ec70c2..db6f500445 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js @@ -42,8 +42,9 @@ verifyEqualTo(arg, "0", get_func()); verifyWritable(arg, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js index a03cfd2060..b46f0bc120 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js @@ -43,8 +43,9 @@ Object.defineProperties(arg, { verifyEqualTo(arg, "0", get_func2()); -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js index 5d9589888b..7267e28935 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js @@ -28,12 +28,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "0", 20); - -verifyNotWritable(arg, "0"); - -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js index e1af163e2b..efa1e26fb6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js @@ -34,18 +34,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js index 995e695b60..e6fc9e9422 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js index d63b6abd7c..ee14307684 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js index 85a07ad038..d647c69fc9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js @@ -35,18 +35,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "0", 0); - - verifyNotWritable(arg, "0"); - - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js index 2bb794f123..82f75ed8d5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js @@ -42,14 +42,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func1()); - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js index 2e59611209..f3cf964f13 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js @@ -43,14 +43,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func()); - verifyNotEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js index bba5d89ff4..580dcaf3da 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js @@ -19,14 +19,9 @@ Object.defineProperties(obj, { } }); -verifyNotConfigurable(obj, "prop"); - -if (!obj.hasOwnProperty("prop")) { - throw new Test262Error('Expected obj.hasOwnProperty("prop") to be true, actually ' + obj.hasOwnProperty("prop")); -} - -if (obj.prop !== 1001) { - throw new Test262Error('Expected obj.prop === 1001, actually ' + obj.prop); -} +verifyProperty(obj, "prop", { + value: 1001, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js index 7c10d4efa7..4eb41d999f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js @@ -39,14 +39,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func()); - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js index 607a3a746d..1dc7c3747d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js @@ -39,14 +39,14 @@ try { } catch (e) { verifyEqualTo(arg, "0", get_func()); - verifyEnumerable(arg, "0"); - - verifyNotConfigurable(arg, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "0", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js index 16f710cd40..3e5bee3cc9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js @@ -24,12 +24,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "genericProperty", 1001); - -verifyWritable(arg, "genericProperty"); - -verifyEnumerable(arg, "genericProperty"); - -verifyConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js index f3f32aab1c..91719ca75f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js @@ -35,8 +35,9 @@ verifyEqualTo(arg, "genericProperty", getFun()); verifyWritable(arg, "genericProperty", "testGetFunction"); -verifyEnumerable(arg, "genericProperty"); - -verifyConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js index e5168c7d84..955fc46f5a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js @@ -46,8 +46,9 @@ verifyEqualTo(arg, "genericProperty", getFun()); verifyWritable(arg, "genericProperty", "testGetFunction"); -verifyNotEnumerable(arg, "genericProperty"); - -verifyNotConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js index 4863298678..2c8528dee0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js @@ -30,12 +30,11 @@ Object.defineProperties(arg, { } }); -verifyEqualTo(arg, "genericProperty", 1002); - -verifyWritable(arg, "genericProperty"); - -verifyNotEnumerable(arg, "genericProperty"); - -verifyNotConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js index 5674c28b7d..7fa55bce0e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js @@ -30,18 +30,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "genericProperty", 1001); - - verifyNotWritable(arg, "genericProperty"); - - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js index f1294cc7e8..7b6840796d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js @@ -29,18 +29,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "genericProperty", undefined); - - verifyNotWritable(arg, "genericProperty"); - - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js index f905ee306c..49be313a95 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js @@ -29,18 +29,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "genericProperty", undefined); - - verifyNotWritable(arg, "genericProperty"); - - verifyEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js index fc7e123d7a..20e70b72df 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js @@ -28,18 +28,16 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arg, "genericProperty", undefined); - - verifyNotWritable(arg, "genericProperty"); - - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js index 3e0d7399be..1cc9e68036 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { configurable: false } }); -verifyEqualTo(obj, "prop", 1002); -verifyNotWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 1002, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js index a62ee445a7..51326cbe7f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js @@ -43,14 +43,14 @@ try { verifyWritable(arg, "genericProperty", "verifySetFun"); - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js index b5fd0b53f7..e43c360b87 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js @@ -36,14 +36,14 @@ try { } catch (e) { verifyWritable(arg, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js index a890c971e3..1612b14adb 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js @@ -35,14 +35,14 @@ try { } catch (e) { verifyWritable(arg, "genericProperty", "genericPropertyString"); - verifyEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js index 8a0992330e..aa51e97ee2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js @@ -34,14 +34,14 @@ try { } catch (e) { verifyWritable(arg, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arg, "genericProperty"); - - verifyNotConfigurable(arg, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(arg, "genericProperty", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js index c1c992a90d..25c528e02d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js @@ -24,8 +24,9 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js index 5ec06c05ef..394f63ff5f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js @@ -29,8 +29,9 @@ verifyEqualTo(obj, "prop", getFun()); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js index cd1476eaea..7089f666f5 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js @@ -30,8 +30,9 @@ verifyEqualTo(obj, "prop", 10); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js index afdb5a5709..466884a968 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js @@ -29,8 +29,9 @@ verifyEqualTo(obj, "prop", getFun()); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js index 97d92d286c..c5c609ad79 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js @@ -29,8 +29,9 @@ Object.defineProperties(obj, { verifyEqualTo(obj, "foo", getFunc()); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js index d687d6345e..9bd8a38c7c 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js @@ -17,12 +17,12 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru Object.defineProperties(obj, { foo: {} }); -verifyEqualTo(obj, "foo", 100); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js index 54c402d74f..ff7d19a48f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { configurable: true } }); -verifyEqualTo(obj, "foo", 101); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 101, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js index 6c0d2f2c8a..948a61d092 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js @@ -40,8 +40,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js index f7d9be5dc4..a41d70fd83 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { value: "102" } }); -verifyEqualTo(obj, "foo", "102"); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "102", + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js index 26da7ca748..4971c08a34 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { value: undefined } }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js index f31e75dbed..53be56ca55 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { value: null } }); -verifyEqualTo(obj, "foo", null); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js index ce699a71b2..895b21043b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js @@ -23,8 +23,10 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js index 5738385a85..765e5e3226 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", -0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js index 5b7397c87e..3f57029fbc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", +0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js index 3cbc638a8b..871d859a41 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { value: 101 } }); -verifyEqualTo(obj, "foo", 101); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js index b3de13ed9d..eb530fdff3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { value: 102 } }); -verifyEqualTo(obj, "foo", 102); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 102, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js index 5cb4ac2df9..73beacbde0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js @@ -23,12 +23,12 @@ Object.defineProperties(obj, { value: "abcd" } }); -verifyEqualTo(obj, "foo", "abcd"); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js index 5893ad38d2..1cf2293e27 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js @@ -29,16 +29,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "prop", getFunc()); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyEqualTo(obj, "prop", getFunc()); + +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js index c4459a802e..2e7473cada 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { value: "fghj" } }); -verifyEqualTo(obj, "foo", "fghj"); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "fghj", + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js index eaeb92e3c7..cf927bc359 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { value: true } }); -verifyEqualTo(obj, "foo", true); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js index 294565851e..ad4217d829 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { value: false } }); -verifyEqualTo(obj, "foo", false); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: false, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js index 47a8e4d761..d9a27c8f94 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js @@ -25,12 +25,12 @@ Object.defineProperties(obj, { value: obj1 } }); -verifyEqualTo(obj, "foo", obj1); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js index 0c154f563f..b0fc54d4af 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js @@ -26,12 +26,12 @@ Object.defineProperties(obj, { value: obj2 } }); -verifyEqualTo(obj, "foo", obj2); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj2, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js index 3db7ea5160..da79965576 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { writable: false } }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js index c5e8d07b24..8925a1c6a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { configurable: true } }); -verifyEqualTo(obj, "foo", undefined); -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: true, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js index 07a9774921..f257a3fa8a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js @@ -26,9 +26,11 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); assert.sameValue(obj.foo, 10); -verifyNotConfigurable(obj, "foo") +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js index c774825fb6..2bdb06848a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js @@ -6,6 +6,7 @@ es5id: 15.2.3.7-6-a-58 description: > Object.defineProperties - desc.[[Get]] and P.[[Get]] are two objects which refer to the different objects (8.12.9 step 6) +includes: [propertyHelper.js] ---*/ var obj = {}; @@ -29,25 +30,15 @@ Object.defineProperties(obj, { } }); -var verifyEnumerable = false; -for (var p in obj) { - if (p === "foo") { - verifyEnumerable = true; - } -} - -var verifyValue = false; -verifyValue = (obj.foo === 20); +assert.sameValue(obj.foo, 20); var desc = Object.getOwnPropertyDescriptor(obj, "foo"); -var verifyConfigurable = false; -delete obj.foo; -verifyConfigurable = obj.hasOwnProperty("foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); -assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); -assert.sameValue(verifyEnumerable, false, 'verifyEnumerable'); -assert(verifyValue, 'verifyValue !== true'); assert.sameValue(typeof(desc.set), "undefined", 'typeof (desc.set)'); assert.sameValue(desc.get, get_Func2, 'desc.get'); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js index 55f0b6e98b..c6ef06f2f7 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js @@ -27,8 +27,9 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js index 18b3b08eff..654371c09d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js @@ -30,8 +30,9 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js index d6b97792f2..7bca98d769 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { enumerable: false } }); -verifyEqualTo(obj, "foo", 10); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js index 66707f734d..5e8478764f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js @@ -23,12 +23,12 @@ Object.defineProperties(obj, { enumerable: true } }); -verifyEqualTo(obj, "foo", 10); -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js index d6bfa302ff..c88d34a3d9 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js @@ -23,12 +23,12 @@ Object.defineProperties(obj, { configurable: false } }); -verifyEqualTo(obj, "foo", 10); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js index fe97b64dd8..a2666ea4d3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js @@ -22,12 +22,12 @@ Object.defineProperties(obj, { configurable: false } }); -verifyEqualTo(obj, "foo", 10); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js index c6678316fc..47811b7582 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js @@ -25,18 +25,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js index dd97034520..ddabfa6957 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js index 6c1a70521e..7bbc90ac6e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: true, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js index 3980343982..3967859349 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js @@ -31,11 +31,13 @@ try { throw new Test262Error("Expected TypeError"); } catch (e) { assert(e instanceof TypeError); - verifyNotEnumerable(obj, "foo"); assert.sameValue(obj.foo, 10); - verifyNotConfigurable(obj, "foo"); + verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, + }); var desc = Object.getOwnPropertyDescriptor(obj, "foo"); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js index c2581e46bf..db5ed622cd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js @@ -30,18 +30,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js index 16f5527999..d94a669dd0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js @@ -6,6 +6,7 @@ es5id: 15.2.3.7-6-a-69 description: > Object.defineProperties - 'P' is data property and P.configurable is true, desc is accessor property (8.12.9 step 9.b.i) +includes: [propertyHelper.js] ---*/ var obj = {}; @@ -25,25 +26,15 @@ Object.defineProperties(obj, { } }); -var verifyEnumerable = false; -for (var p in obj) { - if (p === "foo") { - verifyEnumerable = true; - } -} - -var verifyValue = false; -verifyValue = (obj.foo === 20); +assert.sameValue(obj.foo, 20); var desc = Object.getOwnPropertyDescriptor(obj, "foo"); -var verifyConfigurable = true; -delete obj.foo; -verifyConfigurable = obj.hasOwnProperty("foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); -assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); -assert.sameValue(verifyEnumerable, false, 'verifyEnumerable'); -assert(verifyValue, 'verifyValue !== true'); assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); assert.sameValue(desc.get, get_Func, 'desc.get'); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js index 2c19545d04..311d85dc1e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js @@ -27,12 +27,12 @@ Object.defineProperties(obj, { value: 12 } }); -verifyEqualTo(obj, "foo", 12); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js index 6be29229ee..85d1d8192e 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js index 3807bf9155..8db43b2aa2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js @@ -28,18 +28,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js index ec98b17976..4027fc5b41 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: undefined } }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js index 7efeaf287a..8bbcdbb240 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: null } }); -verifyEqualTo(obj, "foo", null); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js index a1fe2653ec..b734bd9f6f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js @@ -26,8 +26,10 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js index 1a1c1e02c0..6b6cddb15b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", -0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js index 4be63a9fc3..f444cbee00 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", +0); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js index 2752971e2e..fce755d9ea 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: 100 } }); -verifyEqualTo(obj, "foo", 100); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 100, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js index a6533a918c..b0cddcd66f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", 10); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: 10, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js index a7b91fa17b..bf1780dd56 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: "abcd" } }); -verifyEqualTo(obj, "foo", "abcd"); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js index a8b094a8e0..edc253f300 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", "abcd"); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js index e5d26c4acd..3d8b01d752 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js @@ -25,12 +25,12 @@ Object.defineProperties(obj, { value: false } }); -verifyEqualTo(obj, "foo", false); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js index 7e69ae863b..28625eebf8 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js @@ -27,18 +27,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", false); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js index 19c54b3883..b4f1985956 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js @@ -32,12 +32,12 @@ Object.defineProperties(obj, { value: obj2 } }); -verifyEqualTo(obj, "foo", obj1); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js index 0edfc761a9..873bfc248a 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js @@ -29,12 +29,12 @@ Object.defineProperties(obj, { value: obj1 } }); -verifyEqualTo(obj, "foo", obj1); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js index f9b41a56a4..10e7399cf1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js @@ -35,18 +35,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "foo", obj1); - - verifyNotWritable(obj, "foo"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js index 500986c18d..7b10abcdc2 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js @@ -34,16 +34,16 @@ try { } }); } catch (e) { - verifyWritable(obj, "foo", "setVerifyHelpProp"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyWritable(obj, "foo", "setVerifyHelpProp"); + +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js index a6f109dabd..b1ebcbc4dd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js @@ -29,8 +29,10 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); -verifyNotConfigurable(obj, "foo"); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js index f1cee12ac7..b4e642bcdc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js @@ -32,16 +32,16 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyWritable(obj, "foo", "setVerifyHelpProp"); - - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyWritable(obj, "foo", "setVerifyHelpProp"); + +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js index 12de5bbe14..5534a858b6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js @@ -34,20 +34,20 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - var desc = Object.getOwnPropertyDescriptor(obj, "foo"); - - if (typeof(desc.set) !== "undefined") { - throw new Test262Error('Expected typeof (desc.set) === "undefined", actually ' + typeof(desc.set)); - } - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } +} + +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + +var desc = Object.getOwnPropertyDescriptor(obj, "foo"); +if (typeof(desc.set) !== "undefined") { + throw new Test262Error('Expected typeof (desc.set) === "undefined", actually ' + typeof(desc.set)); } reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js index ae7c1d6aa4..f8cf6dc904 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js @@ -30,9 +30,10 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); var desc = Object.getOwnPropertyDescriptor(obj, "foo"); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js index 4a7b37c5b0..a6c7d008c1 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js @@ -37,8 +37,9 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js index 77f1b0a61c..94a43927be 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js @@ -44,14 +44,14 @@ try { verifyWritable(obj, "foo", "setVerifyHelpProp"); - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js index 8a79bf19b1..f17c0e9826 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js @@ -38,14 +38,14 @@ try { } catch (e) { verifyWritable(obj, "foo", "setVerifyHelpProp"); - verifyNotEnumerable(obj, "foo"); - - verifyNotConfigurable(obj, "foo"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js index 14f8f294c5..702cfc7abd 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js @@ -38,25 +38,23 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "property", 1002); - - verifyNotWritable(obj, "property"); - - verifyNotEnumerable(obj, "property"); - - verifyConfigurable(obj, "property"); - verifyEqualTo(obj, "property1", 1003); - - verifyNotWritable(obj, "property1"); - - verifyNotEnumerable(obj, "property1"); - - verifyNotConfigurable(obj, "property1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "property", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); + +verifyProperty(obj, "property1", { + value: 1003, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js index 3426413f72..c3651d96a6 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js @@ -38,25 +38,23 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "0", 1002); - - verifyNotWritable(obj, "0"); - - verifyNotEnumerable(obj, "0"); - - verifyConfigurable(obj, "0"); - verifyEqualTo(obj, "1", 1003); - - verifyNotWritable(obj, "1"); - - verifyNotEnumerable(obj, "1"); - - verifyNotConfigurable(obj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); + +verifyProperty(obj, "1", { + value: 1003, + writable: false, + enumerable: false, + configurable: false, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js index 927d25a004..9ae84e271d 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js @@ -37,26 +37,23 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "property", 1001); - - verifyNotWritable(obj, "property"); - - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - - verifyEqualTo(obj, "property1", 1003); - - verifyNotWritable(obj, "property1"); - - verifyNotEnumerable(obj, "property1"); - - verifyConfigurable(obj, "property1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "property", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); + +verifyProperty(obj, "property1", { + value: 1003, + writable: false, + enumerable: false, + configurable: true, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js index 7d6548ea1d..53ff196de0 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js @@ -37,25 +37,23 @@ try { throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(obj, "0", 1001); - - verifyNotWritable(obj, "0"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - verifyEqualTo(obj, "1", 1003); - - verifyNotWritable(obj, "1"); - - verifyNotEnumerable(obj, "1"); - - verifyConfigurable(obj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } +verifyProperty(obj, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); + +verifyProperty(obj, "1", { + value: 1003, + writable: false, + enumerable: false, + configurable: true, +}); + reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js index cbfc06a190..3c53e641cc 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js @@ -31,8 +31,9 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js index 8f97c40e12..7eeef1842b 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js @@ -19,12 +19,12 @@ Object.defineProperties(obj, { value: 200 } }); -verifyEqualTo(obj, "foo", 200); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js index b89ec12636..fed250c3a3 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: undefined } }); -verifyEqualTo(obj, "foo", undefined); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js index cecec30eb2..06d55a0c5f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { value: 200 } }); -verifyEqualTo(obj, "foo", 200); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js index 830402f265..23461d6227 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { writable: true } }); -verifyEqualTo(obj, "foo", 100); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js index c45c0b3582..938e2a7b17 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { enumerable: true } }); -verifyEqualTo(obj, "foo", 200); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js index 8dee2771e6..a91c0ab91f 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js @@ -24,12 +24,12 @@ Object.defineProperties(obj, { configurable: false } }); -verifyEqualTo(obj, "foo", 200); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: true, + enumerable: true, + configurable: false, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/name.js b/js/src/tests/test262/built-ins/Object/defineProperties/name.js index 64e4c0c4c2..2a9d5c9fbe 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/name.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/name.js @@ -19,10 +19,11 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.defineProperties.name, "defineProperties"); - -verifyNotEnumerable(Object.defineProperties, "name"); -verifyNotWritable(Object.defineProperties, "name"); -verifyConfigurable(Object.defineProperties, "name"); +verifyProperty(Object.defineProperties, "name", { + value: "defineProperties", + writable: false, + enumerable: false, + configurable: true, +}); reportCompare(0, 0); diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/defineProperties/not-a-constructor.js index 7987b575ff..151dd2d509 100644 --- a/js/src/tests/test262/built-ins/Object/defineProperties/not-a-constructor.js +++ b/js/src/tests/test262/built-ins/Object/defineProperties/not-a-constructor.js @@ -29,7 +29,7 @@ assert.sameValue( assert.throws(TypeError, () => { new Object.defineProperties({}, {}); -}, '`new Object.defineProperties({}, {})` throws TypeError'); +}); reportCompare(0, 0); -- cgit v1.2.3