From 4facaaab5ffdbbe75047c8af6c59339068cb6968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Tue, 11 Aug 2015 17:50:53 +0200 Subject: [PATCH] Replace runTestCase with assert helpers [test/built-ins/Object/create] --- test/built-ins/Object/create/15.2.3.5-0-1.js | 8 +------- test/built-ins/Object/create/15.2.3.5-0-2.js | 8 +------- test/built-ins/Object/create/15.2.3.5-2-1.js | 8 +------- test/built-ins/Object/create/15.2.3.5-2-2.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-3-1.js | 10 ++-------- test/built-ins/Object/create/15.2.3.5-4-1.js | 18 ++++++------------ test/built-ins/Object/create/15.2.3.5-4-102.js | 9 ++------- test/built-ins/Object/create/15.2.3.5-4-105.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-106.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-11.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-112.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-113.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-114.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-115.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-116.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-118.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-119.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-12.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-121.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-122.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-127.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-133.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-134.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-136.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-137.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-138.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-139.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-14.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-140.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-141.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-142.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-143.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-144.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-145.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-146.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-147.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-149.js | 11 +++-------- test/built-ins/Object/create/15.2.3.5-4-15.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-150.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-151.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-152.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-153.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-154.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-155.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-156.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-157.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-158.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-159.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-16.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-160.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-161.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-162.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-163.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-164.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-165.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-166.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-167.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-168.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-169.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-17.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-171.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-172.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-174.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-175.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-178.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-18.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-180.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-181.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-182.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-183.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-184.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-185.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-186.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-187.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-19.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-191.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-192.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-193.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-194.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-195.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-197.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-198.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-2.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-20.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-200.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-201.js | 9 ++------- test/built-ins/Object/create/15.2.3.5-4-206.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-21.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-212.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-213.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-215.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-216.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-217.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-218.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-219.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-22.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-220.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-221.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-222.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-223.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-224.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-225.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-226.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-228.js | 11 +++-------- test/built-ins/Object/create/15.2.3.5-4-229.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-23.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-230.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-231.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-232.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-233.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-234.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-235.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-236.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-237.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-238.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-239.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-24.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-240.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-241.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-242.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-243.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-244.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-245.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-246.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-247.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-248.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-249.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-25.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-250.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-253.js | 6 +----- test/built-ins/Object/create/15.2.3.5-4-254.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-257.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-263.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-266.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-268.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-269.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-270.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-271.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-272.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-273.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-274.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-275.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-276.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-277.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-278.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-279.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-28.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-280.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-281.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-282.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-283.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-285.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-286.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-288.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-289.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-29.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-298.js | 7 ++----- test/built-ins/Object/create/15.2.3.5-4-30.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-308.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-31.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-310.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-311.js | 9 ++++----- test/built-ins/Object/create/15.2.3.5-4-312.js | 8 +++----- test/built-ins/Object/create/15.2.3.5-4-314.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-316.js | 10 ++++------ test/built-ins/Object/create/15.2.3.5-4-32.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-34.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-35.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-37.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-38.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-4.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-46.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-47.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-48.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-49.js | 7 +------ test/built-ins/Object/create/15.2.3.5-4-5.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-50.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-51.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-52.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-53.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-54.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-55.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-56.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-57.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-58.js | 9 ++------- test/built-ins/Object/create/15.2.3.5-4-59.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-6.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-60.js | 9 ++------- test/built-ins/Object/create/15.2.3.5-4-61.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-62.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-63.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-65.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-66.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-68.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-69.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-7.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-72.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-73.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-74.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-75.js | 10 +++------- test/built-ins/Object/create/15.2.3.5-4-76.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-77.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-78.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-79.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-8.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-80.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-81.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-82.js | 9 +++------ test/built-ins/Object/create/15.2.3.5-4-83.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-84.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-85.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-86.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-87.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-88.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-89.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-9.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-90.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-91.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-92.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-93.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-94.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-96.js | 11 +++-------- test/built-ins/Object/create/15.2.3.5-4-97.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-98.js | 8 ++------ test/built-ins/Object/create/15.2.3.5-4-99.js | 8 ++------ 225 files changed, 434 insertions(+), 1331 deletions(-) diff --git a/test/built-ins/Object/create/15.2.3.5-0-1.js b/test/built-ins/Object/create/15.2.3.5-0-1.js index 0e0b8faa55..1f3fd1d5e8 100644 --- a/test/built-ins/Object/create/15.2.3.5-0-1.js +++ b/test/built-ins/Object/create/15.2.3.5-0-1.js @@ -4,12 +4,6 @@ /*--- es5id: 15.2.3.5-0-1 description: Object.create must exist as a function -includes: [runTestCase.js] ---*/ -function testcase() { - if (typeof(Object.create) === "function") { - return true; - } - } -runTestCase(testcase); +assert.sameValue(typeof(Object.create), "function", 'typeof(Object.create)'); diff --git a/test/built-ins/Object/create/15.2.3.5-0-2.js b/test/built-ins/Object/create/15.2.3.5-0-2.js index 5ac3e1cc56..9efc5865b7 100644 --- a/test/built-ins/Object/create/15.2.3.5-0-2.js +++ b/test/built-ins/Object/create/15.2.3.5-0-2.js @@ -4,12 +4,6 @@ /*--- es5id: 15.2.3.5-0-2 description: Object.create must exist as a function taking 2 parameters -includes: [runTestCase.js] ---*/ -function testcase() { - if (Object.create.length === 2) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(Object.create.length, 2, 'Object.create.length'); diff --git a/test/built-ins/Object/create/15.2.3.5-2-1.js b/test/built-ins/Object/create/15.2.3.5-2-1.js index 62bc8a406b..02f15d1641 100644 --- a/test/built-ins/Object/create/15.2.3.5-2-1.js +++ b/test/built-ins/Object/create/15.2.3.5-2-1.js @@ -7,17 +7,11 @@ info: > This can be checked using isPrototypeOf, or getPrototypeOf. es5id: 15.2.3.5-2-1 description: Object.create creates new Object -includes: [runTestCase.js] ---*/ -function testcase() { function base() {} var b = new base(); var prop = new Object(); var d = Object.create(b); - if (typeof d === 'object') { - return true; - } - } -runTestCase(testcase); +assert.sameValue(typeof d, 'object', 'typeof d'); diff --git a/test/built-ins/Object/create/15.2.3.5-2-2.js b/test/built-ins/Object/create/15.2.3.5-2-2.js index e77abf322b..d853baffe8 100644 --- a/test/built-ins/Object/create/15.2.3.5-2-2.js +++ b/test/built-ins/Object/create/15.2.3.5-2-2.js @@ -4,12 +4,8 @@ /*--- es5id: 15.2.3.5-2-2 description: Object.create - returned object is an instance of Object -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}); - return newObj instanceof Object; - } -runTestCase(testcase); + +assert(newObj instanceof Object, 'newObj instanceof Object !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-3-1.js b/test/built-ins/Object/create/15.2.3.5-3-1.js index c6967e6eb0..9c2b102d58 100644 --- a/test/built-ins/Object/create/15.2.3.5-3-1.js +++ b/test/built-ins/Object/create/15.2.3.5-3-1.js @@ -7,17 +7,11 @@ info: > This can be checked using isPrototypeOf, or getPrototypeOf. es5id: 15.2.3.5-3-1 description: Object.create sets the prototype of the passed-in object -includes: [runTestCase.js] ---*/ -function testcase() { function base() {} var b = new base(); var d = Object.create(b); - if (Object.getPrototypeOf(d) === b && - b.isPrototypeOf(d) === true) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(Object.getPrototypeOf(d), b, 'Object.getPrototypeOf(d)'); +assert.sameValue(b.isPrototypeOf(d), true, 'b.isPrototypeOf(d)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-1.js b/test/built-ins/Object/create/15.2.3.5-4-1.js index 7f250d3e97..ca2046b383 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-1.js +++ b/test/built-ins/Object/create/15.2.3.5-4-1.js @@ -9,23 +9,17 @@ es5id: 15.2.3.5-4-1 description: > Object.create sets the prototype of the passed-in object and adds new properties -includes: [runTestCase.js] ---*/ -function testcase() { function base() {} var b = new base(); var prop = new Object(); var d = Object.create(b,{ "x": {value: true,writable: false}, "y": {value: "str",writable: false} }); - if (Object.getPrototypeOf(d) === b && - b.isPrototypeOf(d) === true && - d.x === true && - d.y === "str" && - b.x === undefined && - b.y === undefined) { - return true; - } - } -runTestCase(testcase); +assert.sameValue(Object.getPrototypeOf(d), b, 'Object.getPrototypeOf(d)'); +assert.sameValue(b.isPrototypeOf(d), true, 'b.isPrototypeOf(d)'); +assert.sameValue(d.x, true, 'd.x'); +assert.sameValue(d.y, "str", 'd.y'); +assert.sameValue(b.x, undefined, 'b.x'); +assert.sameValue(b.y, undefined, 'b.y'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-102.js b/test/built-ins/Object/create/15.2.3.5-4-102.js index def14e6885..d8fbe1baa5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-102.js +++ b/test/built-ins/Object/create/15.2.3.5-4-102.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-102 description: > Object.create - 'configurable' property of one property in 'Properties' is an inherited data property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { configurable: true }; @@ -27,7 +24,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-105.js b/test/built-ins/Object/create/15.2.3.5-4-105.js index eb3ad68438..afff08cca5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-105.js +++ b/test/built-ins/Object/create/15.2.3.5-4-105.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-105 description: > Object.create - 'configurable' property of one property in 'Properties' is own accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = {}; Object.defineProperty(descObj, "configurable", { get: function () { @@ -25,6 +22,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-106.js b/test/built-ins/Object/create/15.2.3.5-4-106.js index ed6221dec2..721181e09f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-106.js +++ b/test/built-ins/Object/create/15.2.3.5-4-106.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-106 description: > Object.create - 'configurable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "configurable", { @@ -30,6 +27,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-11.js b/test/built-ins/Object/create/15.2.3.5-4-11.js index 7c4f1af774..4dbd85f61e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-11.js +++ b/test/built-ins/Object/create/15.2.3.5-4-11.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-11 description: > Object.create - argument 'Properties' is a Date object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Date(); var result = false; @@ -22,6 +19,6 @@ function testcase() { enumerable: true }); var newObj = Object.create({}, props); - return result && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(result, 'result !== true'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-112.js b/test/built-ins/Object/create/15.2.3.5-4-112.js index d211e3eff2..81b491fb26 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-112.js +++ b/test/built-ins/Object/create/15.2.3.5-4-112.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = function () { }; descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-113.js b/test/built-ins/Object/create/15.2.3.5-4-113.js index e049947523..26b9e86982 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-113.js +++ b/test/built-ins/Object/create/15.2.3.5-4-113.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = []; descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-114.js b/test/built-ins/Object/create/15.2.3.5-4-114.js index c1a7928ba0..6ddb9994d7 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-114.js +++ b/test/built-ins/Object/create/15.2.3.5-4-114.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new String(); descObj.configurable = true; @@ -23,6 +20,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-115.js b/test/built-ins/Object/create/15.2.3.5-4-115.js index e11ba97053..d7ad3da624 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-115.js +++ b/test/built-ins/Object/create/15.2.3.5-4-115.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new Boolean(false); descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-116.js b/test/built-ins/Object/create/15.2.3.5-4-116.js index 0dc11eeec7..861bd8b655 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-116.js +++ b/test/built-ins/Object/create/15.2.3.5-4-116.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new Number(-9); descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-118.js b/test/built-ins/Object/create/15.2.3.5-4-118.js index 3c5a909306..7fcd8a59d4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-118.js +++ b/test/built-ins/Object/create/15.2.3.5-4-118.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new Date(); descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-119.js b/test/built-ins/Object/create/15.2.3.5-4-119.js index a6582eb755..2d92b08bb4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-119.js +++ b/test/built-ins/Object/create/15.2.3.5-4-119.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new RegExp(); descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-12.js b/test/built-ins/Object/create/15.2.3.5-4-12.js index 91af8ba5eb..fd7b0a164a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-12.js +++ b/test/built-ins/Object/create/15.2.3.5-4-12.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-12 description: > Object.create - argument 'Properties' is a RegExp object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new RegExp(); var result = false; @@ -22,6 +19,6 @@ function testcase() { enumerable: true }); var newObj = Object.create({}, props); - return result && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(result, 'result !== true'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-121.js b/test/built-ins/Object/create/15.2.3.5-4-121.js index e518b16353..5e9ebc1be9 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-121.js +++ b/test/built-ins/Object/create/15.2.3.5-4-121.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = new Error(); descObj.configurable = true; @@ -24,6 +21,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-122.js b/test/built-ins/Object/create/15.2.3.5-4-122.js index 597f14cfa0..13d7609e5e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-122.js +++ b/test/built-ins/Object/create/15.2.3.5-4-122.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); argObj.configurable = true; @@ -23,6 +20,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-127.js b/test/built-ins/Object/create/15.2.3.5-4-127.js index 830718d2c5..f66387a568 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-127.js +++ b/test/built-ins/Object/create/15.2.3.5-4-127.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-127 description: > Object.create - 'configurable' property of one property in 'Properties' is true (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: true @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-133.js b/test/built-ins/Object/create/15.2.3.5-4-133.js index 49a36f160e..cd34826270 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-133.js +++ b/test/built-ins/Object/create/15.2.3.5-4-133.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-133 description: > Object.create - 'configurable' property of one property in 'Properties' is a positive number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: 123 @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-134.js b/test/built-ins/Object/create/15.2.3.5-4-134.js index 438da449ad..e74cde5e4f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-134.js +++ b/test/built-ins/Object/create/15.2.3.5-4-134.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-134 description: > Object.create - 'configurable' property of one property in 'Properties' is a negative number (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: -123 @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-136.js b/test/built-ins/Object/create/15.2.3.5-4-136.js index 8a977d8be1..c00e28b6a4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-136.js +++ b/test/built-ins/Object/create/15.2.3.5-4-136.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-136 description: > Object.create - 'configurable' property of one property in 'Properties' is a non-empty string (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: "abc" @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-137.js b/test/built-ins/Object/create/15.2.3.5-4-137.js index 14cd4110b4..884d3f95f0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-137.js +++ b/test/built-ins/Object/create/15.2.3.5-4-137.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-137 description: > Object.create - 'configurable' property of one property in 'Properties' is a Function object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: function () { } @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-138.js b/test/built-ins/Object/create/15.2.3.5-4-138.js index 29913adccb..2a81156150 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-138.js +++ b/test/built-ins/Object/create/15.2.3.5-4-138.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-138 description: > Object.create - 'configurable' property of one property in 'Properties' is an Array object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: [] @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-139.js b/test/built-ins/Object/create/15.2.3.5-4-139.js index 4b744796a6..f821b61726 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-139.js +++ b/test/built-ins/Object/create/15.2.3.5-4-139.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-139 description: > Object.create - 'configurable' property of one property in 'Properties' is a String object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new String("abc") @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-14.js b/test/built-ins/Object/create/15.2.3.5-4-14.js index 9955f23ca9..91c6fe65cd 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-14.js +++ b/test/built-ins/Object/create/15.2.3.5-4-14.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-14 description: > Object.create - argument 'Properties' is an Error object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Error("test"); var result = false; @@ -26,6 +23,6 @@ function testcase() { enumerable: true }); var newObj = Object.create({}, props); - return result && newObj.hasOwnProperty("prop15_2_3_5_4_14"); - } -runTestCase(testcase); + +assert(result, 'result !== true'); +assert(newObj.hasOwnProperty("prop15_2_3_5_4_14"), 'newObj.hasOwnProperty("prop15_2_3_5_4_14") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-140.js b/test/built-ins/Object/create/15.2.3.5-4-140.js index 9e03d7b396..c4407af611 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-140.js +++ b/test/built-ins/Object/create/15.2.3.5-4-140.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-140 description: > Object.create - 'configurable' property of one property in 'Properties' is a Boolean object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new Boolean(true) @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-141.js b/test/built-ins/Object/create/15.2.3.5-4-141.js index 384ea672aa..9ad3bb8491 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-141.js +++ b/test/built-ins/Object/create/15.2.3.5-4-141.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-141 description: > Object.create - 'configurable' property of one property in 'Properties' is a Number object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new Number(123) @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-142.js b/test/built-ins/Object/create/15.2.3.5-4-142.js index 7a62935bf8..706c93be6c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-142.js +++ b/test/built-ins/Object/create/15.2.3.5-4-142.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-142 description: > Object.create - 'configurable' property of one property in 'Properties' is the Math object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: Math @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-143.js b/test/built-ins/Object/create/15.2.3.5-4-143.js index 1982ea129a..2c13898bf8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-143.js +++ b/test/built-ins/Object/create/15.2.3.5-4-143.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-143 description: > Object.create - 'configurable' property of one property in 'Properties' is a Date object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new Date() @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-144.js b/test/built-ins/Object/create/15.2.3.5-4-144.js index ba6c9a3af2..a77690f053 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-144.js +++ b/test/built-ins/Object/create/15.2.3.5-4-144.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-144 description: > Object.create - 'configurable' property of one property in 'Properties' is a RegExp object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new RegExp() @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-145.js b/test/built-ins/Object/create/15.2.3.5-4-145.js index 846865c8ea..59b7607b23 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-145.js +++ b/test/built-ins/Object/create/15.2.3.5-4-145.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-145 description: > Object.create - 'configurable' property of one property in 'Properties' is the JSON object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: JSON @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-146.js b/test/built-ins/Object/create/15.2.3.5-4-146.js index 6472cbeef9..b187b2c799 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-146.js +++ b/test/built-ins/Object/create/15.2.3.5-4-146.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-146 description: > Object.create - 'configurable' property of one property in 'Properties' is an Error object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new Error() @@ -23,6 +20,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-147.js b/test/built-ins/Object/create/15.2.3.5-4-147.js index 45282a4343..c5966f17c1 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-147.js +++ b/test/built-ins/Object/create/15.2.3.5-4-147.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-147 description: > Object.create - 'configurable' property of one property in 'Properties' is an Arguments object (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); var newObj = Object.create({}, { @@ -25,6 +22,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-149.js b/test/built-ins/Object/create/15.2.3.5-4-149.js index abe2064439..9b590ff554 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-149.js +++ b/test/built-ins/Object/create/15.2.3.5-4-149.js @@ -6,13 +6,9 @@ es5id: 15.2.3.5-4-149 description: > Object.create - 'configurable' property of one property in 'Properties' is the global object (8.10.5 step 4.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: fnGlobalObject() @@ -25,6 +21,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-15.js b/test/built-ins/Object/create/15.2.3.5-4-15.js index 5f6b8ad267..97856238da 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-15.js +++ b/test/built-ins/Object/create/15.2.3.5-4-15.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-15 description: > Object.create - argument 'Properties' is the Aguments object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var result = false; var argObj = (function () { return arguments; })(); @@ -24,6 +21,6 @@ function testcase() { }); var newObj = Object.create({}, argObj); - return result && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(result, 'result !== true'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-150.js b/test/built-ins/Object/create/15.2.3.5-4-150.js index 8cf7e20a83..a39b6ec1a5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-150.js +++ b/test/built-ins/Object/create/15.2.3.5-4-150.js @@ -7,11 +7,8 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is a string (value is 'false') which is treated as the value true (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: "false" @@ -24,6 +21,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-151.js b/test/built-ins/Object/create/15.2.3.5-4-151.js index 7a144fdf47..0652a29d96 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-151.js +++ b/test/built-ins/Object/create/15.2.3.5-4-151.js @@ -7,11 +7,8 @@ description: > Object.create - 'configurable' property of one property in 'Properties' is new Boolean(false) which is treated as the value true (8.10.5 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: new Boolean(false) @@ -24,6 +21,5 @@ function testcase() { var afterDeleted = newObj.hasOwnProperty("prop"); - return beforeDeleted === true && afterDeleted === false; - } -runTestCase(testcase); +assert.sameValue(beforeDeleted, true, 'beforeDeleted'); +assert.sameValue(afterDeleted, false, 'afterDeleted'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-152.js b/test/built-ins/Object/create/15.2.3.5-4-152.js index ab81ae4fe7..d10a654917 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-152.js +++ b/test/built-ins/Object/create/15.2.3.5-4-152.js @@ -6,17 +6,12 @@ es5id: 15.2.3.5-4-152 description: > Object.create - 'value' property of one property in 'Properties' is present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { value: 100 } }); - return newObj.prop === 100; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, 100, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-153.js b/test/built-ins/Object/create/15.2.3.5-4-153.js index 5bed0fbc29..9e468d7d72 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-153.js +++ b/test/built-ins/Object/create/15.2.3.5-4-153.js @@ -6,15 +6,11 @@ es5id: 15.2.3.5-4-153 description: > Object.create - 'value' property of one property in 'Properties' is not present (8.10.5 step 5) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: {} }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-154.js b/test/built-ins/Object/create/15.2.3.5-4-154.js index f9f98e5cfb..6d173dedbd 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-154.js +++ b/test/built-ins/Object/create/15.2.3.5-4-154.js @@ -6,17 +6,12 @@ es5id: 15.2.3.5-4-154 description: > Object.create - 'value' property of one property in 'Properties' is own data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { value: "ownDataProperty" } }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-155.js b/test/built-ins/Object/create/15.2.3.5-4-155.js index b901fc70d4..9da761bcb2 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-155.js +++ b/test/built-ins/Object/create/15.2.3.5-4-155.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-155 description: > Object.create - 'value' property of one property in 'Properties' is an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { value: "inheritedDataProperty" }; @@ -24,6 +21,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "inheritedDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "inheritedDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-156.js b/test/built-ins/Object/create/15.2.3.5-4-156.js index f4e6f9ab4f..7161dc784c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-156.js +++ b/test/built-ins/Object/create/15.2.3.5-4-156.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { value: "inheritedDataProperty" }; @@ -27,6 +24,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-157.js b/test/built-ins/Object/create/15.2.3.5-4-157.js index f62ef33811..4a8fb1a795 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-157.js +++ b/test/built-ins/Object/create/15.2.3.5-4-157.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "value", { @@ -35,6 +32,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-158.js b/test/built-ins/Object/create/15.2.3.5-4-158.js index da01c71b1c..1f31f645b8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-158.js +++ b/test/built-ins/Object/create/15.2.3.5-4-158.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-158 description: > Object.create - 'value' property of one property in 'Properties' is own accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = {}; Object.defineProperty(descObj, "value", { @@ -23,6 +20,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-159.js b/test/built-ins/Object/create/15.2.3.5-4-159.js index d714af6915..4ed1f46a46 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-159.js +++ b/test/built-ins/Object/create/15.2.3.5-4-159.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-159 description: > Object.create - 'value' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "value", { @@ -28,6 +25,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "inheritedAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-16.js b/test/built-ins/Object/create/15.2.3.5-4-16.js index 7b1dd96435..7916c17fe5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-16.js +++ b/test/built-ins/Object/create/15.2.3.5-4-16.js @@ -6,14 +6,10 @@ es5id: 15.2.3.5-4-16 description: > Object.create - own enumerable data property in 'Properties' is defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: {} }); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-160.js b/test/built-ins/Object/create/15.2.3.5-4-160.js index 0ca0bcd88f..692a8589f2 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-160.js +++ b/test/built-ins/Object/create/15.2.3.5-4-160.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { value: "inheritedDataProperty" }; @@ -31,6 +28,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-161.js b/test/built-ins/Object/create/15.2.3.5-4-161.js index 9e34a206f1..ad384083c3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-161.js +++ b/test/built-ins/Object/create/15.2.3.5-4-161.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "value", { @@ -35,6 +32,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-162.js b/test/built-ins/Object/create/15.2.3.5-4-162.js index b9664b9486..ec528e311e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-162.js +++ b/test/built-ins/Object/create/15.2.3.5-4-162.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-162 description: > Object.create - 'value' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = {}; Object.defineProperty(descObj, "value", { @@ -21,6 +18,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-163.js b/test/built-ins/Object/create/15.2.3.5-4-163.js index 549adadd64..2f3d0e80fb 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-163.js +++ b/test/built-ins/Object/create/15.2.3.5-4-163.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "value", { @@ -33,6 +30,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-164.js b/test/built-ins/Object/create/15.2.3.5-4-164.js index aac18eee26..d3a0f706b0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-164.js +++ b/test/built-ins/Object/create/15.2.3.5-4-164.js @@ -7,11 +7,8 @@ description: > Object.create - 'value' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "value", { @@ -27,6 +24,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-165.js b/test/built-ins/Object/create/15.2.3.5-4-165.js index c6611504b6..df8cb009bc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-165.js +++ b/test/built-ins/Object/create/15.2.3.5-4-165.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var Func = function (a, b) { return a + b; }; @@ -22,6 +19,5 @@ function testcase() { var newObj = Object.create({}, { prop: fun }); - return newObj.prop === "FunValue"; - } -runTestCase(testcase); + +assert.sameValue(newObj.prop, "FunValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-166.js b/test/built-ins/Object/create/15.2.3.5-4-166.js index 598a6cf615..0e844df158 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-166.js +++ b/test/built-ins/Object/create/15.2.3.5-4-166.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var arr = [1, 2, 3]; arr.value = "ArrValue"; @@ -20,6 +17,4 @@ function testcase() { prop: arr }); - return newObj.prop === "ArrValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ArrValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-167.js b/test/built-ins/Object/create/15.2.3.5-4-167.js index db768470e4..2f4959e6ca 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-167.js +++ b/test/built-ins/Object/create/15.2.3.5-4-167.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var str = new String("abc"); str.value = "StrValue"; @@ -20,6 +17,4 @@ function testcase() { prop: str }); - return newObj.prop === "StrValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "StrValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-168.js b/test/built-ins/Object/create/15.2.3.5-4-168.js index c72c479b00..bb2fd7d998 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-168.js +++ b/test/built-ins/Object/create/15.2.3.5-4-168.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var booleanObj = new Boolean(false); booleanObj.value = "BooleanValue"; @@ -20,6 +17,4 @@ function testcase() { prop: booleanObj }); - return newObj.prop === "BooleanValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "BooleanValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-169.js b/test/built-ins/Object/create/15.2.3.5-4-169.js index c4d40e9b7b..529e7b3fee 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-169.js +++ b/test/built-ins/Object/create/15.2.3.5-4-169.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var numObj = new Number(123); numObj.value = "NumValue"; @@ -20,6 +17,4 @@ function testcase() { prop: numObj }); - return newObj.prop === "NumValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "NumValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-17.js b/test/built-ins/Object/create/15.2.3.5-4-17.js index 2e31790ecf..8083d035f6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-17.js +++ b/test/built-ins/Object/create/15.2.3.5-4-17.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-17 description: > Object.create - own data property in 'Properties' which is not enumerable is not defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = {}; Object.defineProperty(props, "prop", { value: {}, @@ -18,6 +15,4 @@ function testcase() { }); var newObj = Object.create({}, props); - return !newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(newObj.hasOwnProperty("prop"), false, 'newObj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-171.js b/test/built-ins/Object/create/15.2.3.5-4-171.js index a922a08c95..7dce499564 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-171.js +++ b/test/built-ins/Object/create/15.2.3.5-4-171.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var dateObj = new Date(); dateObj.value = "DateValue"; @@ -20,6 +17,4 @@ function testcase() { prop: dateObj }); - return newObj.prop === "DateValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "DateValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-172.js b/test/built-ins/Object/create/15.2.3.5-4-172.js index e498e09015..6b467c8b08 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-172.js +++ b/test/built-ins/Object/create/15.2.3.5-4-172.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var regObj = new RegExp(); regObj.value = "RegExpValue"; @@ -20,6 +17,4 @@ function testcase() { prop: regObj }); - return newObj.prop === "RegExpValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "RegExpValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-174.js b/test/built-ins/Object/create/15.2.3.5-4-174.js index a093b44647..49aabea535 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-174.js +++ b/test/built-ins/Object/create/15.2.3.5-4-174.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var errorObj = new Error(); errorObj.value = "ErrorValue"; @@ -20,6 +17,4 @@ function testcase() { prop: errorObj }); - return newObj.prop === "ErrorValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ErrorValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-175.js b/test/built-ins/Object/create/15.2.3.5-4-175.js index af19ac014e..ef17be9ef2 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-175.js +++ b/test/built-ins/Object/create/15.2.3.5-4-175.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); argObj.value = "ArgValue"; @@ -20,6 +17,4 @@ function testcase() { prop: argObj }); - return newObj.prop === "ArgValue"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ArgValue", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-178.js b/test/built-ins/Object/create/15.2.3.5-4-178.js index c071a22b22..d07158967d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-178.js +++ b/test/built-ins/Object/create/15.2.3.5-4-178.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-178 description: > Object.create - 'writable' property of one property in 'Properties' is true (8.10.5 step 6) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: true @@ -23,6 +20,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-18.js b/test/built-ins/Object/create/15.2.3.5-4-18.js index c0fcf7bc2c..4bd85b5c0c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-18.js +++ b/test/built-ins/Object/create/15.2.3.5-4-18.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-18 description: > Object.create - an enumerable inherited data property in 'Properties' is not defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; proto.prop = {}; @@ -21,6 +18,4 @@ function testcase() { var newObj = Object.create({}, child); - return !newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(newObj.hasOwnProperty("prop"), false, 'newObj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-180.js b/test/built-ins/Object/create/15.2.3.5-4-180.js index fe38bb8143..3f335be922 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-180.js +++ b/test/built-ins/Object/create/15.2.3.5-4-180.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-180 description: > Object.create - 'writable' property of one property in 'Properties' is own data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: true @@ -23,6 +20,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-181.js b/test/built-ins/Object/create/15.2.3.5-4-181.js index 010eecf539..dd7c4798c5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-181.js +++ b/test/built-ins/Object/create/15.2.3.5-4-181.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-181 description: > Object.create - 'writable' property of one property in 'Properties' is an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { writable: true }; @@ -30,6 +27,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-182.js b/test/built-ins/Object/create/15.2.3.5-4-182.js index f08429645c..aab02965aa 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-182.js +++ b/test/built-ins/Object/create/15.2.3.5-4-182.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { writable: false }; @@ -33,6 +30,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-183.js b/test/built-ins/Object/create/15.2.3.5-4-183.js index 92cc346e8a..abd7e52bd0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-183.js +++ b/test/built-ins/Object/create/15.2.3.5-4-183.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "writable", { @@ -39,6 +36,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-184.js b/test/built-ins/Object/create/15.2.3.5-4-184.js index 19ed6dd5ec..fdc42d8e6f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-184.js +++ b/test/built-ins/Object/create/15.2.3.5-4-184.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-184 description: > Object.create - 'writable' property of one property in 'Properties' is own accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = {}; Object.defineProperty(descObj, "writable", { @@ -29,6 +26,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-185.js b/test/built-ins/Object/create/15.2.3.5-4-185.js index 3b2a8a77d3..e1152493bf 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-185.js +++ b/test/built-ins/Object/create/15.2.3.5-4-185.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-185 description: > Object.create - 'writable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "writable", { @@ -34,6 +31,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-186.js b/test/built-ins/Object/create/15.2.3.5-4-186.js index 838a7052a2..38eafffccf 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-186.js +++ b/test/built-ins/Object/create/15.2.3.5-4-186.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { writable: false }; @@ -37,6 +34,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-187.js b/test/built-ins/Object/create/15.2.3.5-4-187.js index 460f701ed6..4419c8873a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-187.js +++ b/test/built-ins/Object/create/15.2.3.5-4-187.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "writable", { @@ -41,6 +38,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-19.js b/test/built-ins/Object/create/15.2.3.5-4-19.js index 9cc5a66dbd..dce154b89c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-19.js +++ b/test/built-ins/Object/create/15.2.3.5-4-19.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-19 description: > Object.create - own enumerable accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = {}; Object.defineProperty(props, "prop", { @@ -22,6 +19,4 @@ function testcase() { var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-191.js b/test/built-ins/Object/create/15.2.3.5-4-191.js index ad7fde542f..974137f75d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-191.js +++ b/test/built-ins/Object/create/15.2.3.5-4-191.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var Func = function (a, b) { return a + b; }; @@ -29,6 +26,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-192.js b/test/built-ins/Object/create/15.2.3.5-4-192.js index 7d8f5981e6..6adc605917 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-192.js +++ b/test/built-ins/Object/create/15.2.3.5-4-192.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var array = [1, 2, 3]; array.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-193.js b/test/built-ins/Object/create/15.2.3.5-4-193.js index 777cb3da24..a4c1d21ba6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-193.js +++ b/test/built-ins/Object/create/15.2.3.5-4-193.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var str = new String("abc"); str.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-194.js b/test/built-ins/Object/create/15.2.3.5-4-194.js index def67f8274..55fb8cc628 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-194.js +++ b/test/built-ins/Object/create/15.2.3.5-4-194.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var booleanObj = new Boolean(false); booleanObj.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-195.js b/test/built-ins/Object/create/15.2.3.5-4-195.js index c1506e722a..75defcd96c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-195.js +++ b/test/built-ins/Object/create/15.2.3.5-4-195.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var numObj = new Number(123); numObj.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-197.js b/test/built-ins/Object/create/15.2.3.5-4-197.js index c0af3ddf68..826b411eee 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-197.js +++ b/test/built-ins/Object/create/15.2.3.5-4-197.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var dateObj = new Date(); dateObj.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-198.js b/test/built-ins/Object/create/15.2.3.5-4-198.js index 2f6cb41c78..549af5c863 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-198.js +++ b/test/built-ins/Object/create/15.2.3.5-4-198.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var regObj = new RegExp(); regObj.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-2.js b/test/built-ins/Object/create/15.2.3.5-4-2.js index 4ccc3d9281..773eec561d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-2.js +++ b/test/built-ins/Object/create/15.2.3.5-4-2.js @@ -4,12 +4,8 @@ /*--- es5id: 15.2.3.5-4-2 description: Object.create - 'Properties' is undefined -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, undefined); - return (newObj instanceof Object); - } -runTestCase(testcase); + +assert((newObj instanceof Object), '(newObj instanceof Object) !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-20.js b/test/built-ins/Object/create/15.2.3.5-4-20.js index 7f066f5c3b..5a158b32b4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-20.js +++ b/test/built-ins/Object/create/15.2.3.5-4-20.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-20 description: > Object.create - own accessor property in 'Properties' which is not enumerable is not defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = {}; Object.defineProperty(props, "prop", { @@ -22,6 +19,4 @@ function testcase() { var newObj = Object.create({}, props); - return !newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(newObj.hasOwnProperty("prop"), false, 'newObj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-200.js b/test/built-ins/Object/create/15.2.3.5-4-200.js index 2dd3b011b5..f5583aafdf 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-200.js +++ b/test/built-ins/Object/create/15.2.3.5-4-200.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var errorObj = new Error(); errorObj.writable = true; @@ -26,6 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-201.js b/test/built-ins/Object/create/15.2.3.5-4-201.js index 99cafc9feb..205a6f616a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-201.js +++ b/test/built-ins/Object/create/15.2.3.5-4-201.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); argObj.writable = true; @@ -26,7 +23,5 @@ function testcase() { var afterWrite = (newObj.prop === "isWritable"); - return beforeWrite === true && afterWrite === true; - - } -runTestCase(testcase); +assert.sameValue(beforeWrite, true, 'beforeWrite'); +assert.sameValue(afterWrite, true, 'afterWrite'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-206.js b/test/built-ins/Object/create/15.2.3.5-4-206.js index 6f5964bcfe..4f42500687 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-206.js +++ b/test/built-ins/Object/create/15.2.3.5-4-206.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-206 description: > Object.create - 'writable' property of one property in 'Properties' is true (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: true @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-21.js b/test/built-ins/Object/create/15.2.3.5-4-21.js index c223d4dfdf..178b2dcf67 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-21.js +++ b/test/built-ins/Object/create/15.2.3.5-4-21.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-21 description: > Object.create - an enumerable inherited accessor property in 'Properties' is not defined in 'obj' (15.2.3.7 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "prop", { @@ -26,6 +23,4 @@ function testcase() { var newObj = Object.create({}, child); - return !newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert.sameValue(newObj.hasOwnProperty("prop"), false, 'newObj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-212.js b/test/built-ins/Object/create/15.2.3.5-4-212.js index d742028c61..b68ad748c5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-212.js +++ b/test/built-ins/Object/create/15.2.3.5-4-212.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-212 description: > Object.create - 'writable' property of one property in 'Properties' is a positive number primitive (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: 12 @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-213.js b/test/built-ins/Object/create/15.2.3.5-4-213.js index 0d6f2793d5..69ee1f25bc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-213.js +++ b/test/built-ins/Object/create/15.2.3.5-4-213.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-213 description: > Object.create - 'writable' property of one property in 'Properties' is a negative number primitive (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: -9 @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-215.js b/test/built-ins/Object/create/15.2.3.5-4-215.js index e3cacb9c0a..0a5b0e1872 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-215.js +++ b/test/built-ins/Object/create/15.2.3.5-4-215.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-215 description: > Object.create - 'writable' property of one property in 'Properties' is a non-empty string (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: "abc" @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-216.js b/test/built-ins/Object/create/15.2.3.5-4-216.js index 821c410b3a..eb3b062e83 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-216.js +++ b/test/built-ins/Object/create/15.2.3.5-4-216.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-216 description: > Object.create - 'writable' property of one property in 'Properties' is a Function object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: function () { } @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-217.js b/test/built-ins/Object/create/15.2.3.5-4-217.js index 270c5ddbfd..2bab6a1869 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-217.js +++ b/test/built-ins/Object/create/15.2.3.5-4-217.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-217 description: > Object.create - 'writable' property of one property in 'Properties' is an Array object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: [] @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-218.js b/test/built-ins/Object/create/15.2.3.5-4-218.js index 4ebb7993e5..64a7de9c3a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-218.js +++ b/test/built-ins/Object/create/15.2.3.5-4-218.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-218 description: > Object.create - 'writable' property of one property in 'Properties' is a String object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new String() @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-219.js b/test/built-ins/Object/create/15.2.3.5-4-219.js index ba58108f85..6965d7881d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-219.js +++ b/test/built-ins/Object/create/15.2.3.5-4-219.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-219 description: > Object.create - 'writable' property of one property in 'Properties' is a Boolean object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new Boolean() @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-22.js b/test/built-ins/Object/create/15.2.3.5-4-22.js index 8d4f10899e..3ee831a577 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-22.js +++ b/test/built-ins/Object/create/15.2.3.5-4-22.js @@ -7,11 +7,8 @@ description: > Object.create - own enumerable data property that overrides an enumerable inherited data property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; proto.prop = { value: "abc" @@ -26,6 +23,5 @@ function testcase() { }; var newObj = Object.create({}, child); - return newObj.hasOwnProperty("prop") && newObj.prop === "bbq"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(newObj.prop, "bbq", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-220.js b/test/built-ins/Object/create/15.2.3.5-4-220.js index 43ac96eb1d..7cf13ce5cc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-220.js +++ b/test/built-ins/Object/create/15.2.3.5-4-220.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-220 description: > Object.create - 'writable' property of one property in 'Properties' is a Number object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new Number() @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-221.js b/test/built-ins/Object/create/15.2.3.5-4-221.js index 8375c163b2..d380fc50cb 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-221.js +++ b/test/built-ins/Object/create/15.2.3.5-4-221.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-221 description: > Object.create - 'writable' property of one property in 'Properties' is the Math object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: Math @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-222.js b/test/built-ins/Object/create/15.2.3.5-4-222.js index 72c55840ad..28e848af12 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-222.js +++ b/test/built-ins/Object/create/15.2.3.5-4-222.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-222 description: > Object.create - 'writable' property of one property in 'Properties' is a Date object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new Date() @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-223.js b/test/built-ins/Object/create/15.2.3.5-4-223.js index e58c18b59f..5a7b95b49d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-223.js +++ b/test/built-ins/Object/create/15.2.3.5-4-223.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-223 description: > Object.create - 'writable' property of one property in 'Properties' is a RegExp object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new RegExp() @@ -20,6 +17,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-224.js b/test/built-ins/Object/create/15.2.3.5-4-224.js index 89b71f225a..e5e3927490 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-224.js +++ b/test/built-ins/Object/create/15.2.3.5-4-224.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-224 description: > Object.create - 'writable' property of one property in 'Properties' is the JSON object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: JSON @@ -18,6 +15,6 @@ function testcase() { }); var hasProperty = newObj.hasOwnProperty("prop"); newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); + +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-225.js b/test/built-ins/Object/create/15.2.3.5-4-225.js index 08c55f5a73..5c428978ef 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-225.js +++ b/test/built-ins/Object/create/15.2.3.5-4-225.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-225 description: > Object.create - 'writable' property of one property in 'Properties' is an Error object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new Error() @@ -18,6 +15,6 @@ function testcase() { }); var hasProperty = newObj.hasOwnProperty("prop"); newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); + +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-226.js b/test/built-ins/Object/create/15.2.3.5-4-226.js index e126f7f512..25f359e78a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-226.js +++ b/test/built-ins/Object/create/15.2.3.5-4-226.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-226 description: > Object.create - 'writable' property of one property in 'Properties' is an Arguments object (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); var newObj = Object.create({}, { @@ -22,6 +19,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-228.js b/test/built-ins/Object/create/15.2.3.5-4-228.js index 5dfeab0eba..7adb830f18 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-228.js +++ b/test/built-ins/Object/create/15.2.3.5-4-228.js @@ -6,13 +6,9 @@ es5id: 15.2.3.5-4-228 description: > Object.create - 'writable' property of one property in 'Properties' is the global object (8.10.5 step 6.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: fnGlobalObject() @@ -22,6 +18,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-229.js b/test/built-ins/Object/create/15.2.3.5-4-229.js index a7096016f6..b4ed3b4acb 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-229.js +++ b/test/built-ins/Object/create/15.2.3.5-4-229.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is a string (value is 'false') which is treated as the value true (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: "false" @@ -21,6 +18,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-23.js b/test/built-ins/Object/create/15.2.3.5-4-23.js index 83be5327d6..f7ebf041f8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-23.js +++ b/test/built-ins/Object/create/15.2.3.5-4-23.js @@ -7,11 +7,8 @@ description: > Object.create - own enumerable data property that overrides an enumerable inherited accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "prop", { get: function () { @@ -32,6 +29,5 @@ function testcase() { }); var newObj = Object.create({}, child); - return newObj.hasOwnProperty("prop") && newObj.prop === 12; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(newObj.prop, 12, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-230.js b/test/built-ins/Object/create/15.2.3.5-4-230.js index 85bf5f66e5..392cacd8bc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-230.js +++ b/test/built-ins/Object/create/15.2.3.5-4-230.js @@ -7,11 +7,8 @@ description: > Object.create - 'writable' property of one property in 'Properties' is new Boolean(false) which is treated as the value true (8.10.5 step 6.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { writable: new Boolean(false) @@ -21,6 +18,5 @@ function testcase() { newObj.prop = 121; - return hasProperty && newObj.prop === 121; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(newObj.prop, 121, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-231.js b/test/built-ins/Object/create/15.2.3.5-4-231.js index 9b8cb9ee1f..d758b8a8d0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-231.js +++ b/test/built-ins/Object/create/15.2.3.5-4-231.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-231 description: > Object.create - 'get' property of one property in 'Properties' is present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { get: function () { @@ -18,6 +15,5 @@ function testcase() { } } }); - return newObj.prop === "present"; - } -runTestCase(testcase); + +assert.sameValue(newObj.prop, "present", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-232.js b/test/built-ins/Object/create/15.2.3.5-4-232.js index b2cce11111..f7edbce48f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-232.js +++ b/test/built-ins/Object/create/15.2.3.5-4-232.js @@ -6,14 +6,10 @@ es5id: 15.2.3.5-4-232 description: > Object.create - 'get' property of one property in 'Properties' is not present (8.10.5 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: {} }); - return typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); + +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-233.js b/test/built-ins/Object/create/15.2.3.5-4-233.js index 993a7d567f..d0f6b3979a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-233.js +++ b/test/built-ins/Object/create/15.2.3.5-4-233.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-233 description: > Object.create - 'get' property of one property in 'Properties' is own data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { get: function () { @@ -18,6 +15,5 @@ function testcase() { } } }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); + +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-234.js b/test/built-ins/Object/create/15.2.3.5-4-234.js index ea56682264..6d53c01f2f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-234.js +++ b/test/built-ins/Object/create/15.2.3.5-4-234.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-234 description: > Object.create - 'get' property of one property in 'Properties' is an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { get: function () { return "inheritedDataProperty"; @@ -26,6 +23,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "inheritedDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "inheritedDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-235.js b/test/built-ins/Object/create/15.2.3.5-4-235.js index a2918b306c..67474ae09c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-235.js +++ b/test/built-ins/Object/create/15.2.3.5-4-235.js @@ -7,11 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = { get: function () { return "inheritedDataProperty"; @@ -33,6 +30,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-236.js b/test/built-ins/Object/create/15.2.3.5-4-236.js index 0836167dd1..dd0bab3da9 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-236.js +++ b/test/built-ins/Object/create/15.2.3.5-4-236.js @@ -7,11 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "get", { @@ -36,6 +33,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownDataProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownDataProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-237.js b/test/built-ins/Object/create/15.2.3.5-4-237.js index ec76d11a29..9ff6e5ec19 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-237.js +++ b/test/built-ins/Object/create/15.2.3.5-4-237.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-237 description: > Object.create - 'get' property of one property in 'Properties' is own accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var descObj = {}; Object.defineProperty(descObj, "get", { @@ -25,6 +22,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-238.js b/test/built-ins/Object/create/15.2.3.5-4-238.js index b80629d8d9..bd1d724273 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-238.js +++ b/test/built-ins/Object/create/15.2.3.5-4-238.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-238 description: > Object.create - 'get' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "get", { @@ -29,6 +26,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "inheritedAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "inheritedAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-239.js b/test/built-ins/Object/create/15.2.3.5-4-239.js index 2c310851a8..33af127302 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-239.js +++ b/test/built-ins/Object/create/15.2.3.5-4-239.js @@ -7,10 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = { get: function () { return "inheritedDataProperty"; @@ -33,6 +31,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-24.js b/test/built-ins/Object/create/15.2.3.5-4-24.js index 020269a8e7..3e9958961b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-24.js +++ b/test/built-ins/Object/create/15.2.3.5-4-24.js @@ -7,11 +7,8 @@ description: > Object.create - own enumerable accessor property that overrides an enumerable inherited data property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; proto.prop = { value: 12 @@ -32,6 +29,5 @@ function testcase() { var newObj = Object.create({}, child); - return newObj.hasOwnProperty("prop") && newObj.prop === 9; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(newObj.prop, 9, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-240.js b/test/built-ins/Object/create/15.2.3.5-4-240.js index 296e8a6c4b..82839e1df3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-240.js +++ b/test/built-ins/Object/create/15.2.3.5-4-240.js @@ -7,10 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "get", { @@ -37,6 +35,4 @@ function testcase() { prop: descObj }); - return newObj.prop === "ownAccessorProperty"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "ownAccessorProperty", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-241.js b/test/built-ins/Object/create/15.2.3.5-4-241.js index 302ccdda3c..a5621412b4 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-241.js +++ b/test/built-ins/Object/create/15.2.3.5-4-241.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-241 description: > Object.create - 'get' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var descObj = {}; Object.defineProperty(descObj, "get", { @@ -20,6 +18,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-242.js b/test/built-ins/Object/create/15.2.3.5-4-242.js index 623b388dc2..ceca51dcc1 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-242.js +++ b/test/built-ins/Object/create/15.2.3.5-4-242.js @@ -7,10 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "get", { @@ -33,6 +31,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof newObj.prop, "undefined", 'typeof newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-243.js b/test/built-ins/Object/create/15.2.3.5-4-243.js index ea49b7021b..05b2a20145 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-243.js +++ b/test/built-ins/Object/create/15.2.3.5-4-243.js @@ -7,10 +7,8 @@ description: > Object.create - 'get' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "get", { @@ -25,6 +23,5 @@ function testcase() { prop: descObj }); - return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof (newObj.prop), "undefined", 'typeof (newObj.prop)'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-244.js b/test/built-ins/Object/create/15.2.3.5-4-244.js index 692f3dc68b..d1c448d76d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-244.js +++ b/test/built-ins/Object/create/15.2.3.5-4-244.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var funObj = function () {}; funObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: funObj }); - return newObj.prop === "VerifyFunctionObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyFunctionObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-245.js b/test/built-ins/Object/create/15.2.3.5-4-245.js index 13eeec3f0c..98bdaae835 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-245.js +++ b/test/built-ins/Object/create/15.2.3.5-4-245.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrayObj = [1, 2, 3]; arrayObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: arrayObj }); - return newObj.prop === "VerifyArrayObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyArrayObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-246.js b/test/built-ins/Object/create/15.2.3.5-4-246.js index 6eb0d11830..83543f250a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-246.js +++ b/test/built-ins/Object/create/15.2.3.5-4-246.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var strObj = new String("abc"); strObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: strObj }); - return newObj.prop === "VerifyStringObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyStringObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-247.js b/test/built-ins/Object/create/15.2.3.5-4-247.js index 15b4826e7d..2307c1f419 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-247.js +++ b/test/built-ins/Object/create/15.2.3.5-4-247.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var boolObj = new Boolean(true); boolObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: boolObj }); - return newObj.prop === "VerifyBooleanObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyBooleanObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-248.js b/test/built-ins/Object/create/15.2.3.5-4-248.js index cf1ca8f219..441c41f6fe 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-248.js +++ b/test/built-ins/Object/create/15.2.3.5-4-248.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var numObj = new Number(5); numObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: numObj }); - return newObj.prop === "VerifyNumberObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyNumberObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-249.js b/test/built-ins/Object/create/15.2.3.5-4-249.js index 384ed105d2..5144160400 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-249.js +++ b/test/built-ins/Object/create/15.2.3.5-4-249.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var dateObj = new Date(); dateObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: dateObj }); - return newObj.prop === "VerifyDateObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyDateObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-25.js b/test/built-ins/Object/create/15.2.3.5-4-25.js index 7456391d7e..d4aa1a0791 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-25.js +++ b/test/built-ins/Object/create/15.2.3.5-4-25.js @@ -7,11 +7,8 @@ description: > Object.create - own enumerable accessor property that overrides an enumerable inherited accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; Object.defineProperty(proto, "prop", { get: function () { @@ -36,6 +33,5 @@ function testcase() { }); var newObj = Object.create({}, child); - return newObj.hasOwnProperty("prop") && newObj.prop === 12; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(newObj.prop, 12, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-250.js b/test/built-ins/Object/create/15.2.3.5-4-250.js index 311c74a919..861c07e15e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-250.js +++ b/test/built-ins/Object/create/15.2.3.5-4-250.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var regObj = new RegExp(); regObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: regObj }); - return newObj.prop === "VerifyRegExpObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyRegExpObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-253.js b/test/built-ins/Object/create/15.2.3.5-4-253.js index e389d33c1f..06515f7f24 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-253.js +++ b/test/built-ins/Object/create/15.2.3.5-4-253.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { var errObj = new Error("error"); errObj.get = function () { @@ -21,6 +19,4 @@ function testcase() { prop: errObj }); - return newObj.prop === "VerifyErrorObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyErrorObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-254.js b/test/built-ins/Object/create/15.2.3.5-4-254.js index ad99114bd6..e315a8ae4a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-254.js +++ b/test/built-ins/Object/create/15.2.3.5-4-254.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); argObj.get = function () { @@ -22,6 +19,4 @@ function testcase() { prop: argObj }); - return newObj.prop === "VerifyArgumentsObject"; - } -runTestCase(testcase); +assert.sameValue(newObj.prop, "VerifyArgumentsObject", 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-257.js b/test/built-ins/Object/create/15.2.3.5-4-257.js index 3c5e474ce0..ca56dae002 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-257.js +++ b/test/built-ins/Object/create/15.2.3.5-4-257.js @@ -6,16 +6,13 @@ es5id: 15.2.3.5-4-257 description: > Object.create - 'get' property of one property in 'Properties' is undefined (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var newObj = Object.create({}, { prop: { get: undefined } }); - return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof newObj.prop, "undefined", 'typeof newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-263.js b/test/built-ins/Object/create/15.2.3.5-4-263.js index 2c023f9253..36e92fb03e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-263.js +++ b/test/built-ins/Object/create/15.2.3.5-4-263.js @@ -6,16 +6,13 @@ es5id: 15.2.3.5-4-263 description: > Object.create - 'get' property of one property in 'Properties' is a function (8.10.5 step 7.b) -includes: [runTestCase.js] ---*/ -function testcase() { var newObj = Object.create({}, { prop: { get: function () { } } }); - return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof newObj.prop, "undefined", 'typeof newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-266.js b/test/built-ins/Object/create/15.2.3.5-4-266.js index b37497f5b0..7711341d24 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-266.js +++ b/test/built-ins/Object/create/15.2.3.5-4-266.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-266 description: > Object.create - 'set' property of one property in 'Properties' is present (8.10.5 step 8) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var newObj = Object.create({}, { @@ -24,6 +22,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-268.js b/test/built-ins/Object/create/15.2.3.5-4-268.js index 289dd4e2b2..60f58383e8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-268.js +++ b/test/built-ins/Object/create/15.2.3.5-4-268.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-268 description: > Object.create - 'set' property of one property in 'Properties' is own data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var newObj = Object.create({}, { @@ -24,6 +22,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-269.js b/test/built-ins/Object/create/15.2.3.5-4-269.js index 248c7ef940..d09f86e987 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-269.js +++ b/test/built-ins/Object/create/15.2.3.5-4-269.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-269 description: > Object.create - 'set' property of one property in 'Properties' is an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var proto = { set: function (value) { @@ -29,6 +27,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-270.js b/test/built-ins/Object/create/15.2.3.5-4-270.js index 6f435655ec..229ab99286 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-270.js +++ b/test/built-ins/Object/create/15.2.3.5-4-270.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; var proto = { @@ -34,6 +32,6 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-271.js b/test/built-ins/Object/create/15.2.3.5-4-271.js index 009a8c981c..81e2538bb7 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-271.js +++ b/test/built-ins/Object/create/15.2.3.5-4-271.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; @@ -40,6 +38,6 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-272.js b/test/built-ins/Object/create/15.2.3.5-4-272.js index 96ae4d32b7..210068b1b5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-272.js +++ b/test/built-ins/Object/create/15.2.3.5-4-272.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-272 description: > Object.create - 'set' property of one property in 'Properties' is own accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var descObj = {}; @@ -29,6 +27,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-273.js b/test/built-ins/Object/create/15.2.3.5-4-273.js index 3e705ca266..4d274295a9 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-273.js +++ b/test/built-ins/Object/create/15.2.3.5-4-273.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-273 description: > Object.create - 'set' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var proto = {}; @@ -33,6 +31,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-274.js b/test/built-ins/Object/create/15.2.3.5-4-274.js index b7e2f04663..38d4b172ab 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-274.js +++ b/test/built-ins/Object/create/15.2.3.5-4-274.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; @@ -38,6 +36,6 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-275.js b/test/built-ins/Object/create/15.2.3.5-4-275.js index 8770d0c86e..3db96d6f07 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-275.js +++ b/test/built-ins/Object/create/15.2.3.5-4-275.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var data1 = "data"; var data2 = "data"; var proto = {}; @@ -42,6 +40,6 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data1 === "overrideData" && data2 === "data"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data1, "overrideData", 'data1'); +assert.sameValue(data2, "data", 'data2'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-276.js b/test/built-ins/Object/create/15.2.3.5-4-276.js index a0630d49e8..da31aa0b68 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-276.js +++ b/test/built-ins/Object/create/15.2.3.5-4-276.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-276 description: > Object.create - 'set' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var descObj = {}; Object.defineProperty(descObj, "set", { set: function () { } @@ -23,6 +21,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(newObj, "prop"); - return hasProperty && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-277.js b/test/built-ins/Object/create/15.2.3.5-4-277.js index a691a02fab..32768a89c2 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-277.js +++ b/test/built-ins/Object/create/15.2.3.5-4-277.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "set", { get: function () { @@ -31,6 +29,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(newObj, "prop"); - return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-278.js b/test/built-ins/Object/create/15.2.3.5-4-278.js index 16852bc131..a90edec9a5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-278.js +++ b/test/built-ins/Object/create/15.2.3.5-4-278.js @@ -7,10 +7,8 @@ description: > Object.create - 'set' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var proto = {}; Object.defineProperty(proto, "set", { set: function () { } @@ -26,6 +24,5 @@ function testcase() { var desc = Object.getOwnPropertyDescriptor(newObj, "prop"); - return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(typeof desc.set, "undefined", 'typeof desc.set'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-279.js b/test/built-ins/Object/create/15.2.3.5-4-279.js index 2ad1ac7691..6dde3c5348 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-279.js +++ b/test/built-ins/Object/create/15.2.3.5-4-279.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var funObj = function () { }; var data = "data"; funObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-28.js b/test/built-ins/Object/create/15.2.3.5-4-28.js index 7faa89554c..ad5b99f6f3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-28.js +++ b/test/built-ins/Object/create/15.2.3.5-4-28.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is a Function object which implements its own [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = function () { }; props.prop = { value: 12, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-280.js b/test/built-ins/Object/create/15.2.3.5-4-280.js index 145e5e1e2d..870f30857a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-280.js +++ b/test/built-ins/Object/create/15.2.3.5-4-280.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var arrObj = []; var data = "data"; arrObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-281.js b/test/built-ins/Object/create/15.2.3.5-4-281.js index fb738fd774..e21b55dff8 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-281.js +++ b/test/built-ins/Object/create/15.2.3.5-4-281.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var strObj = new String(); var data = "data"; strObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-282.js b/test/built-ins/Object/create/15.2.3.5-4-282.js index 29b22dd8c6..88805140c7 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-282.js +++ b/test/built-ins/Object/create/15.2.3.5-4-282.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var boolObj = new Boolean(true); var data = "data"; boolObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-283.js b/test/built-ins/Object/create/15.2.3.5-4-283.js index 29f5aaefdc..16bbd2655c 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-283.js +++ b/test/built-ins/Object/create/15.2.3.5-4-283.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var numObj = new Number(5); var data = "data"; numObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-285.js b/test/built-ins/Object/create/15.2.3.5-4-285.js index 3fd9454884..1bf31557bc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-285.js +++ b/test/built-ins/Object/create/15.2.3.5-4-285.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var dateObj = new Date(); var data = "data"; dateObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-286.js b/test/built-ins/Object/create/15.2.3.5-4-286.js index 8ea9cbd353..15e839baff 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-286.js +++ b/test/built-ins/Object/create/15.2.3.5-4-286.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var regObj = new RegExp(); var data = "data"; regObj.set = function (value) { @@ -25,6 +23,5 @@ function testcase() { newObj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-288.js b/test/built-ins/Object/create/15.2.3.5-4-288.js index c36e731f2d..1db623aa7e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-288.js +++ b/test/built-ins/Object/create/15.2.3.5-4-288.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var errObj = new Error("error"); var data = "data"; @@ -24,6 +22,5 @@ function testcase() { newObj.prop = "overrideData"; - return newObj.hasOwnProperty("prop") && data === "overrideData"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-289.js b/test/built-ins/Object/create/15.2.3.5-4-289.js index 1b48164507..f14ebb6674 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-289.js +++ b/test/built-ins/Object/create/15.2.3.5-4-289.js @@ -7,10 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a) -includes: [runTestCase.js] ---*/ -function testcase() { var argObj = (function () { return arguments; })(); var data = "data"; @@ -27,6 +25,5 @@ function testcase() { newobj.prop = "overrideData"; - return hasProperty && data === "overrideData"; - } -runTestCase(testcase); +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-29.js b/test/built-ins/Object/create/15.2.3.5-4-29.js index 0ca27e2d21..bcd6fdb518 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-29.js +++ b/test/built-ins/Object/create/15.2.3.5-4-29.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is an Array object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = []; props.prop = { value: {}, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-298.js b/test/built-ins/Object/create/15.2.3.5-4-298.js index 6dc9746e8c..e47f6121d0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-298.js +++ b/test/built-ins/Object/create/15.2.3.5-4-298.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-298 description: > Object.create - 'set' property of one property in 'Properties' is a function (8.10.5 step 8.b) -includes: [runTestCase.js] ---*/ -function testcase() { var data = "data"; var newObj = Object.create({}, { @@ -22,6 +20,5 @@ function testcase() { newObj.prop = "overrideData"; - return newObj.hasOwnProperty("prop") && data === "overrideData"; - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(data, "overrideData", 'data'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-30.js b/test/built-ins/Object/create/15.2.3.5-4-30.js index 701ef24e8b..13b59d8afb 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-30.js +++ b/test/built-ins/Object/create/15.2.3.5-4-30.js @@ -7,11 +7,8 @@ description: > Object.create - 'Properties' is a String object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new String(); props.prop = { value: 12, @@ -19,6 +16,4 @@ function testcase() { }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-308.js b/test/built-ins/Object/create/15.2.3.5-4-308.js index 57286d1f46..07980d2878 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-308.js +++ b/test/built-ins/Object/create/15.2.3.5-4-308.js @@ -6,10 +6,8 @@ es5id: 15.2.3.5-4-308 description: > Object.create - [[Enumerable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i) -includes: [runTestCase.js] ---*/ -function testcase() { var isEnumerable = false; var newObj = Object.create({}, { @@ -27,6 +25,6 @@ function testcase() { isEnumerable = true; } } - return hasProperty && !isEnumerable; - } -runTestCase(testcase); + +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(isEnumerable, false, 'isEnumerable'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-31.js b/test/built-ins/Object/create/15.2.3.5-4-31.js index d1b3048d71..45044ed2f3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-31.js +++ b/test/built-ins/Object/create/15.2.3.5-4-31.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is a Boolean object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Boolean(false); props.prop = { value: 12, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-310.js b/test/built-ins/Object/create/15.2.3.5-4-310.js index e91e31d61b..e61fac09df 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-310.js +++ b/test/built-ins/Object/create/15.2.3.5-4-310.js @@ -7,10 +7,8 @@ description: > Object.create - [[Get]] is set as undefined if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var newObj = Object.create({}, { prop: { set: function () { }, @@ -18,6 +16,6 @@ function testcase() { configurable: true } }); - return newObj.hasOwnProperty("prop") && newObj.prop === undefined; - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); +assert.sameValue(newObj.prop, undefined, 'newObj.prop'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-311.js b/test/built-ins/Object/create/15.2.3.5-4-311.js index 03cce03798..c9e5b2cf44 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-311.js +++ b/test/built-ins/Object/create/15.2.3.5-4-311.js @@ -7,10 +7,8 @@ description: > Object.create - [[Set]] is set as undefined if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var newObj = Object.create({}, { prop: { get: function () { @@ -41,6 +39,7 @@ function testcase() { delete newObj.prop; verifyConfigurable = !newObj.hasOwnProperty("prop") && hasProperty; - return verifySet && verifyGet && verifyEnumerable && verifyConfigurable; - } -runTestCase(testcase); +assert(verifySet, 'verifySet !== true'); +assert(verifyGet, 'verifyGet !== true'); +assert(verifyEnumerable, 'verifyEnumerable !== true'); +assert(verifyConfigurable, 'verifyConfigurable !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-312.js b/test/built-ins/Object/create/15.2.3.5-4-312.js index a5b4197c7d..d6e54fa175 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-312.js +++ b/test/built-ins/Object/create/15.2.3.5-4-312.js @@ -7,10 +7,8 @@ description: > Object.create - [[Enumerable]] is set as false if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b) -includes: [runTestCase.js] ---*/ -function testcase() { var isEnumerable = false; var newObj = Object.create({}, { prop: { @@ -25,6 +23,6 @@ function testcase() { isEnumerable = true; } } - return hasProperty && !isEnumerable; - } -runTestCase(testcase); + +assert(hasProperty, 'hasProperty !== true'); +assert.sameValue(isEnumerable, false, 'isEnumerable'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-314.js b/test/built-ins/Object/create/15.2.3.5-4-314.js index cf94ee6c1f..7fd8b2b126 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-314.js +++ b/test/built-ins/Object/create/15.2.3.5-4-314.js @@ -6,14 +6,10 @@ es5id: 15.2.3.5-4-314 description: > Object.create - some enumerable own property in 'Properties' is empty object (15.2.3.7 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { foo: {} }); - return newObj.hasOwnProperty("foo"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("foo"), 'newObj.hasOwnProperty("foo") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-316.js b/test/built-ins/Object/create/15.2.3.5-4-316.js index c8da264323..bc43715d49 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-316.js +++ b/test/built-ins/Object/create/15.2.3.5-4-316.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-316 description: > Object.create - enumerable properties of 'Properties' are given numerical names (15.2.3.7 step 7) -includes: [runTestCase.js] ---*/ -function testcase() { - function getFunc() { return 20; } @@ -36,6 +33,7 @@ function testcase() { configurable: true } }); - return newObj[0] === 100 && newObj[1] === 20 && newObj[2] === 200; - } -runTestCase(testcase); + +assert.sameValue(newObj[0], 100, 'newObj[0]'); +assert.sameValue(newObj[1], 20, 'newObj[1]'); +assert.sameValue(newObj[2], 200, 'newObj[2]'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-32.js b/test/built-ins/Object/create/15.2.3.5-4-32.js index b6eab8f35f..2e4d7c4365 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-32.js +++ b/test/built-ins/Object/create/15.2.3.5-4-32.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is a Number object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Number(-9); props.prop = { value: 12, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-34.js b/test/built-ins/Object/create/15.2.3.5-4-34.js index cc998a4e99..33bf19e07f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-34.js +++ b/test/built-ins/Object/create/15.2.3.5-4-34.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is a Date object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Date(); props.prop = { value: 12, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-35.js b/test/built-ins/Object/create/15.2.3.5-4-35.js index 9f92d11226..effb3e92e7 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-35.js +++ b/test/built-ins/Object/create/15.2.3.5-4-35.js @@ -7,17 +7,13 @@ description: > Object.create - 'Properties' is a RegExp object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new RegExp(); props.prop = { value: 12, enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-37.js b/test/built-ins/Object/create/15.2.3.5-4-37.js index 73be77d039..dcef0aea44 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-37.js +++ b/test/built-ins/Object/create/15.2.3.5-4-37.js @@ -7,11 +7,8 @@ description: > Object.create - 'Properties' is an Error object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Error("test"); (Object.getOwnPropertyNames(props)).forEach(function(name){ @@ -23,6 +20,5 @@ function testcase() { enumerable: true }; var newObj = Object.create({}, props); - return newObj.hasOwnProperty("prop15_2_3_5_4_37"); - } -runTestCase(testcase); + +assert(newObj.hasOwnProperty("prop15_2_3_5_4_37"), 'newObj.hasOwnProperty("prop15_2_3_5_4_37") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-38.js b/test/built-ins/Object/create/15.2.3.5-4-38.js index ec131fc01c..b0ffcabf08 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-38.js +++ b/test/built-ins/Object/create/15.2.3.5-4-38.js @@ -7,11 +7,8 @@ description: > Object.create - 'Properties' is an Arguments object which implements its own [[Get]] method to access own enumerable property (15.2.3.7 step 5.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var argObj = (function () { return arguments; })(); argObj.prop = { @@ -21,6 +18,4 @@ function testcase() { var newObj = Object.create({}, argObj); - return newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-4.js b/test/built-ins/Object/create/15.2.3.5-4-4.js index 0f49788184..5cf42f78ec 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-4.js +++ b/test/built-ins/Object/create/15.2.3.5-4-4.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-4 description: > Object.create - argument 'Properties' is an object (15.2.3.7 step 2). -includes: [runTestCase.js] ---*/ -function testcase() { - var props = {}; var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-46.js b/test/built-ins/Object/create/15.2.3.5-4-46.js index 5fcb57f03c..b0bc6c13be 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-46.js +++ b/test/built-ins/Object/create/15.2.3.5-4-46.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-46 description: > Object.create - 'enumerable' property of one property in 'Properties' is true (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { prop: { @@ -22,7 +19,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-47.js b/test/built-ins/Object/create/15.2.3.5-4-47.js index 39dfbbfe58..1fc56ec9d6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-47.js +++ b/test/built-ins/Object/create/15.2.3.5-4-47.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-47 description: > Object.create - 'enumerable' property of one property in 'Properties' is not present (8.10.5 step 3) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -21,7 +18,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-48.js b/test/built-ins/Object/create/15.2.3.5-4-48.js index 879d46eedd..5c4b6e0b4b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-48.js +++ b/test/built-ins/Object/create/15.2.3.5-4-48.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-48 description: > Object.create - 'enumerable' property of one property in 'Properties' is own data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-49.js b/test/built-ins/Object/create/15.2.3.5-4-49.js index 25ca4bce40..77261ab265 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-49.js +++ b/test/built-ins/Object/create/15.2.3.5-4-49.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-49 description: > Object.create - 'enumerable' property of one property in 'Properties' is an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var proto = { @@ -29,7 +26,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-5.js b/test/built-ins/Object/create/15.2.3.5-4-5.js index 734a755099..f348366e07 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-5.js +++ b/test/built-ins/Object/create/15.2.3.5-4-5.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-5 description: > Object.create - argument 'Properties' is a Function object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = function () { }; var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-50.js b/test/built-ins/Object/create/15.2.3.5-4-50.js index a030d0009b..72e4b5269f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-50.js +++ b/test/built-ins/Object/create/15.2.3.5-4-50.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var proto = { enumerable: true @@ -34,6 +31,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-51.js b/test/built-ins/Object/create/15.2.3.5-4-51.js index 58ed986931..88e7e27786 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-51.js +++ b/test/built-ins/Object/create/15.2.3.5-4-51.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; var accessed = false; @@ -38,6 +35,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-52.js b/test/built-ins/Object/create/15.2.3.5-4-52.js index a679b680b6..66d732240f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-52.js +++ b/test/built-ins/Object/create/15.2.3.5-4-52.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-52 description: > Object.create - 'enumerable' property of one property in 'Properties' is own accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = {}; @@ -29,6 +26,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-53.js b/test/built-ins/Object/create/15.2.3.5-4-53.js index 9bb918f11b..46ae8e51bf 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-53.js +++ b/test/built-ins/Object/create/15.2.3.5-4-53.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-53 description: > Object.create - 'enumerable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; var accessed = false; @@ -33,6 +30,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-54.js b/test/built-ins/Object/create/15.2.3.5-4-54.js index 4dad563bed..1ca9d8db5f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-54.js +++ b/test/built-ins/Object/create/15.2.3.5-4-54.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var proto = { enumerable: true @@ -35,6 +32,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-55.js b/test/built-ins/Object/create/15.2.3.5-4-55.js index c62e525856..3111507b4d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-55.js +++ b/test/built-ins/Object/create/15.2.3.5-4-55.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; var accessed = false; Object.defineProperty(proto, "enumerable", { @@ -38,6 +35,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-56.js b/test/built-ins/Object/create/15.2.3.5-4-56.js index 0b3ed4f614..1d71a5d36a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-56.js +++ b/test/built-ins/Object/create/15.2.3.5-4-56.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = {}; Object.defineProperty(descObj, "enumerable", { @@ -26,6 +23,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-57.js b/test/built-ins/Object/create/15.2.3.5-4-57.js index abcf6e34a3..d39fd50352 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-57.js +++ b/test/built-ins/Object/create/15.2.3.5-4-57.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var proto = {}; var accessed = false; Object.defineProperty(proto, "enumerable", { @@ -36,6 +33,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-58.js b/test/built-ins/Object/create/15.2.3.5-4-58.js index 5903a71c65..2054d70d5d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-58.js +++ b/test/built-ins/Object/create/15.2.3.5-4-58.js @@ -7,12 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - - var proto = {}; var accessed = false; @@ -32,6 +28,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-59.js b/test/built-ins/Object/create/15.2.3.5-4-59.js index e3115b4b10..0c85eb4e60 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-59.js +++ b/test/built-ins/Object/create/15.2.3.5-4-59.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = function () { }; @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-6.js b/test/built-ins/Object/create/15.2.3.5-4-6.js index 2c843f6f95..d216b379a3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-6.js +++ b/test/built-ins/Object/create/15.2.3.5-4-6.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-6 description: > Object.create - argument 'Properties' is an Array object (15.2.3.7 step 2). -includes: [runTestCase.js] ---*/ -function testcase() { - var props = []; var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-60.js b/test/built-ins/Object/create/15.2.3.5-4-60.js index 43ec0a9b62..06cc1e9756 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-60.js +++ b/test/built-ins/Object/create/15.2.3.5-4-60.js @@ -7,12 +7,8 @@ description: > Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - - var accessed = false; var descObj = []; @@ -26,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-61.js b/test/built-ins/Object/create/15.2.3.5-4-61.js index 35954e33a9..5bdb0912fa 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-61.js +++ b/test/built-ins/Object/create/15.2.3.5-4-61.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new String(); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-62.js b/test/built-ins/Object/create/15.2.3.5-4-62.js index c962888c01..cd237f4bdd 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-62.js +++ b/test/built-ins/Object/create/15.2.3.5-4-62.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new Boolean(false); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-63.js b/test/built-ins/Object/create/15.2.3.5-4-63.js index e82a7dbfa2..0af44b539b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-63.js +++ b/test/built-ins/Object/create/15.2.3.5-4-63.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new Number(-9); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-65.js b/test/built-ins/Object/create/15.2.3.5-4-65.js index d1f383f458..d4e700a4a3 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-65.js +++ b/test/built-ins/Object/create/15.2.3.5-4-65.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new Date(); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-66.js b/test/built-ins/Object/create/15.2.3.5-4-66.js index 1d133f1e34..3a893bfc2e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-66.js +++ b/test/built-ins/Object/create/15.2.3.5-4-66.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new RegExp(); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-68.js b/test/built-ins/Object/create/15.2.3.5-4-68.js index 9c25618353..6a1c26234a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-68.js +++ b/test/built-ins/Object/create/15.2.3.5-4-68.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var descObj = new Error(); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-69.js b/test/built-ins/Object/create/15.2.3.5-4-69.js index 07be9d5824..59f4183229 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-69.js +++ b/test/built-ins/Object/create/15.2.3.5-4-69.js @@ -7,11 +7,8 @@ description: > Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var argObj = (function () { return arguments; })(); @@ -25,6 +22,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-7.js b/test/built-ins/Object/create/15.2.3.5-4-7.js index 6876a5dfb7..daee331b97 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-7.js +++ b/test/built-ins/Object/create/15.2.3.5-4-7.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-7 description: > Object.create - argument 'Properties' is a String object (15.2.3.7 step 2) -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new String(); var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-72.js b/test/built-ins/Object/create/15.2.3.5-4-72.js index 4fc6e00b0b..46c3157451 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-72.js +++ b/test/built-ins/Object/create/15.2.3.5-4-72.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-72 description: > Object.create - 'enumerable' property of one property in 'Properties' is undefined (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-73.js b/test/built-ins/Object/create/15.2.3.5-4-73.js index cbffc22e49..b67405d353 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-73.js +++ b/test/built-ins/Object/create/15.2.3.5-4-73.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-73 description: > Object.create - value of 'enumerable' property of one property in 'Properties' is null (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return !accessed; - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-74.js b/test/built-ins/Object/create/15.2.3.5-4-74.js index 74af463d73..6971654ace 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-74.js +++ b/test/built-ins/Object/create/15.2.3.5-4-74.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-74 description: > Object.create - 'enumerable' property of one property in 'Properties' is true (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-75.js b/test/built-ins/Object/create/15.2.3.5-4-75.js index bd6124725c..8c69638b05 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-75.js +++ b/test/built-ins/Object/create/15.2.3.5-4-75.js @@ -6,12 +6,8 @@ es5id: 15.2.3.5-4-75 description: > Object.create - 'enumerable' property of one property in 'Properties' is false (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - - var accessed = false; var descObj = { enumerable: false @@ -25,6 +21,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-76.js b/test/built-ins/Object/create/15.2.3.5-4-76.js index 7f6644b4b8..3924258d3a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-76.js +++ b/test/built-ins/Object/create/15.2.3.5-4-76.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-76 description: > Object.create - 'enumerable' property of one property in 'Properties' is 0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-77.js b/test/built-ins/Object/create/15.2.3.5-4-77.js index 0f2a3805ec..c3d8cb2900 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-77.js +++ b/test/built-ins/Object/create/15.2.3.5-4-77.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-77 description: > Object.create - 'enumerable' property of one property in 'Properties' is +0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-78.js b/test/built-ins/Object/create/15.2.3.5-4-78.js index 9a04695b06..1b85d21f9d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-78.js +++ b/test/built-ins/Object/create/15.2.3.5-4-78.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-78 description: > Object.create - 'enumerable' property of one property in 'Properties' is -0 (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-79.js b/test/built-ins/Object/create/15.2.3.5-4-79.js index 32346e324b..472f164d24 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-79.js +++ b/test/built-ins/Object/create/15.2.3.5-4-79.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-79 description: > Object.create - 'enumerable' property of one property in 'Properties' is NaN (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-8.js b/test/built-ins/Object/create/15.2.3.5-4-8.js index de072d645d..d87b1b6e3e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-8.js +++ b/test/built-ins/Object/create/15.2.3.5-4-8.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-8 description: > Object.create - argument 'Properties' is a Boolean object whose primitive value is true (15.2.3.7 step 2). -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Boolean(true); var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-80.js b/test/built-ins/Object/create/15.2.3.5-4-80.js index 0129c7ecd4..84207e3825 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-80.js +++ b/test/built-ins/Object/create/15.2.3.5-4-80.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-80 description: > Object.create - 'enumerable' property of one property in 'Properties' is a positive number primitive (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-81.js b/test/built-ins/Object/create/15.2.3.5-4-81.js index 55ac7463af..27f1fde732 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-81.js +++ b/test/built-ins/Object/create/15.2.3.5-4-81.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-81 description: > Object.create - 'enumerable' property of one property in 'Properties' is a negative number primitive (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-82.js b/test/built-ins/Object/create/15.2.3.5-4-82.js index 5f9219d3ac..c86ae44b3d 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-82.js +++ b/test/built-ins/Object/create/15.2.3.5-4-82.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-82 description: > Object.create - 'enumerable' property of one property in 'Properties' is an empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,6 @@ function testcase() { accessed = true; } } - return !accessed && newObj.hasOwnProperty("prop"); - } -runTestCase(testcase); + +assert.sameValue(accessed, false, 'accessed'); +assert(newObj.hasOwnProperty("prop"), 'newObj.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-83.js b/test/built-ins/Object/create/15.2.3.5-4-83.js index 58bcd96d39..d0a69d948b 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-83.js +++ b/test/built-ins/Object/create/15.2.3.5-4-83.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-83 description: > Object.create - 'enumerable' property of one property in 'Properties' is a non-empty string (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-84.js b/test/built-ins/Object/create/15.2.3.5-4-84.js index 8e3a4dda07..c0721deedd 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-84.js +++ b/test/built-ins/Object/create/15.2.3.5-4-84.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-84 description: > Object.create - 'enumerable' property of one property in 'Properties' is a Function object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-85.js b/test/built-ins/Object/create/15.2.3.5-4-85.js index 3baa0d0984..b7aa0da3a0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-85.js +++ b/test/built-ins/Object/create/15.2.3.5-4-85.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-85 description: > Object.create - 'enumerable' property of one property in 'Properties' is an Array object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-86.js b/test/built-ins/Object/create/15.2.3.5-4-86.js index 4d86cc767d..d089bb6112 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-86.js +++ b/test/built-ins/Object/create/15.2.3.5-4-86.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-86 description: > Object.create - 'enumerable' property of one property in 'Properties' is a String object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-87.js b/test/built-ins/Object/create/15.2.3.5-4-87.js index b4e9d6be55..d31f4e86a6 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-87.js +++ b/test/built-ins/Object/create/15.2.3.5-4-87.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-87 description: > Object.create - 'enumerable' property of one property in 'Properties' is a Boolean object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-88.js b/test/built-ins/Object/create/15.2.3.5-4-88.js index e0662910a4..83e38608fc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-88.js +++ b/test/built-ins/Object/create/15.2.3.5-4-88.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-88 description: > Object.create - 'enumerable' property of one property in 'Properties' is a Number object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-89.js b/test/built-ins/Object/create/15.2.3.5-4-89.js index 3db752a06a..b8c211e183 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-89.js +++ b/test/built-ins/Object/create/15.2.3.5-4-89.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-89 description: > Object.create - 'enumerable' property of one property in 'Properties' is the Math object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-9.js b/test/built-ins/Object/create/15.2.3.5-4-9.js index 7109345ff0..564f8ac0cc 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-9.js +++ b/test/built-ins/Object/create/15.2.3.5-4-9.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-9 description: > Object.create - argument 'Properties' is a Number object whose primitive value is any interesting number (15.2.3.7 step 2). -includes: [runTestCase.js] ---*/ -function testcase() { - var props = new Number(12); var result = false; @@ -22,6 +19,5 @@ function testcase() { enumerable: true }); Object.create({}, props); - return result; - } -runTestCase(testcase); + +assert(result, 'result !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-90.js b/test/built-ins/Object/create/15.2.3.5-4-90.js index f5e0c38f0e..21fc225b81 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-90.js +++ b/test/built-ins/Object/create/15.2.3.5-4-90.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-90 description: > Object.create - 'enumerable' property of one property in 'Properties' is a Date object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-91.js b/test/built-ins/Object/create/15.2.3.5-4-91.js index 0be6bf753e..c9ea3746e5 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-91.js +++ b/test/built-ins/Object/create/15.2.3.5-4-91.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-91 description: > Object.create - 'enumerable' property of one property in 'Properties' is a RegExp object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-92.js b/test/built-ins/Object/create/15.2.3.5-4-92.js index 44ff8608c4..535b22ee19 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-92.js +++ b/test/built-ins/Object/create/15.2.3.5-4-92.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-92 description: > Object.create - 'enumerable' property of one property in 'Properties' is the JSON object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-93.js b/test/built-ins/Object/create/15.2.3.5-4-93.js index deae3346fc..1ac6ded11a 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-93.js +++ b/test/built-ins/Object/create/15.2.3.5-4-93.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-93 description: > Object.create - 'enumerable' property of one property in 'Properties' is an Error object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -23,6 +20,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-94.js b/test/built-ins/Object/create/15.2.3.5-4-94.js index d9d86058bc..4f33838fce 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-94.js +++ b/test/built-ins/Object/create/15.2.3.5-4-94.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-94 description: > Object.create - 'enumerable' property of one property in 'Properties' is an Arguments object (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var argObj = (function () { return arguments; })(); @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-96.js b/test/built-ins/Object/create/15.2.3.5-4-96.js index 93161067c1..c380a4bc20 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-96.js +++ b/test/built-ins/Object/create/15.2.3.5-4-96.js @@ -6,13 +6,9 @@ es5id: 15.2.3.5-4-96 description: > Object.create - 'enumerable' property of one property in 'Properties' is the global object (8.10.5 step 3.b) -includes: - - runTestCase.js - - fnGlobalObject.js +includes: [fnGlobalObject.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -25,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-97.js b/test/built-ins/Object/create/15.2.3.5-4-97.js index 8ee6e3d67c..86b471b8c0 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-97.js +++ b/test/built-ins/Object/create/15.2.3.5-4-97.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is a string (value is 'false'), which is treated as the value true (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-98.js b/test/built-ins/Object/create/15.2.3.5-4-98.js index aadda7e18a..49b6b8214f 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-98.js +++ b/test/built-ins/Object/create/15.2.3.5-4-98.js @@ -7,11 +7,8 @@ description: > Object.create - 'enumerable' property of one property in 'Properties' is new Boolean(false), which is treated as the value true (8.10.5 step 3.b) -includes: [runTestCase.js] ---*/ -function testcase() { - var accessed = false; var newObj = Object.create({}, { @@ -24,6 +21,5 @@ function testcase() { accessed = true; } } - return accessed; - } -runTestCase(testcase); + +assert(accessed, 'accessed !== true'); diff --git a/test/built-ins/Object/create/15.2.3.5-4-99.js b/test/built-ins/Object/create/15.2.3.5-4-99.js index 63a0e938f0..cff852151e 100644 --- a/test/built-ins/Object/create/15.2.3.5-4-99.js +++ b/test/built-ins/Object/create/15.2.3.5-4-99.js @@ -6,11 +6,8 @@ es5id: 15.2.3.5-4-99 description: > Object.create - 'configurable' property of one property in 'Properties' is true (8.10.5 step 4) -includes: [runTestCase.js] ---*/ -function testcase() { - var newObj = Object.create({}, { prop: { configurable: true @@ -21,6 +18,5 @@ function testcase() { delete newObj.prop; var result2 = newObj.hasOwnProperty("prop"); - return result1 === true && result2 === false; - } -runTestCase(testcase); +assert.sameValue(result1, true, 'result1'); +assert.sameValue(result2, false, 'result2');