third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-clearkey-update-non-ascii-input.html - Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-clearkey-update-non-ascii-input.html

Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: auto detection of initDataType Created 4 years, 5 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

« third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-check-init-data-type.html ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-clear-key-invalid-license.html ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-events.html » ('j') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html » ('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>Test Clear Key handling of non-ASCII responses for update().</tit le>	4 <title>Test Clear Key handling of non-ASCII responses for update().</tit le>

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>

11 <script>	11 <script>

12 // This test passes \|response\| to update() as a JSON Web Key Set.	12 // This test passes \|response\| to update() as a JSON Web Key Set.

13 // CDMs other than Clear Key won't expect \|response\| in this format.	13 // CDMs other than Clear Key won't expect \|response\| in this format.

14	14

15 async_test(function(test)	15 async_test(function(test)

16 {	16 {

17 var initDataType;	17 var initDataType;

	18 var initData;

18 var mediaKeySession;	19 var mediaKeySession;

19	20

20 function processMessage(event)	21 function processMessage(event)

21 {	22 {

22 // \|jwkSet\| includes some non-ASCII characters.	23 // \|jwkSet\| includes some non-ASCII characters.

23 var jwkSet = '{"keys":[{'	24 var jwkSet = '{"keys":[{'

24 + '"kty":"oct\uDC00\uD800",'	25 + '"kty":"oct\uDC00\uD800",'

25 + '"k":"MDEyMzQ1Njc4OTAxMjM0NQ",'	26 + '"k":"MDEyMzQ1Njc4OTAxMjM0NQ",'

26 + '"kid":"MDEyMzQ1Njc4OTAxMjM0NQ"'	27 + '"kid":"MDEyMzQ1Njc4OTAxMjM0NQ"'

27 + '\xff\xfe}]';	28 + '\xff\xfe}]';

28 mediaKeySession.update(stringToUint8Array(jwkSet)).then(func tion() {	29 mediaKeySession.update(stringToUint8Array(jwkSet)).then(func tion() {

29 forceTestFailureFromPromise(test, 'Error: update() succe eded');	30 forceTestFailureFromPromise(test, 'Error: update() succe eded');

30 }, function(error) {	31 }, function(error) {

31 assert_equals(error.name, 'InvalidAccessError');	32 assert_equals(error.name, 'InvalidAccessError');

32 test.done();	33 test.done();

33 });	34 });

34 }	35 }

35	36

36 getSupportedInitDataType().then(function(type) {	37 navigator.requestMediaKeySystemAccess('org.w3.clearkey', simpleC onfiguration()).then(function(access) {

37 initDataType = type;	38 initDataType = access.getConfiguration().initDataTypes[0];

38 return navigator.requestMediaKeySystemAccess('org.w3.clearke y', [{}]);	39 initData = getInitData(initDataType);
	ddorwin 2016/07/20 17:05:27 This could be done at line 44 and we wouldn't need This could be done at line 44 and we wouldn't need 18. Unless this is a pattern you want to do consistently. I guess this is a pattern, though perhaps one we should fix in a separate CL. jrummell 2016/07/20 19:07:48 Most of the other tests set \|initDataType\| and \|in Show quoted text On 2016/07/20 17:05:27, ddorwin wrote: > This could be done at line 44 and we wouldn't need 18. Unless this is a pattern > you want to do consistently. > > I guess this is a pattern, though perhaps one we should fix in a separate CL. Most of the other tests set \|initDataType\| and \|initData\| at the same time, so I tried to use the same pattern everywhere.
39 }).then(function(access) {

40 return access.createMediaKeys();	40 return access.createMediaKeys();

41 }).then(function(mediaKeys) {	41 }).then(function(mediaKeys) {

42 mediaKeySession = mediaKeys.createSession();	42 mediaKeySession = mediaKeys.createSession();

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

44 return mediaKeySession.generateRequest(initDataType, getInit Data(initDataType));	44 return mediaKeySession.generateRequest(initDataType, initDat a);

45 });	45 });

46 }, 'Clear Key update() with non-ASCII response.');	46 }, 'Clear Key update() with non-ASCII response.');

47 </script>	47 </script>

48 </body>	48 </body>

49 </html>	49 </html>

OLD	NEW