From e3ba8cea1154da2902ad638fb71bbf94d6777bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Thu, 28 Sep 2023 15:15:40 +0200 Subject: [PATCH] Update built-ins/Object/defineProperties to use verifyProperty --- .../defineProperties/15.2.3.7-5-b-138.js | 5 +-- .../defineProperties/15.2.3.7-5-b-139.js | 4 ++- .../defineProperties/15.2.3.7-5-b-140.js | 5 +-- .../defineProperties/15.2.3.7-5-b-141.js | 5 +-- .../defineProperties/15.2.3.7-5-b-142.js | 5 +-- .../defineProperties/15.2.3.7-5-b-143.js | 5 +-- .../defineProperties/15.2.3.7-5-b-144.js | 5 +-- .../defineProperties/15.2.3.7-5-b-146.js | 5 +-- .../defineProperties/15.2.3.7-5-b-147.js | 5 +-- .../defineProperties/15.2.3.7-5-b-148.js | 5 +-- .../defineProperties/15.2.3.7-5-b-149.js | 5 +-- .../defineProperties/15.2.3.7-5-b-150.js | 5 +-- .../defineProperties/15.2.3.7-5-b-151.js | 5 +-- .../defineProperties/15.2.3.7-5-b-152.js | 5 +-- .../defineProperties/15.2.3.7-5-b-153.js | 5 +-- .../defineProperties/15.2.3.7-5-b-154.js | 5 +-- .../defineProperties/15.2.3.7-5-b-155.js | 5 +-- .../defineProperties/15.2.3.7-5-b-156.js | 5 +-- .../defineProperties/15.2.3.7-5-b-157.js | 5 +-- .../defineProperties/15.2.3.7-5-b-158.js | 5 +-- .../defineProperties/15.2.3.7-5-b-159.js | 5 +-- .../defineProperties/15.2.3.7-5-b-160.js | 5 +-- .../defineProperties/15.2.3.7-5-b-161.js | 5 +-- .../defineProperties/15.2.3.7-5-b-163.js | 5 +-- .../defineProperties/15.2.3.7-5-b-164.js | 5 +-- .../defineProperties/15.2.3.7-5-b-165.js | 5 +-- .../defineProperties/15.2.3.7-5-b-167.js | 5 +-- .../defineProperties/15.2.3.7-5-b-168.js | 5 +-- .../defineProperties/15.2.3.7-5-b-169.js | 5 +-- .../defineProperties/15.2.3.7-5-b-170.js | 5 +-- .../defineProperties/15.2.3.7-5-b-171.js | 5 +-- .../defineProperties/15.2.3.7-5-b-174.js | 5 +-- .../defineProperties/15.2.3.7-5-b-60.js | 5 +-- .../defineProperties/15.2.3.7-5-b-63.js | 5 +-- .../defineProperties/15.2.3.7-5-b-64.js | 5 +-- .../defineProperties/15.2.3.7-5-b-67.js | 5 +-- .../defineProperties/15.2.3.7-5-b-68.js | 6 ++-- .../defineProperties/15.2.3.7-5-b-69.js | 5 +-- .../defineProperties/15.2.3.7-5-b-70.js | 5 +-- .../defineProperties/15.2.3.7-5-b-71.js | 5 +-- .../defineProperties/15.2.3.7-5-b-85.js | 5 +-- .../defineProperties/15.2.3.7-5-b-86.js | 5 +-- .../defineProperties/15.2.3.7-5-b-88.js | 5 +-- .../defineProperties/15.2.3.7-5-b-89.js | 5 +-- .../defineProperties/15.2.3.7-5-b-90.js | 5 +-- .../defineProperties/15.2.3.7-5-b-91.js | 5 +-- .../defineProperties/15.2.3.7-5-b-92.js | 5 +-- .../defineProperties/15.2.3.7-5-b-95.js | 5 +-- .../defineProperties/15.2.3.7-6-a-100.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-101.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-102.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-103.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-104.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-105.js | 20 ++++-------- .../defineProperties/15.2.3.7-6-a-106.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-107.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-108.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-109.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-110.js | 18 ++++++----- .../defineProperties/15.2.3.7-6-a-114-b.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-114.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-115.js | 9 +++--- .../defineProperties/15.2.3.7-6-a-12.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-120.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-13.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-14.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-15.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-16.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-163.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-164.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-176.js | 15 ++++++--- .../defineProperties/15.2.3.7-6-a-177.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-18.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-19.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-195.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-197.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-199.js | 6 ++-- .../Object/defineProperties/15.2.3.7-6-a-2.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-200.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-202.js | 19 +++--------- .../defineProperties/15.2.3.7-6-a-204.js | 4 ++- .../defineProperties/15.2.3.7-6-a-205.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-206.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-207.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-208.js | 14 ++++----- .../defineProperties/15.2.3.7-6-a-209.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-21.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-210.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-211.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-212.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-213.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-214.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-215.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-216.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-217.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-218.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-219.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-220.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-221.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-222.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-223.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-224.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-225.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-226.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-227.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-228.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-229.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-230.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-231.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-232.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-233.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-234.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-235.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-236.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-237.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-238.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-239.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-24.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-240.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-241.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-242.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-243.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-244.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-245.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-246.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-247.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-248.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-249.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-250.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-251.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-252.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-253.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-254.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-255.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-256.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-257.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-258.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-259.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-260.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-261.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-262.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-266.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-267.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-268.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-269.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-270.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-271.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-272.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-273.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-274.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-275.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-276.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-277.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-278.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-279.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-28.js | 13 +++----- .../defineProperties/15.2.3.7-6-a-281.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-282.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-283.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-284.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-285.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-288.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-289.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-290.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-291.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-292.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-293.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-294.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-295.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-296.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-297.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-298.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-299.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-30.js | 13 +++----- .../defineProperties/15.2.3.7-6-a-300.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-301.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-302.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-303.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-304.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-305.js | 13 ++++---- .../defineProperties/15.2.3.7-6-a-306.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-307.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-308.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-309.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-31.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-310.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-311.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-312.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-313.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-33.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-35.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-36.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-37.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-38-1.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-38.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-39.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-40.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-41.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-42.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-43.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-44.js | 8 +++-- .../defineProperties/15.2.3.7-6-a-45.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-46.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-47.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-48.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-49.js | 12 +++---- .../Object/defineProperties/15.2.3.7-6-a-5.js | 14 ++++----- .../defineProperties/15.2.3.7-6-a-50.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-51.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-52.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-53.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-54.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-55.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-56.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-57.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-58.js | 21 ++++--------- .../defineProperties/15.2.3.7-6-a-59.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-60.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-61.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-62.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-63.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-64.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-65.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-66-1.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-66.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-67.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-68.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-69.js | 21 ++++--------- .../defineProperties/15.2.3.7-6-a-70.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-71.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-72.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-73.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-74.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-75.js | 8 +++-- .../defineProperties/15.2.3.7-6-a-76.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-77.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-78.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-79.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-80.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-81.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-82.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-83.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-84-1.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-84.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-85.js | 16 +++++----- .../defineProperties/15.2.3.7-6-a-86-1.js | 14 ++++----- .../defineProperties/15.2.3.7-6-a-86.js | 6 ++-- .../defineProperties/15.2.3.7-6-a-87.js | 14 ++++----- .../defineProperties/15.2.3.7-6-a-88.js | 22 ++++++------- .../defineProperties/15.2.3.7-6-a-89.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-90.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-91.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-92.js | 10 +++--- .../defineProperties/15.2.3.7-6-a-93-1.js | 30 +++++++++--------- .../defineProperties/15.2.3.7-6-a-93-2.js | 30 +++++++++--------- .../defineProperties/15.2.3.7-6-a-93-3.js | 31 +++++++++---------- .../defineProperties/15.2.3.7-6-a-93-4.js | 30 +++++++++--------- .../defineProperties/15.2.3.7-6-a-93.js | 7 +++-- .../defineProperties/15.2.3.7-6-a-94.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-95.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-96.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-97.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-98.js | 12 +++---- .../defineProperties/15.2.3.7-6-a-99.js | 12 +++---- .../built-ins/Object/defineProperties/name.js | 11 ++++--- 265 files changed, 1409 insertions(+), 1453 deletions(-) diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js index 38655acf6e..9482b07e47 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-138.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js index f7f1876216..f1a1f1630d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-139.js @@ -17,4 +17,6 @@ Object.defineProperties(obj, { } }); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js index 73ef83af8d..e7b4176124 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-140.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js index 203fa25512..bc3ca81c18 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-141.js @@ -24,5 +24,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js index 43065040e4..142cf9dfa7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-142.js @@ -27,5 +27,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js index 7c4bd1ade8..7c24de69c3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-143.js @@ -35,5 +35,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js index 7342ee90c3..3ab473f955 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-144.js @@ -23,5 +23,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js index a3cf7d943b..8d54aaec0c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-146.js @@ -31,5 +31,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js index 3e31421360..312165f7a6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-147.js @@ -35,5 +35,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js index 5dcb1f2641..5d4b788543 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-148.js @@ -21,5 +21,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js index c872639525..02a0f1c630 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-149.js @@ -33,5 +33,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js index 63ca7a0365..c10ca51838 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-150.js @@ -27,5 +27,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js index 1a3d1598e1..e52cdb91da 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-151.js @@ -22,5 +22,6 @@ Object.defineProperties(obj, { property: func }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js index bf2af05394..4a61a9a7b6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-152.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: arr }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js index 950abea999..d755a8ba65 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-153.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: str }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js index 028fcbee14..668a1f0cb7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-154.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js index a51c6f1f45..50a1cfc2bd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-155.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js index deceb19f88..6353457b49 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-156.js @@ -19,5 +19,6 @@ Object.defineProperties(obj, { property: Math }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js index 7e4ab1f8fa..74413b7de6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-157.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js index c586bddf26..497c6d7995 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-158.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js index d13ecf6fbb..684be038e3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-159.js @@ -18,5 +18,6 @@ Object.defineProperties(obj, { property: JSON }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js index 517ad0fbe8..159eed3ed7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-160.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { property: descObj }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js index a3048ac305..97c71db2d1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-161.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js index c029c8c73f..b0267ad27e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-163.js @@ -19,5 +19,6 @@ Object.defineProperties(obj, { property: this }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js index 8d99816a04..cbfb8a7db3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-164.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js index 84d38c8663..7af602a76c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-165.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js index e3361c0804..af9f18c7d5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-167.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js index f1fb979e82..feca10a64d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-168.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js index 9d1e031ab5..67095ca6c2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-169.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js index 0f0e05fe22..8c98271e1b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-170.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js index a61ec4f20f..2679ef0ada 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-171.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js index a67609ccaa..8d058b893e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js index f8bba39187..5c860392e4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-60.js @@ -16,5 +16,6 @@ Object.defineProperties(obj, { prop: {} }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js index a369fcef1d..2a60eac766 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-63.js @@ -28,5 +28,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js index f7c555bbac..f843ebaef9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-64.js @@ -31,5 +31,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js index 2b6557a0aa..a84e148ed5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-67.js @@ -30,5 +30,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js index 45739752ca..8ff5600196 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js @@ -33,6 +33,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js index 3b5a9ec031..19faa749e1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-69.js @@ -20,5 +20,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js index 2d12bf1c49..9670ff6171 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-70.js @@ -31,5 +31,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js index 58905fa9ee..1d1e0b9174 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-71.js @@ -25,5 +25,6 @@ Object.defineProperties(obj, { prop: descObj }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js index 7a474b608e..794117882b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-85.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js index 29ba52b31a..136de38db0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-86.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js index e6517a31e1..6fedc3c7fa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-88.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js index e4641b79f0..c7fa4e257b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-89.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js index 0a79e78704..3bca17bedb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-90.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js index d7eedac45b..3b5ebd0b20 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-91.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js index bba7b70651..c340e01ddf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-92.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js index 1afd1a5985..c97fb00ab5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-5-b-95.js @@ -17,5 +17,6 @@ Object.defineProperties(obj, { } }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js index 5509662386..890aabeca9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-100.js @@ -25,10 +25,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js index 78710b6c15..d22ea3c0ac 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-101.js @@ -41,6 +41,7 @@ verifyEqualTo(obj, "foo", get_func2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js index b1a52361c5..477018e252 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-102.js @@ -34,6 +34,7 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js index 7636e1ed31..522af46b9b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-103.js @@ -36,6 +36,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js index ee6c4afaf8..38c01b5a2a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-104.js @@ -41,6 +41,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js index 334206b66e..ccef0b6d86 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-105.js +++ b/test/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,19 +39,11 @@ 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; - } -} +verifyProperty(obj, "property", { + enumerable: true, + configurable: true, +}); -var verifyConfigurable = false; -delete obj.property; -verifyConfigurable = obj.hasOwnProperty("property"); - -assert(hasProperty, 'hasProperty !== true'); assert(verifyGet, 'verifyGet !== true'); assert(verifySet, 'verifySet !== true'); -assert(verifyEnumerable, 'verifyEnumerable !== true'); -assert.sameValue(verifyConfigurable, false, 'verifyConfigurable'); + diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js index 7f7efb05af..ec209a8d67 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-106.js @@ -36,6 +36,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js index 36387ff35d..a93563c41d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-107.js @@ -36,6 +36,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js index 5f19489b07..df6a8ddc72 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-108.js @@ -36,6 +36,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js index 1eb1ff3420..70481d005d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-109.js @@ -44,6 +44,7 @@ verifyEqualTo(obj, "foo", get_func2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js index 70616a1a9c..8a17cb4823 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-110.js @@ -36,17 +36,19 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js index 1b69a370d5..d8cf0b6b19 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114-b.js @@ -24,6 +24,7 @@ verifyEqualTo(arr, "length", 0); verifyWritable(arr, "length", "length", 1); -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js index 5e203a7b6a..62c9534a10 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-114.js @@ -26,6 +26,7 @@ verifyEqualTo(arr, "length", 2); verifyWritable(arr, "length", "length", 5); -verifyNotEnumerable(arr, "length"); - -verifyNotConfigurable(arr, "length"); +verifyProperty(arr, "length", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js index e5b5367272..0d78958e53 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-115.js @@ -24,8 +24,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js index 1528a8698e..b954d830cb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-12.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js index 6c5edbb409..c08068d1f9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-120.js @@ -19,10 +19,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js index f0fcc73b50..385e96ffc3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-13.js @@ -25,16 +25,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js index 624ae86535..8489edad9a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-14.js @@ -25,16 +25,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js index be64d29528..49661f89b1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-15.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js index 085080bf97..863e951f6b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-16.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js index c84659c619..92f115ce35 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-163.js @@ -24,8 +24,10 @@ 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); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js index eb4f1f84c3..71daa62a44 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-164.js @@ -31,6 +31,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js index 007c3758f5..4433fcb7f4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-176.js @@ -31,9 +31,14 @@ 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); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js index 6af4744321..22b4a6a0fe 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-177.js @@ -24,6 +24,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js index 6211c04805..74e1566795 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-18.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js index 262c39b426..4ac7e8e1c5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-19.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js index 13ef4b2a95..cc98343f6f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-195.js @@ -19,10 +19,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js index d2a90405ab..ede3e81c30 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-197.js @@ -24,6 +24,7 @@ Object.defineProperties(arr, { } }); -assert(arr.hasOwnProperty("0")); -verifyNotWritable(arr, "0"); -assert.sameValue(arr[0], 1001); +verifyProperty(arr, "0", { + value: 1001, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js index 2800e7da78..0dcef13f77 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-199.js @@ -24,6 +24,6 @@ Object.defineProperties(arr, { } }); -assert(arr.hasOwnProperty("0")); -verifyNotConfigurable(arr, "0"); -assert(arr.hasOwnProperty("0")); +verifyProperty(arr, "0", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js index 037a2eba39..3e0ed0a32d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-2.js @@ -26,10 +26,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js index 5a26d73f9c..58c71359be 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-200.js @@ -21,10 +21,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js index febd6c62a3..b15292b2e6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-202.js +++ b/test/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,22 +24,12 @@ 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'); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js index 4a00ccd71b..3629bd391c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-204.js @@ -39,4 +39,6 @@ if (arr.verifySetter !== 101) { throw new Test262Error('Expected arr.verifySetter === 101, actually ' + arr.verifySetter); } -verifyNotConfigurable(arr, 0); +verifyProperty(arr, "0", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js index e1ebc8eac2..3040822398 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-205.js @@ -42,6 +42,7 @@ verifyEqualTo(arr, "0", getFun()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js index 510fbad6e9..65cd19fd24 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-206.js @@ -18,10 +18,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js index 9aefa195cf..22b82e6330 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-207.js @@ -34,6 +34,7 @@ verifyEqualTo(arr, "0", get_func()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js index 79607b34a4..27190ac105 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-208.js @@ -24,10 +24,10 @@ 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, +}); + diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js index 2620f9b4f7..7ab154c087 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-209.js @@ -38,6 +38,7 @@ verifyEqualTo(arr, "0", get_func()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js index 56cf493bb8..44f4be6fa2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-21.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js index 8eb9e5d412..7010c59d15 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-210.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js index f282f7cb3b..c7b9b56ac8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-211.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js index 6414e5e35a..0736ad79ff 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-212.js @@ -22,10 +22,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js index a925936e72..f91fb7c46c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-213.js @@ -24,16 +24,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js index b44d5b8ed3..fce477b925 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-214.js @@ -24,16 +24,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js index 98155875e4..6d6f2d788c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-215.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js index 543f09d233..7dd60ff218 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-216.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js index a518691b62..721323a49f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-217.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js index 5d44c38341..5f6984aa5d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-218.js @@ -27,10 +27,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js index 35ac3a739f..986efa9697 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-219.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js index 4f86b5e137..79dcf7500b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-220.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js index 7644225b81..0d943c1d16 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-221.js @@ -28,6 +28,7 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_func()); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js index 6e26cc0041..1c0d91f73e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-222.js @@ -28,6 +28,7 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js index 6bcd5d2b8e..f77cdf6a81 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-223.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js index 1392677bcb..5fec4b0ee9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-224.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js index 05a09c6c6c..89f60bfe7b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-225.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js index dae3f933e6..30e6c56369 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-226.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js index 4ba4881d5d..031423ce32 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-227.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js index 792f72d878..4ee594a609 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-228.js @@ -31,16 +31,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js index 1269a27715..c7ab40e36c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-229.js @@ -35,12 +35,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js index ad7611baff..c7faeb60e2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-230.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js index 65eab1859c..5dad883833 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-231.js @@ -27,6 +27,7 @@ Object.defineProperties(arr, { verifyWritable(arr, "1", "setVerifyHelpProp"); -verifyEnumerable(arr, "1"); - -verifyConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js index 03d8e1cfd4..3f51a3c74b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-232.js @@ -28,10 +28,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js index 32191889e1..6c172f41a1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-233.js @@ -30,16 +30,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js index ceb0167227..07f7991d3b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-234.js @@ -32,16 +32,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js index 61e29220e9..0ef8a7bcd5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-235.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js index 66139db54b..874979ac0e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-236.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js index 23ab2ffb3b..d08a50c5ca 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-237.js @@ -28,16 +28,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js index 4a16a4df46..b1efb78f99 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-238.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js index 698cea70dd..fe5a7ee480 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-239.js @@ -28,16 +28,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js index 47298404e7..ff1c0a7d4a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-24.js @@ -24,12 +24,11 @@ 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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js index c10e41ba8b..f12d48c721 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-240.js @@ -34,16 +34,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js index f2cde48b8b..6b0d7f779c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-241.js @@ -34,12 +34,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js index 1fe4e44ae7..7bebac27aa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-242.js @@ -33,12 +33,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js index e9e5140eb4..92f4812ede 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-243.js @@ -25,6 +25,7 @@ Object.defineProperties(arr, { } }); -verifyNotEnumerable(arr, "1"); - -verifyNotConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js index 90fff2b203..69c2fa84a2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-244.js @@ -36,12 +36,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js index fbc583fa37..b053b5cf3e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-245.js @@ -32,12 +32,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js index a4f6b477de..343a00690e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-246.js @@ -26,6 +26,7 @@ Object.defineProperties(arr, { } }); -verifyNotEnumerable(arr, "1"); - -verifyNotConfigurable(arr, "1"); +verifyProperty(arr, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js index e80d3aae01..9d4895f1f0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-247.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js index 5d0431684c..b632325b35 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-248.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js index 25b2ca47fc..dc6b05716e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-249.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js index 0cfd563b55..6db4b0b198 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-250.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js index bc07d4e525..48d2600757 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-251.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js index 5d462269c3..2123ca898f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-252.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js index 34fafda67f..f0c37aca5c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-253.js @@ -21,10 +21,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js index 930ca2baaf..1a042c3f45 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-254.js @@ -32,6 +32,7 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_fun()); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js index 10d5685852..2f70e406e3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-255.js @@ -26,6 +26,8 @@ Object.defineProperties(arr, { get: undefined } }); -verifyNotEnumerable(arr, "0"); -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js index c71b8b28c3..863edc518f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-256.js @@ -30,6 +30,7 @@ Object.defineProperties(arr, { }); verifyEqualTo(arr, "0", get_fun()); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js index 7ef4022769..4caf1bdbb1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-257.js @@ -30,6 +30,7 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js index ebe68bdd9f..126f6f2b52 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-258.js @@ -24,6 +24,8 @@ Object.defineProperties(arr, { set: undefined } }); -verifyNotEnumerable(arr, "0"); -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js index bfc6e92ee1..4d56a5ef23 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-259.js @@ -29,6 +29,7 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js index cef2a2c89b..6cf536a586 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-260.js @@ -30,6 +30,7 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js index 95d0592bf2..d74f8e19e7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-261.js @@ -29,6 +29,7 @@ Object.defineProperties(arr, { }); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js index 89c37c33c2..9679511943 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-262.js @@ -41,6 +41,7 @@ verifyEqualTo(arr, "0", get_fun()); verifyWritable(arr, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arr, "0"); - -verifyNotConfigurable(arr, "0"); +verifyProperty(arr, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js index cbce8d5bf7..32ae083c99 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-266.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js index f94f5f1a64..687eea3d24 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-267.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js index 7c9b38e2a8..bdcc4b608a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-268.js @@ -38,6 +38,7 @@ verifyEqualTo(arr, "property", get_fun()); verifyWritable(arr, "property", "verifySetFun"); -verifyNotEnumerable(arr, "property"); - -verifyConfigurable(arr, "property"); +verifyProperty(arr, "property", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js index d30054d9b3..806bf6a0a8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-269.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js index f2f485c782..1df9888692 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-270.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js index c741cfb05b..c5276c90f2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-271.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js index ac12088789..7e74a6a3cd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-272.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js index bbca771f61..7c8ab35cff 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-273.js @@ -26,16 +26,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js index f107fe0f7e..48f1737735 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-274.js @@ -39,12 +39,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js index 666ad88998..48f29b88ed 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-275.js @@ -30,12 +30,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js index 52a568c740..4e3a745353 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-276.js @@ -32,12 +32,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js index 0f6ea49723..b5bc97034d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-277.js @@ -32,12 +32,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js index b8bcd8b2e9..f2029c5e3f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-278.js @@ -30,10 +30,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js index 17f8a4a9aa..dd13474a4d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-279.js @@ -42,6 +42,7 @@ verifyEqualTo(arg, "0", get_func()); verifyWritable(arg, "0", "setVerifyHelpProp"); -verifyEnumerable(arg, "0"); - -verifyConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js index cd9e4cab81..f25711e67c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js @@ -18,12 +18,7 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js index 9254d3da3e..00b4f32b7d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-281.js @@ -27,10 +27,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js index 60fcebb7f0..d9ca03cbe4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-282.js @@ -34,16 +34,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js index 1d732bd165..dcc6506c17 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-283.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js index 09dc8321c8..28c064c94d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-284.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js index 9745ad05c2..f243930074 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-285.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js index 8e927ac411..42000aea56 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-288.js @@ -40,12 +40,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js index acff19c589..15b6f84de1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-289.js @@ -40,12 +40,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js index 8fb59187a6..641e71e640 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-290.js @@ -30,10 +30,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js index c885c76cee..fe0a3bef31 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-291.js @@ -42,6 +42,7 @@ verifyEqualTo(arg, "0", get_func()); verifyWritable(arg, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js index da3cc57d18..581ff61a5f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-292.js @@ -43,6 +43,7 @@ Object.defineProperties(arg, { verifyEqualTo(arg, "0", get_func2()); -verifyNotEnumerable(arg, "0"); - -verifyNotConfigurable(arg, "0"); +verifyProperty(arg, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js index 6a9c048528..58cd5eb0f5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-293.js @@ -28,10 +28,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js index 6303b8d268..18c906964e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-294.js @@ -34,16 +34,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js index cb23c9ca14..5ec7e16bb2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-295.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js index 315f1d04b8..8954537838 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-296.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js index c457452922..1c686130cc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-297.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js index e22e4d2d8d..701eb8c8c7 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-298.js @@ -42,12 +42,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js index 92269ed324..72a1acdae1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-299.js @@ -43,12 +43,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js index 7684d352e2..dbcbdf8b51 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-30.js @@ -19,12 +19,7 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js index 236d48c3af..587df9b2bc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-300.js @@ -39,12 +39,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js index 14a7e84966..89f31d5a75 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-301.js @@ -39,12 +39,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js index 616737e3fb..1d8df86228 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-302.js @@ -24,10 +24,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js index f9fa042ffe..74bcb28c6e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-303.js @@ -35,6 +35,7 @@ verifyEqualTo(arg, "genericProperty", getFun()); verifyWritable(arg, "genericProperty", "testGetFunction"); -verifyEnumerable(arg, "genericProperty"); - -verifyConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js index 8c3d0a57f8..b83a1e5243 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-304.js @@ -46,6 +46,7 @@ verifyEqualTo(arg, "genericProperty", getFun()); verifyWritable(arg, "genericProperty", "testGetFunction"); -verifyNotEnumerable(arg, "genericProperty"); - -verifyNotConfigurable(arg, "genericProperty"); +verifyProperty(arg, "genericProperty", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js index 111feb5bc1..86aca2c613 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-305.js @@ -30,10 +30,9 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js index bf7b3bd55c..e89f7e23dd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-306.js @@ -30,16 +30,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js index 0a484a6122..49ef2cd793 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-307.js @@ -29,16 +29,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js index ea3ac1cd98..bf9aa01a39 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-308.js @@ -29,16 +29,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js index d53d9cccf8..c784090446 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-309.js @@ -28,16 +28,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js index 034c2820bc..aed01714fe 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-31.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js index 27a6b2a157..4b26f1104b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-310.js @@ -43,12 +43,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js index cdc89b7747..b7d8e8079a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-311.js @@ -36,12 +36,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js index 9f9ed9ba94..09a9b9b58e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-312.js @@ -35,12 +35,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js index d305aff7af..ca28c14f3f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-313.js @@ -34,12 +34,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js index 8df808343e..d0ae3e5350 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-33.js @@ -24,6 +24,7 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js index 9f6e931c1f..e2f41d42ff 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-35.js @@ -29,6 +29,7 @@ verifyEqualTo(obj, "prop", getFun()); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js index 567453a66d..8dd36baf1f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-36.js @@ -30,6 +30,7 @@ verifyEqualTo(obj, "prop", 10); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js index 3ec607f810..a6886595c5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-37.js @@ -29,6 +29,7 @@ verifyEqualTo(obj, "prop", getFun()); verifyWritable(obj, "prop", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js index 1f8a551969..43fa79c854 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38-1.js @@ -29,6 +29,7 @@ Object.defineProperties(obj, { verifyEqualTo(obj, "foo", getFunc()); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js index b984b2fb13..fcb6198dc3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-38.js @@ -17,10 +17,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js index a1532cb67f..7896d5a662 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-39.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js index cde59dc5e2..df2928e206 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-40.js @@ -40,6 +40,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js index 4151bdaaff..a28dcee1af 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-41.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js index a61da8f00b..08052eaa5d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-42.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js index 39f1d83f8f..32dfa0682c 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-43.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js index 3eff291337..e80e0ad4d3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js @@ -23,6 +23,8 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js index f39be696be..8ea976fda3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-45.js @@ -25,16 +25,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js index e262de7bad..b31b67b801 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-46.js @@ -25,16 +25,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js index 6385932006..346be3379e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-47.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js index 910dbf79d5..51f8072fba 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-48.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js index 381073f313..6f50fd258d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-49.js @@ -23,10 +23,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js index 9953e89c6b..51bfeb9a63 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-5.js @@ -29,14 +29,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js index ca3ebff2ea..0a9f1b95d5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-50.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js index 2184bd1ef7..5288ffa333 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-51.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js index ec6ec8925b..1ed1afbaad 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-52.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js index 7b1f7f6377..a018b9b4bc 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-53.js @@ -25,10 +25,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js index 19e37a7046..8084395ad1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-54.js @@ -26,10 +26,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js index 56ae78800d..acba5f1af4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-55.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js index 3d6000d30a..65898ea5cf 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-56.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js index 67c6bc2670..62eff197b9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-57.js @@ -26,7 +26,9 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); assert.sameValue(obj.foo, 10); -verifyNotConfigurable(obj, "foo") +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js index c7a9d7c872..152152f6ab 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-58.js +++ b/test/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,24 +30,14 @@ 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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js index f74d2a2fd7..c87b460bc1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-59.js @@ -27,6 +27,7 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js index 4c619fd073..533bc793e1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-60.js @@ -30,6 +30,7 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js index 14b726244c..ff26223223 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-61.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js index 7f7511776d..f4348cdc69 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-62.js @@ -23,10 +23,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js index b7c53b94ed..802cb507fd 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-63.js @@ -23,10 +23,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js index 1fcaaa8900..e1a097f58a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-64.js @@ -22,10 +22,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js index fa9eb71198..76c5f8762f 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-65.js @@ -25,16 +25,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js index a26b0fd573..385c00dfb1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66-1.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js index 35b451e5e1..fa3ec06234 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-66.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js index 9acb0e6a9e..68dfa958b2 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-67.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js index e6be1b6ed4..77b731922e 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-68.js @@ -30,16 +30,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js index 8df1027706..4db82adda6 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-69.js +++ b/test/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,24 +26,14 @@ 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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js index da3efb8d34..9d82f2caf5 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-70.js @@ -27,10 +27,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js index e08154b335..ae2c885b46 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-71.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js index 215e5ac51e..44809fe4d3 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-72.js @@ -28,16 +28,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js index 65dbed0c11..f7478c4c65 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-73.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js index 0554f87c12..d662c808d1 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-74.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js index 7d66ee61aa..451ca6a25d 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-75.js @@ -26,6 +26,8 @@ Object.defineProperties(obj, { } }); -verifyNotEnumerable(obj, "foo"); -verifyNotWritable(obj, "foo"); -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js index 985c00c0d2..a5626ed864 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-76.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js index 99b179f557..413c360bf9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-77.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js index ac98a36dc1..bd6049d814 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-78.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js index 31a2cc9a09..73b40c8f29 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-79.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js index ba37ac598e..a4761ec616 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-80.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js index e1a84a03e7..533e50e998 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-81.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js index 10eff312d8..1455f92235 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-82.js @@ -25,10 +25,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js index 3f063fccbd..bf5ce49b86 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-83.js @@ -27,16 +27,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js index f78066f0c8..bae38ddff0 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84-1.js @@ -32,10 +32,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js index 35932acd67..00ee06decb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-84.js @@ -29,10 +29,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js index 2d3149c789..4799295a62 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-85.js @@ -35,16 +35,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js index 2a29e46e44..925e4c86ce 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86-1.js @@ -34,14 +34,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); } - } + +verifyWritable(obj, "foo", "setVerifyHelpProp"); + +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js index 762302ec82..65eb755511 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-86.js @@ -29,6 +29,8 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); -verifyNotConfigurable(obj, "foo"); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js index fca6320e52..6a57908570 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-87.js @@ -32,14 +32,14 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js index 1844e92d61..7c74a39fb9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-88.js @@ -34,18 +34,18 @@ 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)); } diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js index 4610c88e66..8d307ecca8 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-89.js +++ b/test/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/test/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js index c8407d1e8e..2bd4eeb6c4 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-90.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js index a7d84ae0cf..fdb2b0e641 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-91.js @@ -44,12 +44,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js index 882fb4a1ff..d96735a012 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-92.js @@ -38,12 +38,12 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js index d235be5f5d..588b711e7a 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-1.js @@ -38,23 +38,21 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js index 8f20c0ff53..3e8b07e325 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-2.js @@ -38,23 +38,21 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js index ee208d1d53..93c385ade9 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-3.js @@ -37,24 +37,21 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js index 881fec60d1..089fc0deeb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93-4.js @@ -37,23 +37,21 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js index 4e3c784f21..079bffa075 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-93.js @@ -31,6 +31,7 @@ Object.defineProperties(obj, { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js index 1df8a41328..bf2a959659 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-94.js @@ -19,10 +19,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js index 08a0229e88..451195e88b 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-95.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js index 18e7cb5d0f..3543e800fa 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-96.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js index 015b74be78..cfaad76d57 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-97.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js index 37e8dc0122..284cf1cc83 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-98.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js index 055a3c8498..fc913d02cb 100644 --- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js +++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-99.js @@ -24,10 +24,10 @@ 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, +}); diff --git a/test/built-ins/Object/defineProperties/name.js b/test/built-ins/Object/defineProperties/name.js index aeacd301ff..99cde9bfe5 100644 --- a/test/built-ins/Object/defineProperties/name.js +++ b/test/built-ins/Object/defineProperties/name.js @@ -19,8 +19,9 @@ 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, +});