| OLD | NEW |
| 1 'use strict'; | 1 'use strict'; |
| 2 | 2 |
| 3 var test_text_data = 'Test text data.'; | 3 var test_text_data = 'Test text data.'; |
| 4 var test_text_byte_array = new TextEncoder('utf-8').encode(test_text_data); | 4 var test_text_byte_array = new TextEncoder('utf-8').encode(test_text_data); |
| 5 var test_number_data = 42; | 5 var test_number_data = 42; |
| 6 var test_json_data = {level: 1, score: 100, label: 'Game'}; | 6 var test_json_data = {level: 1, score: 100, label: 'Game'}; |
| 7 var test_url_data = 'https://w3c.github.io/web-nfc/'; | 7 var test_url_data = 'https://w3c.github.io/web-nfc/'; |
| 8 var test_message_origin = 'https://127.0.0.1:8443'; | 8 var test_message_origin = 'https://127.0.0.1:8443'; |
| 9 var test_buffer_data = new ArrayBuffer(test_text_byte_array.length); | 9 var test_buffer_data = new ArrayBuffer(test_text_byte_array.length); |
| 10 var test_buffer_view = new Uint8Array(test_buffer_data).set(test_text_byte_array
); | 10 var test_buffer_view = new Uint8Array(test_buffer_data).set(test_text_byte_array
); |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 'NFCMessages must have same number of NFCRecords'); | 121 'NFCMessages must have same number of NFCRecords'); |
| 122 | 122 |
| 123 // Compare contents of each individual NFCRecord | 123 // Compare contents of each individual NFCRecord |
| 124 for (let i = 0; i < provided.data.length; ++i) | 124 for (let i = 0; i < provided.data.length; ++i) |
| 125 compareNFCRecords(provided.data[i], receivedMessage.data[i]); | 125 compareNFCRecords(provided.data[i], receivedMessage.data[i]); |
| 126 } | 126 } |
| 127 | 127 |
| 128 // Compares NFCRecords that were provided / received by the mock service. | 128 // Compares NFCRecords that were provided / received by the mock service. |
| 129 function compareNFCRecords(providedRecord, receivedRecord) { | 129 function compareNFCRecords(providedRecord, receivedRecord) { |
| 130 assert_equals(toMojoNFCRecordType(providedRecord.recordType), | 130 assert_equals(toMojoNFCRecordType(providedRecord.recordType), |
| 131 receivedRecord.recordType); | 131 receivedRecord.record_type); |
| 132 | 132 |
| 133 // Compare media types without charset. | 133 // Compare media types without charset. |
| 134 // Charset should be compared when watch method is implemented, in order | 134 // Charset should be compared when watch method is implemented, in order |
| 135 // to check that written and read strings are equal. | 135 // to check that written and read strings are equal. |
| 136 assert_equals(providedRecord.mediaType, | 136 assert_equals(providedRecord.mediaType, |
| 137 receivedRecord.mediaType.substring(0, providedRecord.mediaType.length)
); | 137 receivedRecord.media_type.substring(0, providedRecord.mediaType.length
)); |
| 138 | 138 |
| 139 assert_false(toMojoNFCRecordType(providedRecord.recordType) == | 139 assert_false(toMojoNFCRecordType(providedRecord.recordType) == |
| 140 nfc.NFCRecordType.EMPTY); | 140 nfc.NFCRecordType.EMPTY); |
| 141 | 141 |
| 142 assert_array_equals(toByteArray(providedRecord.data), | 142 assert_array_equals(toByteArray(providedRecord.data), |
| 143 new Uint8Array(receivedRecord.data)); | 143 new Uint8Array(receivedRecord.data)); |
| 144 } | 144 } |
| 145 | 145 |
| 146 // Compares NFCPushOptions structures that were provided to API and | 146 // Compares NFCPushOptions structures that were provided to API and |
| 147 // received by the mock mojo service. | 147 // received by the mock mojo service. |
| 148 function assertNFCPushOptionsEqual(provided, received) { | 148 function assertNFCPushOptionsEqual(provided, received) { |
| 149 if (provided.ignoreRead !== undefined) | 149 if (provided.ignoreRead !== undefined) |
| 150 assert_equals(provided.ignoreRead, !!+received.ignoreRead); | 150 assert_equals(provided.ignoreRead, !!+received.ignore_read); |
| 151 else | 151 else |
| 152 assert_equals(!!+received.ignoreRead, true); | 152 assert_equals(!!+received.ignore_read, true); |
| 153 | 153 |
| 154 if (provided.timeout !== undefined) | 154 if (provided.timeout !== undefined) |
| 155 assert_equals(provided.timeout, received.timeout); | 155 assert_equals(provided.timeout, received.timeout); |
| 156 else | 156 else |
| 157 assert_equals(received.timeout, Infinity); | 157 assert_equals(received.timeout, Infinity); |
| 158 | 158 |
| 159 if (provided.target !== undefined) | 159 if (provided.target !== undefined) |
| 160 assert_equals(toMojoNFCPushTarget(provided.target), received.target); | 160 assert_equals(toMojoNFCPushTarget(provided.target), received.target); |
| 161 else | 161 else |
| 162 assert_equals(received.target, nfc.NFCPushTarget.ANY); | 162 assert_equals(received.target, nfc.NFCPushTarget.ANY); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 } | 277 } |
| 278 | 278 |
| 279 function nfc_test(func, name, properties) { | 279 function nfc_test(func, name, properties) { |
| 280 mojo_test(mojo => nfc_mocks(mojo).then(nfc => { | 280 mojo_test(mojo => nfc_mocks(mojo).then(nfc => { |
| 281 let result = Promise.resolve(func(nfc)); | 281 let result = Promise.resolve(func(nfc)); |
| 282 let cleanUp = () => nfc.mockNFC.reset(); | 282 let cleanUp = () => nfc.mockNFC.reset(); |
| 283 result.then(cleanUp, cleanUp); | 283 result.then(cleanUp, cleanUp); |
| 284 return result; | 284 return result; |
| 285 }), name, properties); | 285 }), name, properties); |
| 286 } | 286 } |
| OLD | NEW |