Chromium Code Reviews| Index: LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html |
| diff --git a/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html b/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html |
| index 6283c1e5cce50d3f05a9d9abfcf85a5fe2380e27..6a3a9c31da47660ec593c14d4dd8dcf1ef4ff414 100644 |
| --- a/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html |
| +++ b/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html |
| @@ -37,29 +37,83 @@ |
| function processKeyStatusesChange(event) |
| { |
| + // Two keys added, so both should show up in |keyStatuses|. |
| assert_equals(mediaKeySession.keyStatuses.size, 2); |
| - consoleWrite("for (var entry of keyStatuses)"); |
| + dumpKeyStatuses(mediaKeySession.keyStatuses); |
| + |
| + // Check |keyStatuses| for 2 entries. |
| + var key1String = arrayBufferAsString(key1); |
| + var key2String = arrayBufferAsString(key2); |
| + var count = 0; |
| for (var entry of mediaKeySession.keyStatuses) { |
|
sandersd (OOO until July 31)
2015/01/30 20:40:00
This could be made into a helper function that, gi
jrummell
2015/01/30 22:33:56
Done.
|
| - consoleWrite(arrayBufferAsString(entry[0]) + ", " + entry[1]); |
| + ++count; |
| + assert_true(arrayBufferAsString(entry[0]) == key1String || |
| + arrayBufferAsString(entry[0]) == key2String); |
| + assert_equals(entry[1], 'usable'); |
| } |
| - consoleWrite("for (var key of keyStatuses.keys())"); |
| + assert_equals(count, 2, 'keyStatuses does not contain 2 entries'); |
| + |
| + // |keyStatuses| must contain both keys. |
| + count = 0; |
| + var seen1 = false; |
| + var seen2 = false; |
| for (var key of mediaKeySession.keyStatuses.keys()) { |
| - consoleWrite(arrayBufferAsString(key)); |
| + ++count; |
| + assert_true(arrayBufferAsString(key) == key1String || |
| + arrayBufferAsString(key) == key2String); |
| + if (arrayBufferAsString(key) == key1String) |
| + seen1 = true; |
| + if (arrayBufferAsString(key) == key2String) |
| + seen2 = true; |
| } |
| - consoleWrite("for (var value of keyStatuses.values())"); |
| + assert_equals(count, 2, 'keyStatuses.keys() does not contain 2 entries'); |
| + assert_true(seen1, 'key1 not returned'); |
| + assert_true(seen2, 'key2 not returned'); |
| + |
| + // Both values in |mediaKeySession| should be 'usable'. |
| + count = 0; |
| for (var value of mediaKeySession.keyStatuses.values()) { |
| - consoleWrite(value); |
| + ++count; |
| + assert_equals(value, 'usable'); |
| } |
| - consoleWrite("for (var entry of keyStatuses.entries())"); |
| + assert_equals(count, 2, 'keyStatuses.values() does not contain 2 entries'); |
| + |
| + // Check |keyStatuses.entries()|. |
| + count = 0; |
| for (var entry of mediaKeySession.keyStatuses.entries()) { |
| - consoleWrite(arrayBufferAsString(entry[0]) + ", " + entry[1]); |
| + ++count; |
| + assert_true(arrayBufferAsString(entry[0]) == key1String || |
| + arrayBufferAsString(entry[0]) == key2String); |
| + assert_equals(entry[1], 'usable'); |
| } |
| + assert_equals(count, 2, 'keyStatuses.entries() does not contain 2 entries'); |
| + |
| + // forEach() should return both entries. |
| + count = 0; |
| + seen1 = false; |
| + seen2 = false; |
| + mediaKeySession.keyStatuses.forEach(function(value, key, map) { |
| + ++count; |
| + assert_true(arrayBufferAsString(key) == key1String || |
| + arrayBufferAsString(key) == key2String); |
| + if (arrayBufferAsString(key) == key1String) |
| + seen1 = true; |
| + if (arrayBufferAsString(key) == key2String) |
| + seen2 = true; |
| + assert_equals(value, 'usable'); |
| + assert_equals(map, mediaKeySession.keyStatuses); |
| + }); |
| + assert_equals(count, 2, 'keyStatuses.forEach() does not contain 2 entries'); |
| + assert_true(seen1, 'key1 not returned'); |
| + assert_true(seen2, 'key2 not returned'); |
| + |
| assert_true(mediaKeySession.keyStatuses.has(key1)); |
| assert_true(mediaKeySession.keyStatuses.has(key2)); |
| assert_false(mediaKeySession.keyStatuses.has(stringToUint8Array('123456'))); |
| assert_equals(mediaKeySession.keyStatuses.get(key1), 'usable'); |
| assert_equals(mediaKeySession.keyStatuses.get(key2), 'usable'); |
| assert_equals(mediaKeySession.keyStatuses.get(stringToUint8Array('123456')), undefined); |
| + |
| test.done(); |
| } |