Bug 1069416 - Part 7: Remove JS_HAS_SYMBOLS from dom. r=smaug

This commit is contained in:
Tooru Fujisawa 2015-01-28 13:06:38 +09:00
parent 05bc042611
commit da76cd2dcf
5 changed files with 8 additions and 36 deletions

View File

@ -16,9 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1066432
var testInterfaceJS = new TestInterfaceJS();
ok(testInterfaceJS, "got a TestInterfaceJS object");
var JS_HAS_SYMBOLS = typeof Symbol === "function";
var std_iterator = JS_HAS_SYMBOLS ? Symbol.iterator : "@@iterator";
var nonIterableObject = {[std_iterator]: 5};
var nonIterableObject = {[Symbol.iterator]: 5};
try {
testInterfaceJS.testSequenceOverload(nonIterableObject);

View File

@ -32,9 +32,7 @@ names = [];
for (var name in x) {
names.push(name);
}
var JS_HAS_SYMBOLS = typeof Symbol === "function";
is(names.length, JS_HAS_SYMBOLS ? 9 : 10,
"Should have 9 enumerated names (or 10 with '@@iterator')");
is(names.length, 9, "Should have 9 enumerated names");
is(names[0], "0", "Enum entry 1");
is(names[1], "1", "Enum entry 2");
is(names[2], "2", "Enum entry 3");
@ -43,12 +41,7 @@ is(names[4], "4", "Enum entry 5");
is(names[5], "something", "Enum entry 6");
is(names[6], "namedItem", "Enum entry 7");
is(names[7], "item", "Enum entry 8");
if (JS_HAS_SYMBOLS) {
is(names[8], "length", "Enum entry 9");
} else {
is(names[8], "@@iterator", "Enum entry 9");
is(names[9], "length", "Enum entry 10");
}
is(names[8], "length", "Enum entry 9");
names = Object.getOwnPropertyNames(x);
is(names.length, 10, "Should have 10 items");

View File

@ -28,9 +28,7 @@ var names = [];
for (var name in x) {
names.push(name);
}
var JS_HAS_SYMBOLS = typeof Symbol === "function";
is(names.length, JS_HAS_SYMBOLS ? 8 : 9,
"Should have 8 enumerated names (or 9 with '@@iterator')");
is(names.length, 8, "Should have 8 enumerated names");
is(names[0], "0", "Enum entry 1")
is(names[1], "1", "Enum entry 2")
is(names[2], "2", "Enum entry 3")
@ -38,12 +36,7 @@ is(names[3], "3", "Enum entry 4")
is(names[4], "something", "Enum entry 5")
is(names[5], "item", "Enum entry 6")
is(names[6], "namedItem", "Enum entry 7")
if (JS_HAS_SYMBOLS) {
is(names[7], "length", "Enum entry 8");
} else {
is(names[7], "@@iterator", "Enum entry 8");
is(names[8], "length", "Enum entry 9");
}
is(names[7], "length", "Enum entry 8");
names = Object.getOwnPropertyNames(x);
is(names.length, 9, "Should have 9 items");

View File

@ -42,9 +42,7 @@ var names2 = [];
for (var name in opt) {
names2.push(name);
}
var JS_HAS_SYMBOLS = typeof Symbol === "function";
is(names2.length, JS_HAS_SYMBOLS ? 11 : 12,
"Should have eleven enumerated names (or twelve with '@@iterator')");
is(names2.length, 11, "Should have eleven enumerated names");
is(names2[0], "0", "Enum entry 1")
is(names2[1], "1", "Enum entry 2")
is(names2[2], "2", "Enum entry 3")
@ -56,9 +54,6 @@ is(names2[7], "length", "Enum entry 8")
is(names2[8], "selectedIndex", "Enum entry 9")
is(names2[9], "item", "Enum entry 10")
is(names2[10], "namedItem", "Enum entry 11")
if (!JS_HAS_SYMBOLS) {
is(names2[11], "@@iterator", "Enum entry 12");
}
</script>
</pre>

View File

@ -38,9 +38,7 @@ var names = [];
for (var name in x) {
names.push(name);
}
var JS_HAS_SYMBOLS = typeof Symbol === "function";
is(names.length, JS_HAS_SYMBOLS ? 10 : 11,
"Should have 10 enumerated names (or 11 with '@@iterator')");
is(names.length, 10, "Should have 10 enumerated names");
is(names[0], "0", "Enum entry 1")
is(names[1], "1", "Enum entry 2")
is(names[2], "2", "Enum entry 3")
@ -50,12 +48,7 @@ is(names[5], "5", "Enum entry 6")
is(names[6], "something", "Enum entry 7")
is(names[7], "item", "Enum entry 8")
is(names[8], "namedItem", "Enum entry 9")
if (JS_HAS_SYMBOLS) {
is(names[9], "length", "Enum entry 10");
} else {
is(names[9], "@@iterator", "Enum entry 10");
is(names[10], "length", "Enum entry 11");
}
is(names[9], "length", "Enum entry 10");
names = Object.getOwnPropertyNames(x);
is(names.length, 11, "Should have 11 items");