third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html - Issue 1237343004: Convert MediaKeyStatusMap to iterable<BufferSource,MediaKeyStatus>

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-keystatuses.html

Issue 1237343004: Convert MediaKeyStatusMap to iterable<BufferSource,MediaKeyStatus> (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: return any Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js » ('j') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>Verify MediaKeySession.keyStatuses</title>	4 <title>Verify MediaKeySession.keyStatuses</title>

5 <script src="encrypted-media-utils.js"></script>	5 <script src="encrypted-media-utils.js"></script>

6 <script src="../../resources/testharness.js"></script>	6 <script src="../../resources/testharness.js"></script>

7 <script src="../../resources/testharnessreport.js"></script>	7 <script src="../../resources/testharnessreport.js"></script>

8 </head>	8 </head>

9 <body>	9 <body>

10 <div id="log"></div>	10 <div id="log"></div>

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 result = [];	76 result = [];

77 for (var entry of mediaKeySession.keyStatuses.entries()) {	77 for (var entry of mediaKeySession.keyStatuses.entries()) {

78 result.push({ key: arrayBufferAsString(entry[0]), value: entry[1] });	78 result.push({ key: arrayBufferAsString(entry[0]), value: entry[1] });

79 }	79 }

80 assert_object_equals(result,	80 assert_object_equals(result,

81 [{ key: key1String, value: 'usable'}, { key: key2String, value: 'usable'}],	81 [{ key: key1String, value: 'usable'}, { key: key2String, value: 'usable'}],

82 'keyStatuses.entries() fails');	82 'keyStatuses.entries() fails');

83	83

84 // forEach() should return both entries.	84 // forEach() should return both entries.

85 result = [];	85 result = [];

86 mediaKeySession.keyStatuses.forEach(function(value, key, map ) {	86 mediaKeySession.keyStatuses.forEach(function(status, keyId) {

87 result.push({ key: arrayBufferAsString(key), value: valu e });	87 result.push({ key: arrayBufferAsString(keyId), value: st atus });

88 });	88 });

89 assert_object_equals(result,	89 assert_object_equals(result,

90 [{ key: key1String, value: 'usable'}, { key: key2String, value: 'usable'}],	90 [{ key: key1String, value: 'usable'}, { key: key2String, value: 'usable'}],

91 'keyStatuses.forEach() fails');	91 'keyStatuses.forEach() fails');

92	92

93 assert_true(mediaKeySession.keyStatuses.has(key1));	93 assert_true(mediaKeySession.keyStatuses.has(key1));
	ddorwin 2016/06/14 20:56:05 It would be nice to have separate tests that check It would be nice to have separate tests that check for key IDs that are close but not present. For example, first/last byte different, one byte shorter (on each end), and one byte longer (on each end). This can be a separate CL. jrummell 2016/06/14 22:24:21 Acknowledged. Show quoted text On 2016/06/14 20:56:05, ddorwin wrote: > It would be nice to have separate tests that check for key IDs that are close > but not present. For example, first/last byte different, one byte shorter (on > each end), and one byte longer (on each end). > > This can be a separate CL. Acknowledged.
94 assert_true(mediaKeySession.keyStatuses.has(key2));	94 assert_true(mediaKeySession.keyStatuses.has(key2));

95 assert_false(mediaKeySession.keyStatuses.has(stringToUint8Ar ray('123456')));	95 assert_false(mediaKeySession.keyStatuses.has(stringToUint8Ar ray('123456')));

96 assert_equals(mediaKeySession.keyStatuses.get(key1), 'usable ');	96 assert_equals(mediaKeySession.keyStatuses.get(key1), 'usable ');

97 assert_equals(mediaKeySession.keyStatuses.get(key2), 'usable ');	97 assert_equals(mediaKeySession.keyStatuses.get(key2), 'usable ');

98 assert_equals(mediaKeySession.keyStatuses.get(stringToUint8A rray('123456')), undefined);	98 assert_equals(mediaKeySession.keyStatuses.get(stringToUint8A rray('123456')), undefined);

99	99

100 test.done();	100 test.done();

101 }	101 }

102	102

103 getSupportedInitDataType().then(function(type) {	103 getSupportedInitDataType().then(function(type) {

(...skipping 10 matching lines...) Expand all Loading...
114	114

115 waitForEventAndRunStep('message', mediaKeySession, processMe ssage, test);	115 waitForEventAndRunStep('message', mediaKeySession, processMe ssage, test);

116 return mediaKeySession.generateRequest(initDataType, initDat a);	116 return mediaKeySession.generateRequest(initDataType, initDat a);

117 }).catch(function(error) {	117 }).catch(function(error) {

118 forceTestFailureFromPromise(test, error);	118 forceTestFailureFromPromise(test, error);

119 });	119 });

120 }, 'Verify MediaKeySession.keyStatuses.');	120 }, 'Verify MediaKeySession.keyStatuses.');

121 </script>	121 </script>

122 </body>	122 </body>

123 </html>	123 </html>

OLD	NEW