Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tests for return value of DOMTokenList's replace() method #9920

Merged
merged 3 commits into from
Mar 12, 2018
Merged

Add tests for return value of DOMTokenList's replace() method #9920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79643ca
Add tests for return value of DOMTokenList's replace() method
Zirro Mar 8, 2018
731c6ee
Add test for replacing a non-existent token with one that exists
Zirro Mar 8, 2018
abb3b0e
Update IDL for DOMTokenList's replace() method
Zirro Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 56 additions & 55 deletions dom/nodes/Element-classlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,65 +370,66 @@


// replace() method
function checkReplace(before, token, newToken, after, expectedException) {
checkModification(e, "replace", [token, newToken], undefined, before,
function checkReplace(before, token, newToken, expectedRes, after, expectedException) {
checkModification(e, "replace", [token, newToken], expectedRes, before,
after, expectedException, desc);
}

checkReplace(null, "", "a", null, "SyntaxError");
checkReplace(null, "", " ", null, "SyntaxError");
checkReplace(null, " ", "a", null, "InvalidCharacterError");
checkReplace(null, "\ta", "b", null, "InvalidCharacterError");
checkReplace(null, "a\t", "b", null, "InvalidCharacterError");
checkReplace(null, "\na", "b", null, "InvalidCharacterError");
checkReplace(null, "a\n", "b", null, "InvalidCharacterError");
checkReplace(null, "\fa", "b", null, "InvalidCharacterError");
checkReplace(null, "a\f", "b", null, "InvalidCharacterError");
checkReplace(null, "\ra", "b", null, "InvalidCharacterError");
checkReplace(null, "a\r", "b", null, "InvalidCharacterError");
checkReplace(null, " a", "b", null, "InvalidCharacterError");
checkReplace(null, "a ", "b", null, "InvalidCharacterError");

checkReplace(null, "a", "", null, "SyntaxError");
checkReplace(null, " ", "", null, "SyntaxError");
checkReplace(null, "a", " ", null, "InvalidCharacterError");
checkReplace(null, "b", "\ta", null, "InvalidCharacterError");
checkReplace(null, "b", "a\t", null, "InvalidCharacterError");
checkReplace(null, "b", "\na", null, "InvalidCharacterError");
checkReplace(null, "b", "a\n", null, "InvalidCharacterError");
checkReplace(null, "b", "\fa", null, "InvalidCharacterError");
checkReplace(null, "b", "a\f", null, "InvalidCharacterError");
checkReplace(null, "b", "\ra", null, "InvalidCharacterError");
checkReplace(null, "b", "a\r", null, "InvalidCharacterError");
checkReplace(null, "b", " a", null, "InvalidCharacterError");
checkReplace(null, "b", "a ", null, "InvalidCharacterError");

checkReplace("a", "a", "a", "a");
checkReplace("a", "a", "b", "b");
checkReplace("a", "A", "b", "a");
checkReplace("a b", "b", "A", "a A");
checkReplace("a b c", "d", "e", "a b c");
checkReplace(null, "", "a", null, null, "SyntaxError");
checkReplace(null, "", " ", null, null, "SyntaxError");
checkReplace(null, " ", "a", null, null, "InvalidCharacterError");
checkReplace(null, "\ta", "b", null, null, "InvalidCharacterError");
checkReplace(null, "a\t", "b", null, null, "InvalidCharacterError");
checkReplace(null, "\na", "b", null, null, "InvalidCharacterError");
checkReplace(null, "a\n", "b", null, null, "InvalidCharacterError");
checkReplace(null, "\fa", "b", null, null, "InvalidCharacterError");
checkReplace(null, "a\f", "b", null, null, "InvalidCharacterError");
checkReplace(null, "\ra", "b", null, null, "InvalidCharacterError");
checkReplace(null, "a\r", "b", null, null, "InvalidCharacterError");
checkReplace(null, " a", "b", null, null, "InvalidCharacterError");
checkReplace(null, "a ", "b", null, null, "InvalidCharacterError");

checkReplace(null, "a", "", null, null, "SyntaxError");
checkReplace(null, " ", "", null, null, "SyntaxError");
checkReplace(null, "a", " ", null, null, "InvalidCharacterError");
checkReplace(null, "b", "\ta", null, null, "InvalidCharacterError");
checkReplace(null, "b", "a\t", null, null, "InvalidCharacterError");
checkReplace(null, "b", "\na", null, null, "InvalidCharacterError");
checkReplace(null, "b", "a\n", null, null, "InvalidCharacterError");
checkReplace(null, "b", "\fa", null, null, "InvalidCharacterError");
checkReplace(null, "b", "a\f", null, null, "InvalidCharacterError");
checkReplace(null, "b", "\ra", null, null, "InvalidCharacterError");
checkReplace(null, "b", "a\r", null, null, "InvalidCharacterError");
checkReplace(null, "b", " a", null, null, "InvalidCharacterError");
checkReplace(null, "b", "a ", null, null, "InvalidCharacterError");

checkReplace("a", "a", "a", true, "a");
checkReplace("a", "a", "b", true, "b");
checkReplace("a", "A", "b", false, "a");
checkReplace("a b", "b", "A", true, "a A");
checkReplace("a b", "c", "a", false, "a b");
checkReplace("a b c", "d", "e", false, "a b c");
// https://github.com/whatwg/dom/issues/443
checkReplace("a a a b", "a", "a", "a b");
checkReplace("a a a b", "c", "d", "a a a b");
checkReplace(null, "a", "b", null);
checkReplace("", "a", "b", "");
checkReplace(" ", "a", "b", " ");
checkReplace(" a \f", "a", "b", "b");
checkReplace("a b c", "b", "d", "a d c");
checkReplace("a b c", "c", "a", "a b");
checkReplace("c b a", "c", "a", "a b");
checkReplace("a b a", "a", "c", "c b");
checkReplace("a b a", "b", "c", "a c");
checkReplace(" a a b", "a", "c", "c b");
checkReplace(" a a b", "b", "c", "a c");
checkReplace("\t\n\f\r a\t\n\f\r b\t\n\f\r ", "a", "c", "c b");
checkReplace("\t\n\f\r a\t\n\f\r b\t\n\f\r ", "b", "c", "a c");

checkReplace("a null", null, "b", "a b");
checkReplace("a b", "a", null, "null b");
checkReplace("a undefined", undefined, "b", "a b");
checkReplace("a b", "a", undefined, "undefined b");
checkReplace("a a a b", "a", "a", true, "a b");
checkReplace("a a a b", "c", "d", false, "a a a b");
checkReplace(null, "a", "b", false, null);
checkReplace("", "a", "b", false, "");
checkReplace(" ", "a", "b", false, " ");
checkReplace(" a \f", "a", "b", true, "b");
checkReplace("a b c", "b", "d", true, "a d c");
checkReplace("a b c", "c", "a", true, "a b");
checkReplace("c b a", "c", "a", true, "a b");
checkReplace("a b a", "a", "c", true, "c b");
checkReplace("a b a", "b", "c", true, "a c");
checkReplace(" a a b", "a", "c", true, "c b");
checkReplace(" a a b", "b", "c", true, "a c");
checkReplace("\t\n\f\r a\t\n\f\r b\t\n\f\r ", "a", "c", true, "c b");
checkReplace("\t\n\f\r a\t\n\f\r b\t\n\f\r ", "b", "c", true, "a c");

checkReplace("a null", null, "b", true, "a b");
checkReplace("a b", "a", null, true, "null b");
checkReplace("a undefined", undefined, "b", true, "a b");
checkReplace("a b", "a", undefined, true, "undefined b");
}

var content = document.getElementById("content");
Expand Down
2 changes: 1 addition & 1 deletion interfaces/dom.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ interface DOMTokenList {
[CEReactions] void add(DOMString... tokens);
[CEReactions] void remove(DOMString... tokens);
[CEReactions] boolean toggle(DOMString token, optional boolean force);
[CEReactions] void replace(DOMString token, DOMString newToken);
[CEReactions] boolean replace(DOMString token, DOMString newToken);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lukebjerring, this is a problem we're going to run in pretty quickly with generated IDL, where people update the tests together with the spec. As a reviewer, I think we should probably just say "yes please" and if there are any differences the auto-update will take care of it. WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably, differences would be subtle (whitespace, indenting, etc). Until the updater is mature, and we document how to run it, will just have to accept changes :)

boolean supports(DOMString token);
[CEReactions] stringifier attribute DOMString value;
// iterable<DOMString>;
Expand Down