| OLD | NEW |
| 1 description("Test for building blobs with multiple strings combined by BlobBuild
er and sending them via XMLHttpRequest."); | 1 description("Test for building blobs with multiple strings combined by BlobBuild
er and sending them via XMLHttpRequest."); |
| 2 | 2 |
| 3 var util = new HybridBlobTestUtil(runTests); | 3 var util = new HybridBlobTestUtil(runTests); |
| 4 | 4 |
| 5 function runAppendTest(appendItems, opt_ending, opt_urlParameter, opt_type) | 5 function runAppendTest(appendItems, opt_urlParameter, opt_type) |
| 6 { | 6 { |
| 7 var blob = util.appendAndCreateBlob(appendItems, opt_ending, opt_type); | 7 var blob = util.appendAndCreateBlob(appendItems, opt_type); |
| 8 var urlParameter = opt_urlParameter; | 8 var urlParameter = opt_urlParameter; |
| 9 if (!opt_urlParameter) | 9 if (!opt_urlParameter) |
| 10 urlParameter = util.createUrlParameter(appendItems, null, opt_ending); | 10 urlParameter = util.createUrlParameter(appendItems, null); |
| 11 if (opt_type != undefined) | 11 if (opt_type != undefined) |
| 12 shouldBe("'" + blob.type + "'", "'" + opt_type + "'"); | 12 shouldBe("'" + blob.type + "'", "'" + opt_type + "'"); |
| 13 util.uploadBlob(blob, urlParameter); | 13 util.uploadBlob(blob, urlParameter); |
| 14 } | 14 } |
| 15 | 15 |
| 16 function runTests() | 16 function runTests() |
| 17 { | 17 { |
| 18 var stringA = util.DataItem('A1234567|'); | 18 var stringA = util.DataItem('A1234567|'); |
| 19 var stringB = util.DataItem('B12345|'); | 19 var stringB = util.DataItem('B12345|'); |
| 20 var stringC = util.DataItem('C12345678901|'); | 20 var stringC = util.DataItem('C12345678901|'); |
| 21 | 21 |
| 22 var stringLF = util.DataItem('12345\n67890\n'); | 22 var stringLF = util.DataItem('12345\n67890\n'); |
| 23 var stringCRLF = util.DataItem('ABCDE\r\nFGHIJ\r\n'); | 23 var stringCRLF = util.DataItem('ABCDE\r\nFGHIJ\r\n'); |
| 24 var stringCR = util.DataItem('abcde\rfghij\r'); | 24 var stringCR = util.DataItem('abcde\rfghij\r'); |
| 25 | 25 |
| 26 debug('* BlobBuilder.append(string)'); | 26 debug('* BlobBuilder.append(string)'); |
| 27 runAppendTest([ stringA ]); | 27 runAppendTest([ stringA ]); |
| 28 runAppendTest([ stringA, stringB ]); | 28 runAppendTest([ stringA, stringB ]); |
| 29 runAppendTest([ stringA, stringB ], null, null, 'type/foo'); | 29 runAppendTest([ stringA, stringB ], null, 'type/foo'); |
| 30 | 30 |
| 31 debug('* BlobBuilder.append(blob)'); | 31 debug('* BlobBuilder.append(blob)'); |
| 32 runAppendTest([ [ stringA ] ]); | 32 runAppendTest([ [ stringA ] ]); |
| 33 runAppendTest([ [ stringA, stringB, stringA ] ]); | 33 runAppendTest([ [ stringA, stringB, stringA ] ]); |
| 34 runAppendTest([ [ stringA, stringC ] ], null, null, 'type/bar'); | 34 runAppendTest([ [ stringA, stringC ] ], null, 'type/bar'); |
| 35 | 35 |
| 36 debug('* BlobBuilder.append(string/blob)'); | 36 debug('* BlobBuilder.append(string/blob)'); |
| 37 runAppendTest([ [ [ stringA, stringB ], stringA ], stringC ]); | 37 runAppendTest([ [ [ stringA, stringB ], stringA ], stringC ]); |
| 38 runAppendTest([ [ stringA, stringB, stringA ], stringC, [ stringA, stringB,
stringA ] ]); | 38 runAppendTest([ [ stringA, stringB, stringA ], stringC, [ stringA, stringB,
stringA ] ]); |
| 39 | 39 |
| 40 debug('* BlobBuilder.append(string/blob) - with recycled blob'); | 40 debug('* BlobBuilder.append(string/blob) - with recycled blob'); |
| 41 var mixedArray = [ [ stringA, stringB, stringA ], stringC, [ stringA, string
B ] , stringA ]; | 41 var mixedArray = [ [ stringA, stringB, stringA ], stringC, [ stringA, string
B ] , stringA ]; |
| 42 var blob = { 'type':'blob', 'value':util.appendAndCreateBlob(mixedArray) }; | 42 var blob = { 'type':'blob', 'value':util.appendAndCreateBlob(mixedArray) }; |
| 43 var parameter = util.createUrlParameter([ mixedArray, stringC, mixedArray ])
; | 43 var parameter = util.createUrlParameter([ mixedArray, stringC, mixedArray ])
; |
| 44 runAppendTest([ blob, stringC, blob ], null, parameter); | 44 runAppendTest([ blob, stringC, blob ], parameter); |
| 45 | 45 |
| 46 debug('* BlobBuilder.append(string) - with line-endings'); | 46 debug('* BlobBuilder.append(string) - with line-endings'); |
| 47 runAppendTest([ stringLF ]); | 47 runAppendTest([ stringLF ]); |
| 48 runAppendTest([ stringCR ]); | 48 runAppendTest([ stringCR ]); |
| 49 runAppendTest([ stringCRLF ]); | 49 runAppendTest([ stringCRLF ]); |
| 50 | |
| 51 debug('* BlobBuilder.append(string, "native") - with line-endings'); | |
| 52 runAppendTest([ stringLF ], 'native'); | |
| 53 runAppendTest([ stringCR ], 'native'); | |
| 54 runAppendTest([ stringCRLF ], 'native'); | |
| 55 runAppendTest([ stringCRLF, stringLF, stringCRLF ], 'native'); | |
| 56 } | 50 } |
| 57 | 51 |
| 58 if (window.eventSender) | 52 if (window.eventSender) |
| 59 util.runTests(); | 53 util.runTests(); |
| 60 else | 54 else |
| 61 testFailed("This test is not interactive, please run using DumpRenderTree"); | 55 testFailed("This test is not interactive, please run using DumpRenderTree"); |
| 62 | 56 |
| 63 var successfullyParsed = true; | 57 var successfullyParsed = true; |
| OLD | NEW |