From 7cbf7654e57e1f0eb14c76532ad8e83ab4b3fcdd Mon Sep 17 00:00:00 2001
From: Leonardo Balter <leonardo.balter@gmail.com>
Date: Tue, 30 Jun 2015 17:03:14 -0400
Subject: [PATCH] Improve coverage of MapIteratorPrototype
---
.../Symbol.toStringTag.js | 11 ++---
...not-have-mapiterator-internal-slots-map.js | 39 +++++++++++++++
...oes-not-have-mapiterator-internal-slots.js | 42 ++++++++++++++++
.../next/iteration-mutable.js | 16 +++----
.../MapIteratorPrototype/next/iteration.js | 10 ++--
.../MapIteratorPrototype/next/no-map-data.js | 15 ------
.../next/this-not-object-throw-entries.js | 48 +++++++++++++++++++
.../next/this-not-object-throw-keys.js | 48 +++++++++++++++++++
...his-not-object-throw-prototype-iterator.js | 48 +++++++++++++++++++
.../next/this-not-object-throw-values.js | 48 +++++++++++++++++++
10 files changed, 291 insertions(+), 34 deletions(-)
create mode 100644 test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots-map.js
create mode 100644 test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots.js
delete mode 100644 test/built-ins/MapIteratorPrototype/next/no-map-data.js
create mode 100644 test/built-ins/MapIteratorPrototype/next/this-not-object-throw-entries.js
create mode 100644 test/built-ins/MapIteratorPrototype/next/this-not-object-throw-keys.js
create mode 100644 test/built-ins/MapIteratorPrototype/next/this-not-object-throw-prototype-iterator.js
create mode 100644 test/built-ins/MapIteratorPrototype/next/this-not-object-throw-values.js
diff --git a/test/built-ins/MapIteratorPrototype/Symbol.toStringTag.js b/test/built-ins/MapIteratorPrototype/Symbol.toStringTag.js
index 6eadb5ac5b..d69331c9cc 100644
--- a/test/built-ins/MapIteratorPrototype/Symbol.toStringTag.js
+++ b/test/built-ins/MapIteratorPrototype/Symbol.toStringTag.js
@@ -1,12 +1,11 @@
// Copyright (C) 2014 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-
/*---
- description: >
- `Object.prototype.getOwnPropertyDescriptor` should reflect the value and
- writability of the @@toStringTag attribute.
- includes: [propertyHelper.js]
- es6id: 23.1.3.13
+es6id: 23.1.5.2.2
+description: >
+ `Object.prototype.getOwnPropertyDescriptor` should reflect the value and
+ writability of the @@toStringTag attribute.
+includes: [propertyHelper.js]
---*/
var MapIteratorProto = Object.getPrototypeOf(new Map()[Symbol.iterator]());
diff --git a/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots-map.js b/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots-map.js
new file mode 100644
index 0000000000..3adbd2d36a
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots-map.js
@@ -0,0 +1,39 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` does not have all of the internal slots of a Map
+ Iterator Instance.
+info: >
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ 3. If O does not have all of the internal slots of a Map Iterator Instance
+ (23.1.5.3), throw a TypeError exception.
+ ...
+features: [Symbol.iterator]
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+
+var iterator = map[Symbol.iterator]();
+assert.throws(TypeError, function() {
+ iterator.next.call(map);
+});
+
+iterator = map.entries();
+assert.throws(TypeError, function() {
+ iterator.next.call(map);
+});
+
+iterator = map.keys();
+assert.throws(TypeError, function() {
+ iterator.next.call(map);
+});
+
+iterator = map.values();
+assert.throws(TypeError, function() {
+ iterator.next.call(map);
+});
diff --git a/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots.js b/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots.js
new file mode 100644
index 0000000000..cc91197a88
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/does-not-have-mapiterator-internal-slots.js
@@ -0,0 +1,42 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` does not have all of the internal slots of a Map
+ Iterator Instance.
+info: >
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ 3. If O does not have all of the internal slots of a Map Iterator Instance
+ (23.1.5.3), throw a TypeError exception.
+ ...
+features: [Symbol.iterator]
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+
+var iterator = map[Symbol.iterator]();
+assert.throws(TypeError, function() {
+ iterator.next.call({});
+});
+
+iterator = map.entries();
+assert.throws(TypeError, function() {
+ iterator.next.call({});
+});
+
+iterator = map.keys();
+assert.throws(TypeError, function() {
+ iterator.next.call({});
+});
+
+iterator = map.values();
+assert.throws(TypeError, function() {
+ iterator.next.call({});
+});
+
+// does not throw an Error
+iterator.next.call(map[Symbol.iterator]());
diff --git a/test/built-ins/MapIteratorPrototype/next/iteration-mutable.js b/test/built-ins/MapIteratorPrototype/next/iteration-mutable.js
index 160dfd2fd2..0dfee3241c 100644
--- a/test/built-ins/MapIteratorPrototype/next/iteration-mutable.js
+++ b/test/built-ins/MapIteratorPrototype/next/iteration-mutable.js
@@ -1,14 +1,14 @@
// Copyright (C) 2014 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-
/*---
- description: >
- When an item is added to the map after the iterator is created but before
- the iterator is "done" (as defined by 23.1.5.2.1), the new item should be
- accessible via iteration. When an item is added to the map after the
- iterator is "done", the new item should not be accessible via iteration.
- es6id: 23.1.3.12
- ---*/
+es6id: 23.1.3.12
+description: >
+ When an item is added to the map after the iterator is created but before
+ the iterator is "done" (as defined by 23.1.5.2.1), the new item should be
+ accessible via iteration. When an item is added to the map after the
+ iterator is "done", the new item should not be accessible via iteration.
+features: [Symbol.iterator]
+---*/
var map = new Map();
map.set(1, 11);
diff --git a/test/built-ins/MapIteratorPrototype/next/iteration.js b/test/built-ins/MapIteratorPrototype/next/iteration.js
index 1532f27eea..178b044431 100644
--- a/test/built-ins/MapIteratorPrototype/next/iteration.js
+++ b/test/built-ins/MapIteratorPrototype/next/iteration.js
@@ -1,11 +1,11 @@
// Copyright (C) 2014 the V8 project authors. All rights reserved.
// This code is governed by the BSD license found in the LICENSE file.
-
/*---
- description: >
- The method should return a valid iterator with the context as the
- IteratedObject.
- es6id: 23.2.3.11
+es6id: 23.1.3.12
+description: >
+ The method should return a valid iterator with the context as the
+ IteratedObject.
+features: [Symbol.iterator]
---*/
var map = new Map();
diff --git a/test/built-ins/MapIteratorPrototype/next/no-map-data.js b/test/built-ins/MapIteratorPrototype/next/no-map-data.js
deleted file mode 100644
index a6ea3f6eb9..0000000000
--- a/test/built-ins/MapIteratorPrototype/next/no-map-data.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
- description: >
- If the context does not have a [[MapData]] internal slot, throw a
- TypeError exception as per 23.1.5.1.
- es6id: 23.1.3.12
- ---*/
-
-var iterator = new Map()[Symbol.iterator]();
-
-assert.throws(TypeError, function() {
- iterator.next.call({});
-});
diff --git a/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-entries.js b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-entries.js
new file mode 100644
index 0000000000..6f2680785c
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-entries.js
@@ -0,0 +1,48 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` value is not an Object.
+info: >
+ From Map.prototype.entries()
+
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ ...
+features:
+ - Symbol
+ - Symbol.iterator
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+var iterator = map.entries();
+
+assert.throws(TypeError, function() {
+ iterator.next.call(false);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(1);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call('');
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(undefined);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(null);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(Symbol());
+});
+
+// does not throw an Error
+iterator.next.call(map[Symbol.iterator]());
diff --git a/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-keys.js b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-keys.js
new file mode 100644
index 0000000000..9dfdce8495
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-keys.js
@@ -0,0 +1,48 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` value is not an Object.
+info: >
+ From Map.prototype.keys()
+
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ ...
+features:
+ - Symbol
+ - Symbol.iterator
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+var iterator = map.keys();
+
+assert.throws(TypeError, function() {
+ iterator.next.call(false);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(1);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call('');
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(undefined);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(null);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(Symbol());
+});
+
+// does not throw an Error
+iterator.next.call(map[Symbol.iterator]());
diff --git a/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-prototype-iterator.js b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-prototype-iterator.js
new file mode 100644
index 0000000000..c276879d9e
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-prototype-iterator.js
@@ -0,0 +1,48 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` value is not an Object.
+info: >
+ Using Map.prototype[Symbol.iterator]()
+
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ ...
+features:
+ - Symbol
+ - Symbol.iterator
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+var iterator = map[Symbol.iterator]();
+
+assert.throws(TypeError, function() {
+ iterator.next.call(false);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(1);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call('');
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(undefined);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(null);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(Symbol());
+});
+
+// does not throw an Error
+iterator.next.call(map[Symbol.iterator]());
diff --git a/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-values.js b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-values.js
new file mode 100644
index 0000000000..99511565fe
--- /dev/null
+++ b/test/built-ins/MapIteratorPrototype/next/this-not-object-throw-values.js
@@ -0,0 +1,48 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.5.2.1
+description: >
+ Throws a TypeError if `this` value is not an Object.
+info: >
+ From Map.prototype.values()
+
+ %MapIteratorPrototype%.next ( )
+
+ 1. Let O be the this value.
+ 2. If Type(O) is not Object, throw a TypeError exception.
+ ...
+features:
+ - Symbol
+ - Symbol.iterator
+---*/
+
+var map = new Map([[1, 11], [2, 22]]);
+var iterator = map.values();
+
+assert.throws(TypeError, function() {
+ iterator.next.call(false);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(1);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call('');
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(undefined);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(null);
+});
+
+assert.throws(TypeError, function() {
+ iterator.next.call(Symbol());
+});
+
+// does not throw an Error
+iterator.next.call(map[Symbol.iterator]());
--
GitLab