Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | <!DOCTYPE HTML> |
michael@0 | 2 | <html> |
michael@0 | 3 | <!-- |
michael@0 | 4 | https://bugzilla.mozilla.org/show_bug.cgi?id=444546 |
michael@0 | 5 | --> |
michael@0 | 6 | <head> |
michael@0 | 7 | <title>Test for Bug 444546</title> |
michael@0 | 8 | <script type="application/javascript" src="/MochiKit/MochiKit.js"></script> |
michael@0 | 9 | <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> |
michael@0 | 10 | <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> |
michael@0 | 11 | <style> |
michael@0 | 12 | .up { |
michael@0 | 13 | height: 14px; |
michael@0 | 14 | width: 1px; |
michael@0 | 15 | background: blue; |
michael@0 | 16 | font-size: 11px; |
michael@0 | 17 | color: white; |
michael@0 | 18 | } |
michael@0 | 19 | .down { |
michael@0 | 20 | height: 14px; |
michael@0 | 21 | width: 1px; |
michael@0 | 22 | background: blue; |
michael@0 | 23 | font-size: 11px; |
michael@0 | 24 | color: white; |
michael@0 | 25 | } |
michael@0 | 26 | </style> |
michael@0 | 27 | </head> |
michael@0 | 28 | <body> |
michael@0 | 29 | <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=444546">Mozilla Bug 444546</a> |
michael@0 | 30 | <p id="display"></p> |
michael@0 | 31 | <div id="content" style="display: none"> |
michael@0 | 32 | |
michael@0 | 33 | </div> |
michael@0 | 34 | <pre id="test"> |
michael@0 | 35 | <script type="application/javascript"> |
michael@0 | 36 | |
michael@0 | 37 | /** Test for Bug 444546 **/ |
michael@0 | 38 | |
michael@0 | 39 | var xhrCount = 5; |
michael@0 | 40 | var xhrs = new Array(); |
michael@0 | 41 | var uploads = new Array(); |
michael@0 | 42 | var maxSize = 5000000; |
michael@0 | 43 | var hugeString = new Array(maxSize + 1).join('a'); |
michael@0 | 44 | |
michael@0 | 45 | function updateProgress(evt) { |
michael@0 | 46 | ++evt.target.pcounter; |
michael@0 | 47 | var time = new Date().getTime(); |
michael@0 | 48 | // 350 - 200 = 150ms |
michael@0 | 49 | if ((time - evt.target.prevTime) < 150) { |
michael@0 | 50 | evt.target.log.parentNode.style.background = "red"; |
michael@0 | 51 | } |
michael@0 | 52 | var diff = (time - evt.target.prevTime); |
michael@0 | 53 | if (evt.target.min == -1 || evt.target.min > diff) { |
michael@0 | 54 | evt.target.min = diff; |
michael@0 | 55 | } |
michael@0 | 56 | if (evt.target.max == -1 || evt.target.max < diff) { |
michael@0 | 57 | evt.target.max = diff; |
michael@0 | 58 | } |
michael@0 | 59 | |
michael@0 | 60 | evt.target.log.textContent = diff + "ms"; |
michael@0 | 61 | evt.target.prevTime = time; |
michael@0 | 62 | if (evt.lengthComputable) { |
michael@0 | 63 | var loaded = (evt.loaded / evt.total); |
michael@0 | 64 | if (loaded < 1) { |
michael@0 | 65 | evt.target.log.style.width = (loaded * 400) + "px"; |
michael@0 | 66 | } |
michael@0 | 67 | } |
michael@0 | 68 | } |
michael@0 | 69 | |
michael@0 | 70 | function loaded(evt) { |
michael@0 | 71 | evt.target.log.style.width = "400px"; |
michael@0 | 72 | evt.target.log.style.background = "green"; |
michael@0 | 73 | if ("xhr" in evt.target) { |
michael@0 | 74 | evt.target.xhr.prevTime = new Date().getTime(); |
michael@0 | 75 | evt.target.xhr.startTime = evt.target.xhr.prevTime; |
michael@0 | 76 | } |
michael@0 | 77 | var total = new Date().getTime() - evt.target.startTime; |
michael@0 | 78 | evt.target.log.textContent = "total:" + total + "ms"; |
michael@0 | 79 | if (evt.target.pcounter) { |
michael@0 | 80 | evt.target.log.textContent += " ," + evt.target.pcounter + "pe, avg:" + |
michael@0 | 81 | parseInt((evt.target.prevTime - evt.target.startTime)/evt.target.pcounter) + "ms"; |
michael@0 | 82 | } |
michael@0 | 83 | if (evt.target.min != -1) { |
michael@0 | 84 | ok(evt.target.min >= 150, "Events fired too fast!"); |
michael@0 | 85 | evt.target.log.textContent += ", min:" + evt.target.min + "ms"; |
michael@0 | 86 | } |
michael@0 | 87 | if (evt.target.max != -1) { |
michael@0 | 88 | // Disabled for now. |
michael@0 | 89 | //ok(evt.target.max <= 550, "Events didn't fire fast enough!"); |
michael@0 | 90 | evt.target.log.textContent += ", max:" + evt.target.max + "ms"; |
michael@0 | 91 | } |
michael@0 | 92 | if ("upload" in evt.target) { |
michael@0 | 93 | is(evt.total, maxSize * 10, "Wrong data!"); |
michael@0 | 94 | --xhrCount; |
michael@0 | 95 | if (xhrCount == 0) { |
michael@0 | 96 | // This is a hack. To get more progress events, server sends the data |
michael@0 | 97 | // 10 times. |
michael@0 | 98 | SimpleTest.finish(); |
michael@0 | 99 | } else { |
michael@0 | 100 | setTimeout(start, 10); |
michael@0 | 101 | } |
michael@0 | 102 | } else { |
michael@0 | 103 | is(evt.total, maxSize, "Wrong data!"); |
michael@0 | 104 | } |
michael@0 | 105 | } |
michael@0 | 106 | |
michael@0 | 107 | function start() { |
michael@0 | 108 | var xhr = new XMLHttpRequest(); |
michael@0 | 109 | xhrs.push(xhr); |
michael@0 | 110 | uploads.push(xhr.upload); |
michael@0 | 111 | var container = document.createElement("tr"); |
michael@0 | 112 | var td1 = document.createElement("td"); |
michael@0 | 113 | container.appendChild(td1); |
michael@0 | 114 | td1.textContent = xhrs.length + "."; |
michael@0 | 115 | var td2 = document.createElement("td"); |
michael@0 | 116 | container.appendChild(td2); |
michael@0 | 117 | var td3 = document.createElement("td"); |
michael@0 | 118 | container.appendChild(td3); |
michael@0 | 119 | var uploadElement = document.createElement("div"); |
michael@0 | 120 | td2.appendChild(uploadElement); |
michael@0 | 121 | uploadElement.className = "up"; |
michael@0 | 122 | var downloadElement = document.createElement("div"); |
michael@0 | 123 | td3.appendChild(downloadElement); |
michael@0 | 124 | downloadElement.className = "down"; |
michael@0 | 125 | document.getElementById('tbody').appendChild(container); |
michael@0 | 126 | xhr.log = downloadElement; |
michael@0 | 127 | xhr.upload.log = uploadElement; |
michael@0 | 128 | xhr.onprogress = updateProgress; |
michael@0 | 129 | xhr.upload.onprogress = updateProgress; |
michael@0 | 130 | xhr.onload = loaded; |
michael@0 | 131 | xhr.upload.onload = loaded; |
michael@0 | 132 | xhr.open("POST", "bug444546.sjs"); |
michael@0 | 133 | xhr.upload.prevTime = new Date().getTime(); |
michael@0 | 134 | xhr.upload.startTime = xhr.upload.prevTime; |
michael@0 | 135 | xhr.upload.xhr = xhr; |
michael@0 | 136 | xhr.pcounter = 0; |
michael@0 | 137 | xhr.upload.pcounter = 0; |
michael@0 | 138 | xhr.min = -1; |
michael@0 | 139 | xhr.upload.min = -1; |
michael@0 | 140 | xhr.max = -1; |
michael@0 | 141 | xhr.upload.max = -1; |
michael@0 | 142 | xhr.send(hugeString); |
michael@0 | 143 | } |
michael@0 | 144 | |
michael@0 | 145 | SimpleTest.waitForExplicitFinish(); |
michael@0 | 146 | addLoadEvent(function() { setTimeout(start, 10); }); |
michael@0 | 147 | |
michael@0 | 148 | </script> |
michael@0 | 149 | </pre> |
michael@0 | 150 | <table> |
michael@0 | 151 | <tbody id="tbody"> |
michael@0 | 152 | <tr> |
michael@0 | 153 | <td>XHR</td> |
michael@0 | 154 | <td style="min-width: 410px;">upload</td> |
michael@0 | 155 | <td style="min-width: 410px;">download</td> |
michael@0 | 156 | </tr> |
michael@0 | 157 | </tbody> |
michael@0 | 158 | </table> |
michael@0 | 159 | </body> |
michael@0 | 160 | </html> |