From 3499832c3cf408869b556e6a2c5280fb20df6db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Thu, 28 Sep 2023 15:15:34 +0200 Subject: [PATCH] Update built-ins/Object/defineProperty to use verifyProperty --- .../Object/defineProperty/15.2.3.6-3-100.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-102.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-103.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-104.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-105.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-106.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-109.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-152.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-3-153.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-162.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-163.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-164.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-171-1.js | 4 +++- .../Object/defineProperty/15.2.3.6-3-178.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-179.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-181.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-182.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-183.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-184.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-185.js | 9 ++++----- .../Object/defineProperty/15.2.3.6-3-188.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-73.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-74.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-76.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-3-83.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-84.js | 5 +++-- .../Object/defineProperty/15.2.3.6-3-85.js | 7 +++---- .../Object/defineProperty/15.2.3.6-3-99.js | 5 +++-- .../Object/defineProperty/15.2.3.6-4-100.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-101.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-102.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-103.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-104.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-105.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-106.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-107.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-108.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-109.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-110.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-112.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-113.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-114.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-115.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-118.js | 9 ++++++--- .../Object/defineProperty/15.2.3.6-4-119.js | 9 ++++++--- .../Object/defineProperty/15.2.3.6-4-124.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-167.js | 7 +++++-- .../Object/defineProperty/15.2.3.6-4-181.js | 8 +++++--- .../Object/defineProperty/15.2.3.6-4-190.js | 15 +++++++------- .../Object/defineProperty/15.2.3.6-4-194.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-195.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-199.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-200.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-201.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-202.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-203.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-204.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-205.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-207.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-208.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-209.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-210.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-211.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-212.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-213.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-214.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-215.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-216.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-217.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-218.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-219.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-220.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-221.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-222.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-223.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-224.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-225.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-226.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-227.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-228.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-229.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-230.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-231.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-232.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-233.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-234.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-235.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-236.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-237.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-238.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-239.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-240.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-241.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-242-1.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-242.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-243-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-243-2.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-243.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-244.js | 18 +++++++---------- .../Object/defineProperty/15.2.3.6-4-245.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-246.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-247.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-248.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-249.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-250.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-251.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-252.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-253.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-254.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-255.js | 8 +++++--- .../Object/defineProperty/15.2.3.6-4-256.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-257.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-258.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-259.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-260.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-261.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-262.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-263.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-264.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-265.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-266.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-267.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-268.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-269.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-270.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-271.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-272.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-273.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-277.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-278.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-279.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-280.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-281.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-282.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-283.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-284.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-285.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-286.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-287.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-288.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-289-1.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-289.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-290-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-290.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-291-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-291.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-292-1.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-292-2.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-292.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-293-1.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-293-2.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-293-3.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-293-4.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-293.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-294-1.js | 15 ++++++-------- .../Object/defineProperty/15.2.3.6-4-294.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-295-1.js | 15 +++++++------- .../Object/defineProperty/15.2.3.6-4-295.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-296-1.js | 15 +++++++------- .../Object/defineProperty/15.2.3.6-4-296.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-297-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-297.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-298-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-298.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-299-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-299.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-300-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-300.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-301-1.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-301.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-302-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-302.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-303.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-304.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-305.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-306.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-307.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-308.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-309.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-310.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-311.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-312.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-313-1.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-313.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-314-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-314.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-315-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-315.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-316-1.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-316.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-317-1.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-317.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-318-1.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-318.js | 16 ++++++--------- .../Object/defineProperty/15.2.3.6-4-319-1.js | 17 +++++++--------- .../Object/defineProperty/15.2.3.6-4-319.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-320-1.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-320.js | 16 ++++++--------- .../Object/defineProperty/15.2.3.6-4-321-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-321.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-322-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-322.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-323-1.js | 9 ++++----- .../Object/defineProperty/15.2.3.6-4-323.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-324-1.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-324.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-333-1.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-333-2.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-333-3.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-333-6.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-333-7.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-333-8.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-335.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-349.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-354-1.js | 13 ++++++------ .../defineProperty/15.2.3.6-4-354-10.js | 13 ++++++------ .../defineProperty/15.2.3.6-4-354-11.js | 13 ++++++------ .../defineProperty/15.2.3.6-4-354-12.js | 13 ++++++------ .../defineProperty/15.2.3.6-4-354-15.js | 6 ++++-- .../defineProperty/15.2.3.6-4-354-16.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-354-2.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-354-3.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-354-6.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-354-7.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-354.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-361.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-363.js | 5 +++-- .../Object/defineProperty/15.2.3.6-4-368.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-375.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-377.js | 5 +++-- .../Object/defineProperty/15.2.3.6-4-38.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-41.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-429.js | 8 ++++---- .../Object/defineProperty/15.2.3.6-4-434.js | 10 +++------- .../Object/defineProperty/15.2.3.6-4-438.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-447.js | 8 +++----- .../Object/defineProperty/15.2.3.6-4-45.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-452.js | 10 +++------- .../Object/defineProperty/15.2.3.6-4-456.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-465.js | 8 +++----- .../Object/defineProperty/15.2.3.6-4-47.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-470.js | 9 +++------ .../Object/defineProperty/15.2.3.6-4-474.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-48.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-483.js | 9 +++------ .../Object/defineProperty/15.2.3.6-4-488.js | 11 +++------- .../Object/defineProperty/15.2.3.6-4-49.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-492.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-50.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-501.js | 8 +++----- .../Object/defineProperty/15.2.3.6-4-506.js | 12 +++-------- .../Object/defineProperty/15.2.3.6-4-51.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-510.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-519.js | 9 +++------ .../Object/defineProperty/15.2.3.6-4-52.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-524.js | 11 +++------- .../Object/defineProperty/15.2.3.6-4-528.js | 11 ++++------ .../Object/defineProperty/15.2.3.6-4-53.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-531-1.js | 7 ++++--- .../defineProperty/15.2.3.6-4-531-10.js | 7 ++++--- .../defineProperty/15.2.3.6-4-531-11.js | 7 ++++--- .../defineProperty/15.2.3.6-4-531-12.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-531-2.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-531-3.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-537.js | 8 ++++---- .../Object/defineProperty/15.2.3.6-4-538-1.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-538-2.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-538-5.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-538-6.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-538.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-54.js | 6 ++++-- .../Object/defineProperty/15.2.3.6-4-540-1.js | 19 +++++++++--------- .../Object/defineProperty/15.2.3.6-4-540-2.js | 19 +++++++++--------- .../Object/defineProperty/15.2.3.6-4-540-3.js | 19 +++++++++--------- .../Object/defineProperty/15.2.3.6-4-540-6.js | 20 +++++++++---------- .../Object/defineProperty/15.2.3.6-4-540-7.js | 20 +++++++++---------- .../Object/defineProperty/15.2.3.6-4-540-8.js | 19 +++++++++--------- .../Object/defineProperty/15.2.3.6-4-542.js | 5 +++-- .../Object/defineProperty/15.2.3.6-4-546.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-547-1.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-547-2.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-547-3.js | 9 +++++---- .../Object/defineProperty/15.2.3.6-4-547-4.js | 11 +++++----- .../Object/defineProperty/15.2.3.6-4-55.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-555.js | 4 +++- .../Object/defineProperty/15.2.3.6-4-56.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-560.js | 5 +++-- .../Object/defineProperty/15.2.3.6-4-564.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-57.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-58.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-59.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-60.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-61.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-62.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-63.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-64.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-65.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-66.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-67.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-68.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-69.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-70.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-71.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-72.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-73.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-74.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-75.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-76.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-77.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-78.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-79.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-80.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-81.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-82-1.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-10.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-11.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-12.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-13.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-14.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-15.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-16.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-17.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-18.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-19.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-2.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-20.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-21.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-22.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-23.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-24.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-3.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-4.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-5.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-6.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-82-7.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-8.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82-9.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-82.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-83.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-84.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-85.js | 13 ++++++------ .../Object/defineProperty/15.2.3.6-4-86.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-87.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-88.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-89.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-90.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-91.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-92.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-93.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-94.js | 12 +++++------ .../Object/defineProperty/15.2.3.6-4-95.js | 16 +++++++-------- .../Object/defineProperty/15.2.3.6-4-96.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-97.js | 10 +++++----- .../Object/defineProperty/15.2.3.6-4-98.js | 7 ++++--- .../Object/defineProperty/15.2.3.6-4-99.js | 10 +++++----- test/built-ins/Object/defineProperty/name.js | 11 +++++----- 356 files changed, 1838 insertions(+), 1907 deletions(-) diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js index 5c49f9552c..86853af05e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-100.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: null }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js index f28ee33667..ceeb95835d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-102.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js index 442ccffbe8..c3d4e5de11 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-103.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: 0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js index 0de5f8d982..5c188d321f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-104.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: +0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js index c899a8e444..f322077895 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-105.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: -0 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js index 4a6edd949a..f1b3625021 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-106.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: NaN }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js index 26f6c40599..620ac59de4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-109.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: "" }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js index d355d3c45d..1b1f411f95 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-152.js @@ -17,6 +17,7 @@ var attr = { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js index 15eeb6e1cf..c928091c31 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-153.js @@ -17,5 +17,6 @@ var attr = { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js index e5081410b6..4c627489dc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-162.js @@ -18,5 +18,6 @@ Object.defineProperty(attr, "writable", { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js index 3615ce5c6f..2d9862aaf1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-163.js @@ -29,5 +29,6 @@ Object.defineProperty(child, "writable", { Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js index baaa4a1a38..329f7e7a76 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-164.js @@ -24,5 +24,6 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js index b5941c8bf5..6fa213d54d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js @@ -17,8 +17,10 @@ try { var dateObj = new Date(); Object.defineProperty(obj, "property", dateObj); - verifyWritable(obj, "property"); + verifyProperty(obj, "property", { + writable: true, + }); } finally { delete Date.prototype.writable; } diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js index 354b342f1d..9f7a3001a1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-178.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: undefined }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js index 88c9e3f0db..8ce66de075 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-179.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: null }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js index 7b40135c27..e8256ca8ad 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-181.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js index 2d818dba21..15cae21ce3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-182.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: 0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js index 9b20abc03f..27709f8d8e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-183.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: +0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js index d788c3d238..fbce1bbdc5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-184.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: -0 }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js index 883316e494..85f8119902 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-185.js @@ -15,8 +15,7 @@ Object.defineProperty(obj, "property", { writable: NaN }); -assert(obj.hasOwnProperty("property")); - -verifyNotWritable(obj, "property"); - -assert.sameValue(typeof(obj.property), "undefined"); +verifyProperty(obj, "property", { + value: undefined, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js index e23005612c..1f88f3d170 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-188.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { writable: "" }); -assert(obj.hasOwnProperty("property")); -verifyNotWritable(obj, "property"); +verifyProperty(obj, "property", { + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js index cc482c6c89..af06de0be8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-73.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: false }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js index d5c2b4ba9e..ece0ca9efe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-74.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { value: 100 }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js index 649f877b30..bc9af3b94c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-76.js @@ -22,10 +22,7 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); - -verifyNotConfigurable(obj, "property"); - -assert(obj.hasOwnProperty("property")); - -assert.sameValue(typeof(obj.property), "undefined"); +verifyProperty(obj, "property", { + value: undefined, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js index b39b5cf911..c7b9c84fdc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-83.js @@ -18,5 +18,6 @@ Object.defineProperty(attr, "configurable", { Object.defineProperty(obj, "property", attr); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js index 73297b3727..bf48b79cd7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-84.js @@ -29,5 +29,6 @@ Object.defineProperty(child, "configurable", { Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js index 3d8051dc58..c02ad9a598 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-85.js @@ -24,9 +24,8 @@ var child = new ConstructFun(); Object.defineProperty(obj, "property", child); -assert(obj.hasOwnProperty("property")); +verifyProperty(obj, "property", { + configurable: false, +}); -verifyNotConfigurable(obj, "property"); - -assert(obj.hasOwnProperty("property")); assert.sameValue(typeof(obj.property), "undefined"); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js b/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js index b809de3238..39489f718f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-3-99.js @@ -15,5 +15,6 @@ Object.defineProperty(obj, "property", { configurable: undefined }); -assert(obj.hasOwnProperty("property")); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-100.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-100.js index efda2cd61d..b50421ae29 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-100.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-100.js @@ -16,10 +16,10 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-101.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-101.js index bd15bb5668..65c51fb549 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-101.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-101.js @@ -16,10 +16,10 @@ obj.foo = 100; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-102.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-102.js index 5ad0a75c56..4a24ef0829 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-102.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-102.js @@ -16,10 +16,10 @@ obj.foo = undefined; // default value of attributes: writable: true, configurabl Object.defineProperty(obj, "foo", { value: 100 }); -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/defineProperty/15.2.3.6-4-103.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-103.js index 44f7cb2fb8..233f710538 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-103.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-103.js @@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { writable: 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/defineProperty/15.2.3.6-4-104.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-104.js index 1a2b93d2a2..16b97f58c0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-104.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-104.js @@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-105.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-105.js index 8059ec3653..298ac55d64 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-105.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-105.js @@ -23,10 +23,9 @@ Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-106.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-106.js index c6a9e58fd5..2d252eb32d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-106.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-106.js @@ -24,10 +24,10 @@ Object.defineProperty(obj, "foo", { writable: false, enumerable: false }); -verifyEqualTo(obj, "foo", 200); -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 200, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-107.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-107.js index f888deb396..8eb082f9c5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-107.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-107.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-108.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-108.js index 14f5eb8225..344c561bfe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-108.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-108.js @@ -34,6 +34,7 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-109.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-109.js index 8b7123a390..748e9fc48d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-109.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-109.js @@ -34,6 +34,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-110.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-110.js index 459f7b702f..3b18bc5451 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-110.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-110.js @@ -32,6 +32,7 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-112.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-112.js index 85bde155ac..506d680ba9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-112.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-112.js @@ -35,6 +35,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-113.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-113.js index 7ec7a57bf2..19df66ca29 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-113.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-113.js @@ -30,6 +30,7 @@ Object.defineProperty(obj, "foo", { verifyEqualTo(obj, "foo", getFunc()); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-114.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-114.js index c8f90bfcc2..ec61e50356 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-114.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-114.js @@ -35,6 +35,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-115.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-115.js index 702324b47d..7f9bd9c57d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-115.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-115.js @@ -42,6 +42,7 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js index 9d6eac00a2..c4716e269e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-118.js @@ -16,6 +16,9 @@ Object.defineProperty(arrObj, "length", {}); assert.sameValue(arrObj.length, 0); arrObj.length = 2; -assert.sameValue(arrObj.length, 2); -verifyNotEnumerable(arrObj, "length"); -verifyNotConfigurable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 2, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js index f1bef7cb15..48d765efe4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-119.js @@ -21,6 +21,9 @@ Object.defineProperty(arrObj, "length", { assert.sameValue(arrObj.length, 0); arrObj.length = 2; -assert.sameValue(arrObj.length, 2); -verifyNotEnumerable(arrObj, "length"); -verifyNotConfigurable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 2, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-124.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-124.js index e5940a0649..9747b9c3f5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-124.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-124.js @@ -16,10 +16,10 @@ var arrObj = []; Object.defineProperty(arrObj, "length", { writable: false }); -verifyEqualTo(arrObj, "length", 0); -verifyNotWritable(arrObj, "length"); - -verifyNotEnumerable(arrObj, "length"); - -verifyNotConfigurable(arrObj, "length"); +verifyProperty(arrObj, "length", { + value: 0, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js index a2de291b8a..2106ed9a6b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-167.js @@ -22,5 +22,8 @@ Object.defineProperty(arrObj, "length", { }); assert(!arrObj.hasOwnProperty("1")) -assert.sameValue(arrObj.length, 1); -verifyNotWritable(arrObj, "length"); + +verifyProperty(arrObj, "length", { + value: 1, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js index 11dcd7d497..af2e5b983b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-181.js @@ -21,7 +21,9 @@ Object.defineProperty(arrObj, "length", { writable: false }); -verifyNotWritable(arrObj, "length"); - assert(!arrObj.hasOwnProperty("1")); -assert.sameValue(arrObj.length, 0); + +verifyProperty(arrObj, "length", { + value: 0, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-190.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-190.js index 41014a62f7..85ed7b0b0d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-190.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-190.js @@ -24,15 +24,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", "ownDataProperty"); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } } + +verifyProperty(arrObj, "0", { + value: "ownDataProperty", + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-194.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-194.js index 2bbd215e26..e57b79525f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-194.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-194.js @@ -29,12 +29,12 @@ try { } catch (e) { verifyEqualTo(arrObj, "0", getFunc()); - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e.name); } - } + +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-195.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-195.js index 491372f016..5ce0608590 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-195.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-195.js @@ -41,9 +41,10 @@ try { verifyWritable(arrObj, "0", "helpVerifySet"); - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); + verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, + }); } finally { delete Array.prototype[0]; } diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-199.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-199.js index 58c486b4c4..d939c8f0cf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-199.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-199.js @@ -17,10 +17,9 @@ Object.defineProperty(arrObj, "0", { enumerable: true }); -verifyEqualTo(arrObj, "0", undefined); - -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-200.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-200.js index 9f5256890b..efa8599b89 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-200.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-200.js @@ -20,10 +20,9 @@ Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); - -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-201.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-201.js index f0482af89b..40b59f654d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-201.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-201.js @@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", { enumerable: true, configurable: false }); -verifyEqualTo(arrObj, "0", 1001); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-202.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-202.js index d6bdee22b1..67898e5dbd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-202.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-202.js @@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", { writable: true, configurable: true }); -verifyEqualTo(arrObj, "0", 1001); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-203.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-203.js index abee7a278e..fdb2ffebd5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-203.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-203.js @@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", { writable: true, enumerable: true }); -verifyEqualTo(arrObj, "0", 1001); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-204.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-204.js index e19e46508f..176b20d7f9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-204.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-204.js @@ -19,10 +19,9 @@ Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", 1001); - -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-205.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-205.js index 04c926f702..8e3fd42db2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-205.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-205.js @@ -24,6 +24,7 @@ Object.defineProperty(arrObj, "0", { verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-207.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-207.js index 338b788eff..b7811fa469 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-207.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-207.js @@ -28,6 +28,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-208.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-208.js index 540472ce31..01cdc164c6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-208.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-208.js @@ -27,6 +27,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-209.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-209.js index 315efeb877..608ff82c43 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-209.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-209.js @@ -38,6 +38,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-210.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-210.js index 0cd5779c47..a109ac18fc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-210.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-210.js @@ -15,10 +15,10 @@ var arrObj = []; arrObj[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true Object.defineProperty(arrObj, "0", {}); -verifyEqualTo(arrObj, "0", 101); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 101, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-211.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-211.js index 030a92221c..1eb56bca5b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-211.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-211.js @@ -32,6 +32,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-212.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-212.js index a7abee3101..2904e5805d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-212.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-212.js @@ -22,10 +22,9 @@ Object.defineProperty(arrObj, "0", { configurable: true }); -verifyEqualTo(arrObj, "0", 100); - -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-213.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-213.js index 2b691bf416..7dbf74d199 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-213.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-213.js @@ -39,6 +39,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-214.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-214.js index be41ec4109..cde4637b1c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-214.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-214.js @@ -26,16 +26,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", 101); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-215.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-215.js index 49bff01a3a..718b59b750 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-215.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-215.js @@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: undefined }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-216.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-216.js index ec465e9c28..257e4e4c3b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-216.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-216.js @@ -19,10 +19,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: null }); -verifyEqualTo(arrObj, "0", null); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: null, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js index a8851cf79d..7f2704c4e5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-217.js @@ -20,9 +20,9 @@ Object.defineProperty(arrObj, "0", { value: NaN }); -assert(arrObj.hasOwnProperty("0")); -assert(arrObj[0] !== arrObj[0]); - -verifyNotWritable(arrObj, "0"); -verifyNotEnumerable(arrObj, "0"); -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-218.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-218.js index 346045a403..388fa6c396 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-218.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-218.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", -0); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-219.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-219.js index 28624b02f9..b382383a12 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-219.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-219.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", +0); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-220.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-220.js index 10696ad39b..58973dd050 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-220.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-220.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: 101 }); -verifyEqualTo(arrObj, "0", 101); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-221.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-221.js index 3bc3554501..00b58d6e18 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-221.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-221.js @@ -25,16 +25,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", 101); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: 101, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-222.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-222.js index ed3c0936cc..391bff02fe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-222.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-222.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: "abcd" }); -verifyEqualTo(arrObj, "0", "abcd"); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-223.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-223.js index 2fd286ba29..07cb7b875e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-223.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-223.js @@ -25,16 +25,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", "abcd"); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: "abcd", + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-224.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-224.js index de19df976c..37aedff932 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-224.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-224.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: true }); -verifyEqualTo(arrObj, "0", true); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-225.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-225.js index f988e61f52..ac2a6f91bb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-225.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-225.js @@ -25,16 +25,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", true); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: true, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-226.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-226.js index 5b7e7edd28..f755a1edf0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-226.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-226.js @@ -24,10 +24,11 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { value: obj1 }); -verifyEqualTo(arrObj, "0", obj1); -verifyNotWritable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-227.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-227.js index 5acc07bb1c..cf456d7b37 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-227.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-227.js @@ -32,16 +32,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "0", obj1); - - verifyNotWritable(arrObj, "0"); - - verifyNotEnumerable(arrObj, "0"); - - verifyNotConfigurable(arrObj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "0", { + value: obj1, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-228.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-228.js index 3e873291d5..a497268201 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-228.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-228.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { writable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-229.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-229.js index 859a41f627..cc8164e8e6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-229.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-229.js @@ -21,10 +21,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { writable: true }); -verifyEqualTo(arrObj, "0", undefined); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-230.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-230.js index d2d6797a6b..63aa0e37e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-230.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-230.js @@ -34,6 +34,7 @@ verifyEqualTo(arrObj, "0", getFunc()); verifyWritable(arrObj, "0", "helpVerifySet"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-231.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-231.js index b8cac4a63c..6eafb69618 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-231.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-231.js @@ -40,6 +40,7 @@ verifyEqualTo(arrObj, "0", getFunc2()); verifyWritable(arrObj, "0", "helpVerifySet"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-232.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-232.js index 757da898b2..b6817d510e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-232.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-232.js @@ -26,6 +26,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-233.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-233.js index 1fb647246b..cb9ae5c84a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-233.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-233.js @@ -29,6 +29,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-234.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-234.js index 20d6f364b4..f48605e64b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-234.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-234.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-235.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-235.js index bc5cf27899..0d934a9196 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-235.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-235.js @@ -21,10 +21,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { enumerable: true }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-236.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-236.js index 3ca2886007..1dbb7839c9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-236.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-236.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-237.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-237.js index bbcd444370..adc1e0fbbe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-237.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-237.js @@ -20,10 +20,10 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", undefined); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-238.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-238.js index c68c3e635d..b479855fa2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-238.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-238.js @@ -27,18 +27,15 @@ try { configurable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: 3, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-239.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-239.js index 7421b5a81b..2be8486d23 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-239.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-239.js @@ -29,18 +29,15 @@ try { enumerable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: 3, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-240.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-240.js index ffd8f4db3e..f66ce0790d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-240.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-240.js @@ -32,12 +32,12 @@ try { } catch (e) { verifyWritable(arrObj, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-241.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-241.js index 4b2b67198f..f6738617f4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-241.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-241.js @@ -24,18 +24,15 @@ try { set: function() {} }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js index d0cd2bd479..e1d90951ba 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-242-1.js @@ -20,10 +20,9 @@ Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", 1001); - -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 1001, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-242.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-242.js index 862326c37e..6672f18dfe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-242.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-242.js @@ -24,6 +24,7 @@ Object.defineProperty(arrObj, "0", { verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js index bca8f06069..3df9099647 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-243-1.js @@ -27,6 +27,7 @@ arrObj[1] = 4; verifyEqualTo(arrObj, "1", getFunc()); -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-243-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-243-2.js index a94e6f615a..05a0aab2a0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-243-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-243-2.js @@ -28,6 +28,7 @@ assert.throws(TypeError, function() { }); verifyEqualTo(arrObj, "1", getFunc()); -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-243.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-243.js index 1c9e01206b..9296aa7acd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-243.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-243.js @@ -27,10 +27,9 @@ Object.defineProperty(arrObj, "1", { value: 12 }); -verifyEqualTo(arrObj, "1", 12); - -verifyNotWritable(arrObj, "1"); - -verifyNotEnumerable(arrObj, "1"); - -verifyConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-244.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-244.js index d00495689a..9e4728946a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-244.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-244.js @@ -22,23 +22,19 @@ Object.defineProperty(arrObj, "1", { }); try { - Object.defineProperty(arrObj, "1", { writable: true }); throw new Test262Error("Expected an exception."); - } catch (e) { - verifyEqualTo(arrObj, "1", undefined); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-245.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-245.js index a6135654e3..cc99b02c41 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-245.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-245.js @@ -29,16 +29,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", 3); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: 3, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-246.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-246.js index a9108891fd..af3faa9bba 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-246.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-246.js @@ -18,7 +18,6 @@ var arrObj = []; Object.defineProperty(arrObj, "1", { value: -0 - }); try { @@ -27,16 +26,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", -0); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: -0, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-247.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-247.js index 15c3378d42..207ce166ee 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-247.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-247.js @@ -27,16 +27,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", +0); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: +0, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-248.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-248.js index cb168bfe8f..4667c5edd8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-248.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-248.js @@ -26,16 +26,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", 12); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-249.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-249.js index a5c3fbeacd..d8e4624d24 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-249.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-249.js @@ -26,16 +26,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", "abc"); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: "abc", + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-250.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-250.js index e3aed4b274..888a0d3f65 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-250.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-250.js @@ -26,16 +26,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", false); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: false, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-251.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-251.js index 0524d0a4e9..69aab46a6f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-251.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-251.js @@ -29,16 +29,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "1", obj); - - verifyNotWritable(arrObj, "1"); - - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + value: obj, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-252.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-252.js index 354a5bbcbf..4f5a34cd07 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-252.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-252.js @@ -32,12 +32,12 @@ try { } catch (e) { verifyWritable(arrObj, "1", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-253.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-253.js index bc278d21eb..f0cce09f46 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-253.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-253.js @@ -32,12 +32,12 @@ try { } catch (e) { verifyEqualTo(arrObj, "1", getFunc()); - verifyNotEnumerable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js index 233b2deac5..fbb16aeadd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-254.js @@ -29,5 +29,7 @@ var desc = Object.getOwnPropertyDescriptor(arrObj, "1"); assert(desc.hasOwnProperty("get") && typeof desc.get === "undefined"); assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); -verifyNotEnumerable(arrObj, "1"); -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js index 2ea48e0801..0eed87045f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-255.js @@ -40,7 +40,9 @@ try { assert(arrObj[1] === getFunc()); assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); - - verifyNotEnumerable(arrObj, "1"); - verifyNotConfigurable(arrObj, "1"); } + +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js index 65eaf21ef6..fba4811333 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-256.js @@ -38,6 +38,8 @@ try { assert(desc.hasOwnProperty("set") && typeof desc.set === "undefined"); verifyNotWritable(arrObj, "1"); - - verifyNotConfigurable(arrObj, "1"); } + +verifyProperty(arrObj, "1", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-257.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-257.js index d8563de260..92b39bcc92 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-257.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-257.js @@ -31,6 +31,7 @@ Object.defineProperty(arrObj, "1", { verifyWritable(arrObj, "1", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "1"); - -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-258.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-258.js index fc823796a5..c79effc348 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-258.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-258.js @@ -17,10 +17,10 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { value: 200 }); -verifyEqualTo(arrObj, "0", 200); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 200, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-259.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-259.js index 11d17e6726..ed2d95707f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-259.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-259.js @@ -17,10 +17,10 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { value: undefined }); -verifyEqualTo(arrObj, "0", undefined); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: undefined, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-260.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-260.js index 81452c8a3c..5a7648b50c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-260.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-260.js @@ -16,10 +16,10 @@ var arrObj = [undefined]; Object.defineProperty(arrObj, "0", { value: 100 }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-261.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-261.js index 00983ec92c..624e732580 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-261.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-261.js @@ -16,10 +16,10 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { writable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyNotWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: false, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-262.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-262.js index 3ab254e83f..ea0716bd13 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-262.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-262.js @@ -17,10 +17,10 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { enumerable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-263.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-263.js index 383acb95b1..85ca749293 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-263.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-263.js @@ -17,10 +17,10 @@ var arrObj = [100]; Object.defineProperty(arrObj, "0", { configurable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyWritable(arrObj, "0"); - -verifyEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-264.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-264.js index cff7a2c800..182b5262ed 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-264.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-264.js @@ -18,10 +18,10 @@ Object.defineProperty(arrObj, "0", { enumerable: false, configurable: false }); -verifyEqualTo(arrObj, "0", 100); -verifyNotWritable(arrObj, "0"); - -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + value: 100, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-265.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-265.js index e0c5c88cc6..88a28da53b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-265.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-265.js @@ -28,6 +28,7 @@ Object.defineProperty(arrObj, "0", { }); verifyEqualTo(arrObj, "0", getFunc()); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-266.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-266.js index 404c0b27bd..323e64aca8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-266.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-266.js @@ -26,6 +26,8 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { get: undefined }); -verifyNotEnumerable(arrObj, "0"); -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-267.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-267.js index 0b277d2b35..bc69b47bc8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-267.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-267.js @@ -27,6 +27,7 @@ Object.defineProperty(arrObj, "0", { }); verifyEqualTo(arrObj, "0", getFunc()); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-268.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-268.js index 77eb277654..ddc3f1d162 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-268.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-268.js @@ -27,6 +27,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-269.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-269.js index d745c8ec7a..1ba91fa63d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-269.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-269.js @@ -22,6 +22,8 @@ Object.defineProperty(arrObj, "0", { Object.defineProperty(arrObj, "0", { set: undefined }); -verifyNotEnumerable(arrObj, "0"); -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-270.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-270.js index 2139b32e7b..8dd33da58f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-270.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-270.js @@ -28,6 +28,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-271.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-271.js index b6e062cfa9..0a8f8a7685 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-271.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-271.js @@ -29,6 +29,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-272.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-272.js index 85c7d938e5..700a6c61fb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-272.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-272.js @@ -28,6 +28,7 @@ Object.defineProperty(arrObj, "0", { }); verifyWritable(arrObj, "0", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "0"); - -verifyNotConfigurable(arrObj, "0"); +verifyProperty(arrObj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-273.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-273.js index 96cd481ae2..40f6f94744 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-273.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-273.js @@ -39,6 +39,7 @@ verifyEqualTo(arrObj, "1", getFunc()); verifyWritable(arrObj, "1", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "1"); - -verifyNotConfigurable(arrObj, "1"); +verifyProperty(arrObj, "1", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-277.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-277.js index bd2d31b641..c70e28c138 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-277.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-277.js @@ -21,10 +21,9 @@ Object.defineProperty(arrObj, "property", { configurable: true }); -verifyEqualTo(arrObj, "property", 12); - -verifyWritable(arrObj, "property"); - -verifyEnumerable(arrObj, "property"); - -verifyConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + value: 12, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-278.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-278.js index 1a2a67150c..fca26b9bbc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-278.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-278.js @@ -32,6 +32,7 @@ verifyEqualTo(arrObj, "property", getFunc()); verifyWritable(arrObj, "property", "setVerifyHelpProp"); -verifyEnumerable(arrObj, "property"); - -verifyConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-279.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-279.js index cc89be6860..1e4bcca0ff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-279.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-279.js @@ -38,6 +38,7 @@ verifyEqualTo(arrObj, "property", getFunc()); verifyWritable(arrObj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(arrObj, "property"); - -verifyNotConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-280.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-280.js index b6001dca17..ddd3b94e56 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-280.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-280.js @@ -21,10 +21,9 @@ Object.defineProperty(arrObj, "property", { configurable: false }); -verifyEqualTo(arrObj, "property", 12); - -verifyNotWritable(arrObj, "property"); - -verifyNotEnumerable(arrObj, "property"); - -verifyNotConfigurable(arrObj, "property"); +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-281.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-281.js index 7e6fd7e763..8b6bee9529 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-281.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-281.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-282.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-282.js index fc13067f13..077e99caf0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-282.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-282.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", undefined); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-283.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-283.js index dc04dd3c51..a610b2ee12 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-283.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-283.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-284.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-284.js index 9fbead3859..911acf3fd8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-284.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-284.js @@ -23,16 +23,14 @@ try { }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arrObj, "property", 12); - - verifyNotWritable(arrObj, "property"); - - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + value: 12, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-285.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-285.js index b3c187de14..773d6052f1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-285.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-285.js @@ -37,12 +37,12 @@ try { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-286.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-286.js index ed8430424f..b27aa017ce 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-286.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-286.js @@ -28,12 +28,12 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-287.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-287.js index 34f2595375..91471de0ff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-287.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-287.js @@ -29,12 +29,12 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-288.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-288.js index e196cf7581..58b5947de7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-288.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-288.js @@ -29,12 +29,12 @@ try { } catch (e) { verifyWritable(arrObj, "property", "setVerifyHelpProp"); - verifyNotEnumerable(arrObj, "property"); - - verifyNotConfigurable(arrObj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(arrObj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js index 5062611af0..6784c6d779 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-289-1.js @@ -28,11 +28,10 @@ includes: [propertyHelper.js] throw new Test262Error("Expected a === 0, actually " + a); } - verifyEqualTo(arguments, "0", 10); - - verifyWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: true, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-289.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-289.js index feef9e44ea..99c076e413 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-289.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-289.js @@ -19,11 +19,11 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "0", 10); - verifyWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: true, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js index 99ff4e802c..98ea2718c0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-290-1.js @@ -37,7 +37,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-290.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-290.js index bb6143ac58..561fbffa0b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-290.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-290.js @@ -31,7 +31,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js index 0bf6c88e69..31fb6864db 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-291-1.js @@ -36,7 +36,8 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-291.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-291.js index 17755a5de4..0c45b1da74 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-291.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-291.js @@ -31,7 +31,8 @@ includes: [propertyHelper.js] }); verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js index c4760e5ca9..5d0813068e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-292-1.js @@ -25,11 +25,10 @@ flags: [noStrict] throw new Test262Error('Expected a === 20, actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-292-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-292-2.js index c5c6b371ad..248de829fd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-292-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-292-2.js @@ -25,11 +25,10 @@ flags: [onlyStrict] throw new Test262Error('Expected a === 0, actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-292.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-292.js index 97aec8b7ca..064141d1f8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-292.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-292.js @@ -18,11 +18,11 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js index b9e13227ae..e81d44ba0e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-1.js @@ -20,11 +20,11 @@ includes: [propertyHelper.js] Object.defineProperty(arguments, "0", { value: 20 }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js index 98eb9586b7..742418ab40 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-2.js @@ -28,22 +28,19 @@ flags: [noStrict] throw new Test262Error("Expected an exception."); } catch (e) { - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js index 79a71fed67..b4960309b7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-3.js @@ -26,11 +26,10 @@ flags: [noStrict] throw new Test262Error('Expected "a === 10", actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-4.js index 4d8158fa2a..c972265591 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-293-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-293-4.js @@ -26,11 +26,10 @@ flags: [onlyStrict] throw new Test262Error('Expected "a === 0", actually ' + a); } - verifyEqualTo(arguments, "0", 20); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: true, + configurable: true, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-293.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-293.js index 25dae83a37..f0aee90af9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-293.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-293.js @@ -25,17 +25,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js index 4b40ae8e88..3e7a96bc3e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-294-1.js @@ -32,18 +32,15 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } - } + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-294.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-294.js index b6dc716f20..af51a8e3e3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-294.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-294.js @@ -24,17 +24,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js index 7e5b60dd1a..8fbda7692d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-295-1.js @@ -32,16 +32,15 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-295.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-295.js index c84bf1ed89..72090a9eb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-295.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-295.js @@ -24,17 +24,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js index dd632b8672..ccb305bc26 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-296-1.js @@ -31,16 +31,15 @@ flags: [noStrict] throw new Test262Error("Expected TypeError, got " + e); } - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (a !== 10) { throw new Test262Error('Expected "a === 10", actually ' + a); } } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-296.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-296.js index e6295ca2b1..a099fe1193 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-296.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-296.js @@ -24,17 +24,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 10); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js index 6f6b5b0d9e..d34ad9c407 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-297-1.js @@ -38,13 +38,13 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-297.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-297.js index 402c570c5e..8cc1e48f66 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-297.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-297.js @@ -32,13 +32,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js index 30dd1f884f..b9029e1026 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-298-1.js @@ -39,13 +39,13 @@ includes: [propertyHelper.js] verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-298.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-298.js index 5bb323da6a..e1b31e0699 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-298.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-298.js @@ -33,13 +33,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js index 00d3eeff30..4b9828cee9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-299-1.js @@ -33,13 +33,13 @@ includes: [propertyHelper.js] } verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-299.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-299.js index 9ef1eea060..88dc93adb7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-299.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-299.js @@ -28,13 +28,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js index a2e8fbb3e4..3fe724052e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-300-1.js @@ -33,13 +33,13 @@ includes: [propertyHelper.js] } verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-300.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-300.js index 094ebaf8ae..f1b2b3e00e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-300.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-300.js @@ -28,13 +28,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js index 34ee4e9274..33dfdab8a8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-301-1.js @@ -23,11 +23,11 @@ includes: [propertyHelper.js] if (a !== 0) { throw new Test262Error("Expected a === 0, actually " + a); } - verifyEqualTo(arguments, "0", 10); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-301.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-301.js index 6dc4637f91..320bd37928 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-301.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-301.js @@ -20,11 +20,11 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 10); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 10, + writable: false, + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js index fe96b1e9a4..04b4b96657 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-302-1.js @@ -36,7 +36,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-302.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-302.js index fd92a564fb..8c27ee8c9b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-302.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-302.js @@ -32,7 +32,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "0", "setVerifyHelpProp"); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }(0, 1, 2)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-303.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-303.js index 33605ec77a..1d62577a63 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-303.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-303.js @@ -32,7 +32,8 @@ includes: [propertyHelper.js] }); verifyEqualTo(arguments, "0", getFunc2()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-304.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-304.js index c775554aeb..e6ad749c6e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-304.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-304.js @@ -19,11 +19,11 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "0", 20); - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); + verifyProperty(arguments, "0", { + value: 20, + writable: false, + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-305.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-305.js index f0ed749b85..200c462286 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-305.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-305.js @@ -25,17 +25,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-306.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-306.js index 1ea0cc7311..c584ff8bd8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-306.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-306.js @@ -25,17 +25,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-307.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-307.js index 7269014ff7..377a8238f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-307.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-307.js @@ -25,17 +25,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: true, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-308.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-308.js index 04e0737d50..fb3d10677c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-308.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-308.js @@ -25,17 +25,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "0", 0); - - verifyNotWritable(arguments, "0"); - - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + value: 0, + writable: false, + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-309.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-309.js index f98793d004..6355fc5237 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-309.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-309.js @@ -33,13 +33,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc1()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-310.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-310.js index 8b72ae3ed3..5301b5790f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-310.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-310.js @@ -34,13 +34,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyNotEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: false, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-311.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-311.js index d743858af9..96bd605af6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-311.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-311.js @@ -29,13 +29,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-312.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-312.js index c3bf8b75a8..222d4eacbd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-312.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-312.js @@ -27,13 +27,13 @@ includes: [propertyHelper.js] } catch (e) { verifyEqualTo(arguments, "0", getFunc()); - verifyEnumerable(arguments, "0"); - - verifyNotConfigurable(arguments, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "0", { + enumerable: true, + configurable: false, + }); }()); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js index 7e90583b83..fec3c49041 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-313-1.js @@ -18,11 +18,11 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "genericProperty", 1001); - verifyWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-313.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-313.js index 05d378ee26..7c4221bf60 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-313.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-313.js @@ -18,11 +18,11 @@ includes: [propertyHelper.js] enumerable: true, configurable: true }); - verifyEqualTo(arguments, "genericProperty", 1001); - verifyWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js index 8ed0c58c06..006f87ed84 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-314-1.js @@ -29,7 +29,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: true, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-314.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-314.js index 9167077974..cc358abcd0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-314.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-314.js @@ -29,7 +29,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyEnumerable(arguments, "genericProperty"); - - verifyConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: true, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js index 6cc433db93..a9e78ba1d4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-315-1.js @@ -44,7 +44,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-315.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-315.js index 023026644b..9fd02954a1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-315.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-315.js @@ -40,7 +40,8 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "testgetFunction"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js index 3b84cf6e32..a6db83c83c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-316-1.js @@ -23,11 +23,11 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "genericProperty", 1002); - verifyWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-316.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-316.js index 5383d137e2..818a766504 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-316.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-316.js @@ -23,11 +23,11 @@ includes: [propertyHelper.js] enumerable: false, configurable: false }); - verifyEqualTo(arguments, "genericProperty", 1002); - verifyWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); + verifyProperty(arguments, "genericProperty", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js index bde6835e1f..e6b876e0bc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-317-1.js @@ -28,17 +28,15 @@ includes: [propertyHelper.js] throw new Test262Error('Expected "b === 2;", actually ' + b); } - verifyEqualTo(arguments, "genericProperty", 1001); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-317.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-317.js index 6c46d73ab6..845268cadb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-317.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-317.js @@ -23,17 +23,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", 1001); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js index 376ec4a966..5d84b965bf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-318-1.js @@ -23,17 +23,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-318.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-318.js index 9fdbfd57c0..f584bf1549 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-318.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-318.js @@ -22,19 +22,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js index 1d819cc170..0ec9b6dca2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-319-1.js @@ -23,18 +23,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-319.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-319.js index 3a9778eb9c..294da77ca6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-319.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-319.js @@ -22,17 +22,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: true, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js index cebb0b8342..7887cc1b87 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-320-1.js @@ -22,17 +22,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-320.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-320.js index 0502133f05..4c279919f3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-320.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-320.js @@ -21,19 +21,15 @@ includes: [propertyHelper.js] }); throw new Test262Error("Expected an exception."); } catch (e) { - verifyEqualTo(arguments, "genericProperty", undefined); - - verifyNotWritable(arguments, "genericProperty"); - - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js index 2a49eb3db5..c685519640 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-321-1.js @@ -41,13 +41,13 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "helpVerifyGet"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-321.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-321.js index f00c928059..3e8cbab153 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-321.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-321.js @@ -36,13 +36,13 @@ includes: [propertyHelper.js] verifyWritable(arguments, "genericProperty", "helpVerifyGet"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js index 918bf4b5dc..0bc23f8e2e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-322-1.js @@ -30,13 +30,13 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-322.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-322.js index a940aa506b..6190cf8b1c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-322.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-322.js @@ -29,13 +29,13 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js index 7bbe5d1d86..f5dbfc9a93 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-323-1.js @@ -32,14 +32,13 @@ includes: [propertyHelper.js] } verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-323.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-323.js index 38dd7166c7..5374376e12 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-323.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-323.js @@ -28,13 +28,13 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: true, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js index 8bb9cecb08..50d454cda4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-324-1.js @@ -28,13 +28,13 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-324.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-324.js index caab62dbe3..b6dfa0dca6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-324.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-324.js @@ -27,14 +27,13 @@ includes: [propertyHelper.js] } catch (e) { verifyWritable(arguments, "genericProperty", "genericPropertyString"); - verifyNotEnumerable(arguments, "genericProperty"); - - verifyNotConfigurable(arguments, "genericProperty"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } - false; + + verifyProperty(arguments, "genericProperty", { + enumerable: false, + configurable: false, + }); }(1, 2, 3)); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js index 40a30010e5..82248a8dd7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-1.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js index b6353b226b..1b0ccfa65f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-2.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js index 5b416a7602..e4792c0d61 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-3.js @@ -26,10 +26,9 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js index 0d2f0a3a2e..be87dae2e1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-6.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js index b32f5fc533..4af1ac7508 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-7.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "prop", { value: 1002 }); -verifyEqualTo(obj, "prop", 1002); - -verifyWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js index 4cebcc068e..48b06c206b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-333-8.js @@ -26,10 +26,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js index eebfebf57a..33255b2892 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-335.js @@ -18,6 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert.sameValue(obj.prop, 2010); +verifyProperty(obj, "prop", { + value: 2010, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js index bbcfa17b51..1aa5553fcd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-349.js @@ -18,6 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); -assert.sameValue(obj.prop, 2010); +verifyProperty(obj, "prop", { + value: 2010, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js index 250dde1b08..872d8c8eff 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-1.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js index 61ff2684d7..39b09c85c5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-10.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js index 0ee0d5a4ea..b0ff2cd779 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-11.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "prop", { value: 1002 }); -verifyEqualTo(obj, "prop", 1002); - -verifyNotWritable(obj, "prop"); - -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js index 780fee5e5e..1d5f11528a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-12.js @@ -26,10 +26,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js index ad1e8d85eb..58bdeb586f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-15.js @@ -19,5 +19,7 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js index 7432ccdd39..1d51c6d30d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-16.js @@ -22,5 +22,7 @@ Object.defineProperty(obj, "0", { configurable: true }); -assert.sameValue(obj[0], 2010); -verifyNotWritable(obj, "0"); +verifyProperty(obj, "0", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js index 46bf18f417..c5cf9884fa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-2.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "0", { value: 1002 }); -verifyEqualTo(obj, "0", 1002); - -verifyNotWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js index f1f5cb86c6..207428e773 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-3.js @@ -25,10 +25,9 @@ Object.defineProperty(obj, "property", { value: 1002 }); -verifyEqualTo(obj, "property", 1002); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1002, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js index 0b48c16cce..8ca806d607 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-6.js @@ -19,5 +19,7 @@ Object.defineProperty(obj, "0", { configurable: true }); -assert.sameValue(obj[0], 2010); -verifyNotWritable(obj, "0"); +verifyProperty(obj, "0", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js index 81fb76e893..d3a5d0c80c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354-7.js @@ -21,5 +21,7 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js index 712fde363c..14adbea136 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-354.js @@ -18,5 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js index 069e007cf6..7127f98de0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-361.js @@ -18,5 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js index 17f928bda2..b9f770412d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-363.js @@ -18,5 +18,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js index 96db2fbedd..2ba32faf91 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-368.js @@ -18,5 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: true }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js index 93537a5aeb..57ced4e58b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-375.js @@ -18,5 +18,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert.sameValue(obj.prop, 2010); -verifyNotWritable(obj, "prop"); +verifyProperty(obj, "prop", { + value: 2010, + writable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js index 7e748275db..2d58b1518e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-377.js @@ -18,5 +18,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-38.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-38.js index 8a2d9ccfd2..867de469ab 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-38.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-38.js @@ -16,13 +16,12 @@ try { configurable: true }); - verifyEqualTo(Math, "foo", 12); - - verifyNotWritable(Math, "foo"); - - verifyNotEnumerable(Math, "foo"); - - verifyConfigurable(Math, "foo"); + verifyProperty(Math, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, + }); } finally { delete Math.foo; } diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-41.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-41.js index b9c4cb1be7..e066d7666a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-41.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-41.js @@ -16,12 +16,11 @@ Object.defineProperty(JSON, "foo", { configurable: true }); -verifyEqualTo(JSON, "foo", 12); - -verifyNotWritable(JSON, "foo"); - -verifyNotEnumerable(JSON, "foo"); - -verifyConfigurable(JSON, "foo"); +verifyProperty(JSON, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); delete JSON.foo; diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js index a81c5f63d3..5b153dc5b0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-429.js @@ -24,9 +24,9 @@ var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); -verifyNotConfigurable(obj, "prop"); assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -assert(obj.hasOwnProperty("prop")); + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js index 30d4a32574..e40d7f5a96 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-434.js @@ -19,10 +19,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js index 1ccc9f436d..8dab30577a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-438.js @@ -30,12 +30,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js index 29400f464f..6a8a1980f7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-447.js @@ -25,10 +25,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-45.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-45.js index 20fabf0abd..1c89f2b36f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-45.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-45.js @@ -15,10 +15,9 @@ Object.defineProperty(this, "foo", { configurable: true }); -verifyEqualTo(this, "foo", 12); - -verifyNotWritable(this, "foo"); - -verifyNotEnumerable(this, "foo"); - -verifyConfigurable(this, "foo"); +verifyProperty(this, "foo", { + value: 12, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js index e180f9c4c3..fef129c1fe 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-452.js @@ -19,10 +19,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js index 996b566cfc..ef38d377b1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-456.js @@ -30,12 +30,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js index 52e31f678e..98894492c8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-465.js @@ -30,10 +30,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-47.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-47.js index 079b505170..5dd798a8d8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-47.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-47.js @@ -18,10 +18,9 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", undefined); - -verifyWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: undefined, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js index d725daa996..cb40023f87 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-470.js @@ -26,11 +26,8 @@ Object.defineProperty(obj, "prop", { assert(obj.hasOwnProperty("prop")); -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - verifyNotWritable(obj, "prop"); -verifyNotConfigurable(obj, "prop"); -assert.sameValue(desc.configurable, false); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js index 20533735ab..edb4238dfc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-474.js @@ -35,12 +35,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-48.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-48.js index 14b658aad7..6913271426 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-48.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-48.js @@ -18,10 +18,9 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", 1001); - -verifyNotWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: false, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js index f957a1dd03..fce4fe4043 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-483.js @@ -30,11 +30,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js index feb1564289..7c8e8b1639 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-488.js @@ -24,11 +24,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -verifyNotConfigurable(obj, "prop"); -assert.sameValue(desc.configurable, false); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-49.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-49.js index 98db24fdda..f8fd685677 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-49.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-49.js @@ -17,10 +17,10 @@ Object.defineProperty(obj, "property", { writable: true, configurable: true }); -verifyEqualTo(obj, "property", 1001); -verifyWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js index 55d5e0cbf7..e98d9505a5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-492.js @@ -35,12 +35,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-50.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-50.js index 71b2c8d1ab..84d2c5cbd1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-50.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-50.js @@ -17,10 +17,10 @@ Object.defineProperty(obj, "property", { writable: true, enumerable: true }); -verifyEqualTo(obj, "property", 1001); -verifyWritable(obj, "property"); - -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js index 8e08bb9076..1b10f4c4d8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-501.js @@ -29,12 +29,10 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); verifyNotWritable(obj, "prop"); -verifyNotConfigurable(obj, "prop"); -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js index 0156fa1bae..c9cb84f8e4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-506.js @@ -23,12 +23,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); - -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-51.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-51.js index 58b2ff240a..d2292c4345 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-51.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-51.js @@ -20,10 +20,9 @@ Object.defineProperty(obj, "property", { configurable: false }); -verifyEqualTo(obj, "property", 1001); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: 1001, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js index af4e5108e7..8b6ed9cb20 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-510.js @@ -34,12 +34,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js index 98382e84f3..9eec73636e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-519.js @@ -29,11 +29,8 @@ Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-52.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-52.js index 1908bdf015..3c24d642d6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-52.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-52.js @@ -14,10 +14,9 @@ var obj = {}; Object.defineProperty(obj, "property", {}); -verifyEqualTo(obj, "property", undefined); - -verifyNotWritable(obj, "property"); - -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + value: undefined, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js index 0020bc962e..01a43a11c7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-524.js @@ -23,11 +23,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -var desc = Object.getOwnPropertyDescriptor(obj, "prop"); - -assert.sameValue(desc.configurable, false); - -verifyNotConfigurable(obj, "prop"); - -assert(obj.hasOwnProperty("prop")); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js index c53535ba5f..2dfe6744c3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-528.js @@ -34,12 +34,9 @@ try { } catch (e) { assert(e instanceof TypeError); - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc1.configurable, false); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); - - assert(obj.hasOwnProperty("prop")); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-53.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-53.js index 454f0f8f5f..c7c66cbbaf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-53.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-53.js @@ -23,6 +23,7 @@ Object.defineProperty(obj, "property", { verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js index e24cd71d19..3c29b578dc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-1.js @@ -40,6 +40,7 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction1"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js index 9d6ac91a6c..207c04853b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-10.js @@ -42,6 +42,7 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js index ed85b1d960..a40275041b 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-11.js @@ -41,6 +41,7 @@ verifyEqualTo(obj, "prop", getFunc()); verifyWritable(obj, "prop", "verifySetFunction1"); -verifyNotEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js index 2cb8b6a77c..fbd47b4416 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-12.js @@ -43,6 +43,7 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js index 16bd7a1994..09e8538483 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-2.js @@ -42,6 +42,7 @@ verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction1"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js index cc97b6371a..fb42381143 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-531-3.js @@ -43,6 +43,7 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction1"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-537.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-537.js index 15de96a3d0..3c14595768 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-537.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-537.js @@ -34,9 +34,9 @@ var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); Object.defineProperty(obj, "prop", { configurable: false }); -var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); -verifyNotConfigurable(obj, "prop"); assert.sameValue(desc1.configurable, true); -assert.sameValue(desc2.configurable, false); -assert(obj.hasOwnProperty("prop")); + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js index 585a7a6c0d..b416039d96 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-1.js @@ -54,6 +54,7 @@ verifyEqualTo(obj, "0", 1001); verifyNotWritable(obj, "0"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js index 7e7a31eb01..6049cfe013 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-2.js @@ -56,6 +56,7 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js index 86e3bc4186..893b38a959 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-5.js @@ -55,6 +55,7 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js index 5f90f5676a..1569f7dbd7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-538-6.js @@ -56,6 +56,7 @@ verifyEqualTo(obj, "0", 1001); verifyNotWritable(obj, "0"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-538.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-538.js index 16f883a9b4..81f9a66aed 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-538.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-538.js @@ -51,6 +51,7 @@ verifyEqualTo(obj, "prop", 1001); verifyNotWritable(obj, "prop"); -verifyEnumerable(obj, "prop"); - -verifyConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-54.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-54.js index 6fa06bee3b..76ffb46bbf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-54.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-54.js @@ -26,5 +26,7 @@ assert.sameValue(obj.property, "property"); var desc = Object.getOwnPropertyDescriptor(obj, "property"); assert.sameValue(typeof desc.set, "undefined"); -verifyNotEnumerable(obj, "property"); -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js index 0a9fea9843..f5f0f63fb3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-1.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction"); - - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "property", { set: function(value) { @@ -59,12 +60,12 @@ try { verifyWritable(obj, "property", "verifySetFunction"); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js index 14b503ae68..fa89541ef2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-2.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -59,12 +60,12 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js index 507a9f6ab8..fb35825d33 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-3.js @@ -39,12 +39,13 @@ try { verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "verifySetFunction"); - - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); } +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "property", { set: function(value) { @@ -61,12 +62,12 @@ try { verifyWritable(obj, "property", "verifySetFunction"); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js index cb6c76f337..83c8ed5636 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-6.js @@ -39,12 +39,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -60,13 +61,12 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js index edd742881c..5050fa0768 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-7.js @@ -38,12 +38,13 @@ try { verifyEqualTo(obj, "prop", getFunc()); verifyWritable(obj, "prop", "verifySetFunction"); - - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); } +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "prop", { set: function(value) { @@ -60,13 +61,12 @@ try { verifyWritable(obj, "prop", "verifySetFunction"); - verifyNotEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - - if (!(e1 instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e1); } - } + +verifyProperty(obj, "prop", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js index ab4b8c8b0e..66923975f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-540-8.js @@ -40,12 +40,13 @@ try { verifyEqualTo(obj, "0", getFunc()); verifyWritable(obj, "0", "verifySetFunction"); - - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); } +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); + try { Object.defineProperty(obj, "0", { set: function(value) { @@ -61,12 +62,12 @@ try { verifyWritable(obj, "0", "verifySetFunction"); - verifyNotEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-542.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-542.js index 900872e59d..63bc7484c7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-542.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-542.js @@ -28,5 +28,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-546.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-546.js index 4bcc2a7234..4e5c3161d3 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-546.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-546.js @@ -29,6 +29,7 @@ Object.defineProperty(obj, "prop", { configurable: false }); var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); +assert.sameValue(desc1.configurable, false); try { Object.defineProperty(obj, "prop", { @@ -38,10 +39,8 @@ try { throw new Test262Error("Expected TypeError"); } catch (e) { assert(e instanceof TypeError); - assert.sameValue(desc1.configurable, false); - - var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); - assert.sameValue(desc2.configurable, false); - - verifyNotConfigurable(obj, "prop"); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js index ddcb88bea7..5bd0c31130 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-1.js @@ -51,13 +51,12 @@ try { verifyWritable(obj, "0", "verifySetFunc"); - verifyEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js index f555557321..c61deba9d6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-2.js @@ -53,13 +53,12 @@ try { verifyWritable(obj, "prop", "verifySetFunc"); - verifyEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js index fa61275260..ca9005eec2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-3.js @@ -51,12 +51,13 @@ try { verifyWritable(obj, "prop", "verifySetFunc"); - verifyEnumerable(obj, "prop"); - - verifyNotConfigurable(obj, "prop"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } } + +verifyProperty(obj, "prop", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js index a2af81f61a..0e7858cee8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-547-4.js @@ -51,13 +51,12 @@ try { verifyWritable(obj, "0", "verifySetFunc"); - verifyEnumerable(obj, "0"); - - verifyNotConfigurable(obj, "0"); - - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-55.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-55.js index 3453d91984..029f8804cf 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-55.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-55.js @@ -28,6 +28,7 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "property"); - -verifyConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-555.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-555.js index 89dbef084e..191c9d45a0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-555.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-555.js @@ -36,4 +36,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-56.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-56.js index 6e0ccaa92e..347fbb74af 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-56.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-56.js @@ -27,6 +27,7 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-560.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-560.js index 75751e6f39..5d1a6d5e47 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-560.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-560.js @@ -28,5 +28,6 @@ Object.defineProperty(obj, "prop", { configurable: false }); -assert(obj.hasOwnProperty("prop")); -verifyNotConfigurable(obj, "prop"); +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-564.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-564.js index 7b17cd4992..7145fbb1e0 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-564.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-564.js @@ -28,7 +28,6 @@ Object.defineProperty(obj, "prop", { enumerable: false, configurable: false }); -var desc1 = Object.getOwnPropertyDescriptor(obj, "prop"); try { Object.defineProperty(obj, "prop", { @@ -38,6 +37,8 @@ try { throw new Test262Error("Expected TypeError"); } catch (e) { assert(e instanceof TypeError); - assert.sameValue(desc1.configurable, false); - verifyNotConfigurable(obj, "prop"); } + +verifyProperty(obj, "prop", { + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-57.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-57.js index e94a09d884..30d3ccce9e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-57.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-57.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "property", getFunc()); verifyWritable(obj, "property", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "property"); - -verifyNotConfigurable(obj, "property"); +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-58.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-58.js index 4fa1be7baa..e20c4bb661 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-58.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-58.js @@ -15,10 +15,10 @@ var obj = {}; obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true Object.defineProperty(obj, "foo", {}); -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/defineProperty/15.2.3.6-4-59.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-59.js index e8eeb3ca6d..c855746479 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-59.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-59.js @@ -30,6 +30,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-60.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-60.js index 12e6d66daa..a65224074e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-60.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-60.js @@ -17,10 +17,10 @@ obj.foo = 101; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { value: "abc" }); -verifyEqualTo(obj, "foo", "abc"); -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: "abc", + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-61.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-61.js index 59ece60977..1adaf2312c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-61.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-61.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-62.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-62.js index 34ae7d592b..8cee359add 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-62.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-62.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-63.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-63.js index a336364bb1..42ae257345 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-63.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-63.js @@ -19,10 +19,9 @@ Object.defineProperty(obj, "foo", { value: NaN }); -assert.sameValue(obj.foo, NaN); - -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-64.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-64.js index ea10286897..6dc9e027df 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-64.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-64.js @@ -23,16 +23,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/defineProperty/15.2.3.6-4-65.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-65.js index 02d0c6ffe3..4488dce8bc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-65.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-65.js @@ -22,16 +22,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/defineProperty/15.2.3.6-4-66.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-66.js index 457c20314a..b0b14902c8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-66.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-66.js @@ -17,10 +17,10 @@ obj.foo = 101; // default value of attributes: writable: true, configurable: tru Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-67.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-67.js index 5331d82f41..3b249540bc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-67.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-67.js @@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-68.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-68.js index 8f3f2a3acc..6c8d82a018 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-68.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-68.js @@ -17,10 +17,10 @@ obj.foo = "abcd"; // default value of attributes: writable: true, configurable: Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-69.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-69.js index a7b26daf98..423367cf30 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-69.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-69.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-70.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-70.js index 716f34d96f..c9ea278925 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-70.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-70.js @@ -17,10 +17,10 @@ obj.foo = true; // default value of attributes: writable: true, configurable: tr Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-71.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-71.js index ec1d4d9b92..9e3b96be44 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-71.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-71.js @@ -23,10 +23,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-72.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-72.js index c0acc806fd..0bdb4c64ab 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-72.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-72.js @@ -24,10 +24,10 @@ var obj2 = { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-73.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-73.js index eb436b8ff4..5ce4b4b6be 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-73.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-73.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-74.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-74.js index 6a413f5ab6..ad273ae636 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-74.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-74.js @@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { writable: 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/defineProperty/15.2.3.6-4-75.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-75.js index 833298e2a9..268f684cb8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-75.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-75.js @@ -32,6 +32,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-76.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-76.js index 7473dbac8e..76f56c3d53 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-76.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-76.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", getFunc2()); verifyWritable(obj, "foo", "helpVerifySet"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-77.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-77.js index 4dbddfefab..810b8c960d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-77.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-77.js @@ -25,6 +25,7 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-78.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-78.js index e49b9787db..b2ff3f88bc 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-78.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-78.js @@ -28,6 +28,7 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-79.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-79.js index 62476d0bc9..e8c1b23e1e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-79.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-79.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: 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/defineProperty/15.2.3.6-4-80.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-80.js index c71b320e5f..60b6928971 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-80.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-80.js @@ -20,10 +20,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", undefined); -verifyNotWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: undefined, + writable: false, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-81.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-81.js index 26939a862f..a2db14ffbb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-81.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-81.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { configurable: 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/defineProperty/15.2.3.6-4-82-1.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js index f7e965c621..c744e4f9db 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-1.js @@ -27,10 +27,9 @@ Object.defineProperty(obj, "foo", { enumerable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js index ee190b0242..dfd336f892 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-10.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js index 293711b618..1c9de3d2e1 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-11.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js index 7c20a6c1ae..abfcf193fd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-12.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js index d7905a3f12..230a80c257 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-13.js @@ -27,10 +27,9 @@ Object.defineProperty(obj, "0", { enumerable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js index d3c9a5a46c..752852bcb6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-14.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "0", { configurable: true }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js index d03591c065..4d7b20a203 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-15.js @@ -26,10 +26,9 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js index 5f2f3bf393..8b030757aa 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-16.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js index c999cf1bbd..ca6020f2d5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-17.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "0", { configurable: false }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js index 7aead07eef..b4de9144ef 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-18.js @@ -27,10 +27,9 @@ Object.defineProperty(obj, "0", { enumerable: true }); -verifyEqualTo(obj, "0", 1001); - -verifyWritable(obj, "0"); - -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js index 54fcb81c56..5f4e4a6a9c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-19.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js index be51111350..14bff7a45d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-2.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "foo", { configurable: true }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js index 7ab7217985..a65a115a55 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-20.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js index 629a5e9dfe..b7da9b9853 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-21.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js index cd26dfba0d..30add35846 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-22.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js index 137b1ba4ce..8eacd6e77c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-23.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyNotEnumerable(obj, "0"); - -verifyNotConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js index 8bb8149144..13b2877d4e 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-24.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "0", get_func()); verifyWritable(obj, "0", "verifySetFunction"); -verifyEnumerable(obj, "0"); - -verifyConfigurable(obj, "0"); +verifyProperty(obj, "0", { + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js index af0980148a..3a2b495790 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-3.js @@ -26,10 +26,9 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js index 0d11ba790c..ab1e03c90f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-4.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js index cc9bb95f22..b9d6b8d486 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-5.js @@ -28,10 +28,9 @@ Object.defineProperty(obj, "foo", { configurable: false }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js index 15ee855b7c..0f36fef30d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-6.js @@ -27,10 +27,9 @@ Object.defineProperty(obj, "foo", { enumerable: true }); -verifyEqualTo(obj, "foo", 1001); - -verifyWritable(obj, "foo"); - -verifyEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: 1001, + writable: true, + enumerable: true, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js index 9d6c0c23bf..f02c637868 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-7.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js index 230531fd86..de5b2af1f6 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-8.js @@ -38,6 +38,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyNotEnumerable(obj, "foo"); - -verifyConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js index 2d660c23c4..67f88fff3d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82-9.js @@ -37,6 +37,7 @@ verifyEqualTo(obj, "foo", get_func()); verifyWritable(obj, "foo", "verifySetFunction"); -verifyEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: true, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-82.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-82.js index 71081cb23f..64e0e5fe5f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-82.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-82.js @@ -19,10 +19,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { configurable: 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/defineProperty/15.2.3.6-4-83.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-83.js index 6bcec607fb..f1c90b20ca 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-83.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-83.js @@ -24,10 +24,10 @@ Object.defineProperty(obj, "foo", { writable: false, configurable: 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/defineProperty/15.2.3.6-4-84.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-84.js index 701d3ef464..ed2db7a4ca 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-84.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-84.js @@ -24,10 +24,10 @@ Object.defineProperty(obj, "foo", { writable: false, configurable: false }); -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/defineProperty/15.2.3.6-4-85.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-85.js index 7499fb8b5a..71e1ed48bb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-85.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-85.js @@ -24,10 +24,9 @@ Object.defineProperty(obj, "foo", { configurable: false }); -assert.sameValue(obj.foo, NaN); - -verifyNotWritable(obj, "foo"); - -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + value: NaN, + writable: false, + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-86.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-86.js index ea1b1b3986..619d57e22f 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-86.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-86.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/defineProperty/15.2.3.6-4-87.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-87.js index 4a2890f390..0c1467a7b7 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-87.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-87.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/defineProperty/15.2.3.6-4-88.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-88.js index fb949aa349..588ab8fbcb 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-88.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-88.js @@ -23,10 +23,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-89.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-89.js index 19ecac3f59..64ac53baa2 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-89.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-89.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/defineProperty/15.2.3.6-4-90.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-90.js index 9466f4b070..d5922842f8 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-90.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-90.js @@ -23,10 +23,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-91.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-91.js index 20d3d198f9..55e257d06a 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-91.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-91.js @@ -25,16 +25,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/defineProperty/15.2.3.6-4-92.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-92.js index 925c95364c..481dd5654c 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-92.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-92.js @@ -23,10 +23,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-93.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-93.js index 0c693d7dd1..262e570edd 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-93.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-93.js @@ -25,16 +25,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/defineProperty/15.2.3.6-4-94.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-94.js index ab9e265987..0973134124 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-94.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-94.js @@ -27,10 +27,10 @@ Object.defineProperty(obj, "foo", { Object.defineProperty(obj, "foo", { 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/defineProperty/15.2.3.6-4-95.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-95.js index bc7e45b0d5..b70d518ee5 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-95.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-95.js @@ -34,16 +34,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/defineProperty/15.2.3.6-4-96.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-96.js index 0f8ebadfad..2fe228d84d 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-96.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-96.js @@ -27,6 +27,7 @@ Object.defineProperty(obj, "foo", { }); verifyWritable(obj, "foo", "setVerifyHelpProp"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-97.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-97.js index 38ef4724f0..1d76f315ac 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-97.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-97.js @@ -33,12 +33,12 @@ try { } catch (e) { verifyEqualTo(obj, "property", getFunc()); - verifyNotEnumerable(obj, "property"); - - verifyNotConfigurable(obj, "property"); - if (!(e instanceof TypeError)) { throw new Test262Error("Expected TypeError, got " + e); } - } + +verifyProperty(obj, "property", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-98.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-98.js index eb0f2a07cf..583ad4adf9 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-98.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-98.js @@ -35,6 +35,7 @@ verifyEqualTo(obj, "foo", getFunc()); verifyWritable(obj, "foo", "verifyGetHelpMethod"); -verifyNotEnumerable(obj, "foo"); - -verifyNotConfigurable(obj, "foo"); +verifyProperty(obj, "foo", { + enumerable: false, + configurable: false, +}); diff --git a/test/built-ins/Object/defineProperty/15.2.3.6-4-99.js b/test/built-ins/Object/defineProperty/15.2.3.6-4-99.js index 8aaba926f1..c5de2003f4 100644 --- a/test/built-ins/Object/defineProperty/15.2.3.6-4-99.js +++ b/test/built-ins/Object/defineProperty/15.2.3.6-4-99.js @@ -35,12 +35,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/defineProperty/name.js b/test/built-ins/Object/defineProperty/name.js index e722dd90e5..89d4b5858a 100644 --- a/test/built-ins/Object/defineProperty/name.js +++ b/test/built-ins/Object/defineProperty/name.js @@ -19,8 +19,9 @@ info: | includes: [propertyHelper.js] ---*/ -assert.sameValue(Object.defineProperty.name, "defineProperty"); - -verifyNotEnumerable(Object.defineProperty, "name"); -verifyNotWritable(Object.defineProperty, "name"); -verifyConfigurable(Object.defineProperty, "name"); +verifyProperty(Object.defineProperty, "name", { + value: "defineProperty", + writable: false, + enumerable: false, + configurable: true, +});