Changeset 231169 in webkit
- Timestamp:
- Apr 30, 2018 2:06:05 PM (6 years ago)
- Location:
- trunk/Websites/perf.webkit.org
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Websites/perf.webkit.org/ChangeLog
r231087 r231169 1 2018-04-30 Dewei Zhu <dewei_zhu@apple.com> 2 3 MeasurementSet._constructUrl should construct absolute url. 4 https://bugs.webkit.org/show_bug.cgi?id=185137 5 6 Reviewed by Ryosuke Niwa. 7 8 MeasurementSet._constructUrl should not construct an url with relative path. 9 10 * public/v3/models/measurement-set.js: Should use '/api/measurement-set...' and '/data/measurement-set-...' 11 for uncached and cached fetching. 12 * unit-tests/measurement-set-tests.js: Updated unit tests. 13 (const.set MeasurementSet): 14 1 15 2018-04-26 Dewei Zhu <dewei_zhu@apple.com> 2 16 -
trunk/Websites/perf.webkit.org/public/v3/models/measurement-set.js
r230295 r231169 95 95 { 96 96 if (!useCache) { 97 return ` ../api/measurement-set?platform=${this._platformId}&metric=${this._metricId}`;97 return `/api/measurement-set?platform=${this._platformId}&metric=${this._metricId}`; 98 98 } 99 99 var url; 100 url = ` ../data/measurement-set-${this._platformId}-${this._metricId}`;100 url = `/data/measurement-set-${this._platformId}-${this._metricId}`; 101 101 if (clusterEndTime) 102 102 url += '-' + +clusterEndTime; -
trunk/Websites/perf.webkit.org/unit-tests/measurement-set-tests.js
r230719 r231169 42 42 }); 43 43 assert.equal(requests.length, 1); 44 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');44 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 45 45 46 46 requests[0].resolve({ … … 68 68 set.fetchBetween(1000, 2000, () => callCount++); 69 69 assert.equal(requests.length, 1); 70 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');70 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 71 71 assert.equal(callCount, 0); 72 72 }); … … 78 78 assert.equal(requests.length, 1); 79 79 assert.equal(callCount, 0); 80 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');80 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 81 81 set.fetchBetween(2000, 3000, () => callCount++); 82 82 assert.equal(requests.length, 1); … … 89 89 const promise = set.fetchBetween(2000, 3000, () => callCount++); 90 90 assert.equal(requests.length, 1); 91 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');91 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 92 92 93 93 requests[0].resolve({ … … 113 113 const promise = set.fetchBetween(1000, 3000, () => callCount++); 114 114 assert.equal(requests.length, 1); 115 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');115 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 116 116 117 117 requests[0].resolve({ … … 129 129 assert.equal(callCount, 1); 130 130 assert.equal(requests.length, 2); 131 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-2000.json');131 assert.equal(requests[1].url, '/data/measurement-set-1-1-2000.json'); 132 132 }); 133 133 }); … … 138 138 set.fetchBetween(2000, 3000, () => callCountForWaitingCallback++); 139 139 assert.equal(requests.length, 1); 140 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');140 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 141 141 142 142 requests[0].resolve({ … … 154 154 return waitForMeasurementSet().then(() => { 155 155 assert.equal(requests.length, 2); 156 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-3000.json');156 assert.equal(requests[1].url, '/data/measurement-set-1-1-3000.json'); 157 157 158 158 set.fetchBetween(0, 7000, () => callCount++); … … 163 163 assert.equal(callCount, 1); 164 164 assert.equal(requests.length, 4); 165 assert.equal(requests[2].url, ' ../data/measurement-set-1-1-2000.json');166 assert.equal(requests[3].url, ' ../data/measurement-set-1-1-4000.json');165 assert.equal(requests[2].url, '/data/measurement-set-1-1-2000.json'); 166 assert.equal(requests[3].url, '/data/measurement-set-1-1-4000.json'); 167 167 }); 168 168 }); … … 173 173 const promise = set.fetchBetween(2707, 4207, () => callCount++); 174 174 assert.equal(requests.length, 1); 175 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');175 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 176 176 177 177 requests[0].resolve({ … … 188 188 return waitForMeasurementSet().then(() => { 189 189 assert.equal(requests.length, 3); 190 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-3000.json');191 assert.equal(requests[2].url, ' ../data/measurement-set-1-1-4000.json');190 assert.equal(requests[1].url, '/data/measurement-set-1-1-3000.json'); 191 assert.equal(requests[2].url, '/data/measurement-set-1-1-4000.json'); 192 192 assert.equal(callCount, 1); // 4000-4207 193 193 }); … … 199 199 set.fetchBetween(3200, 3700, () => callCountForWaitingCallback++); 200 200 assert.equal(requests.length, 1); 201 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');201 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 202 202 203 203 requests[0].resolve({ … … 215 215 return waitForMeasurementSet().then(() => { 216 216 assert.equal(requests.length, 2); 217 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-4000.json');217 assert.equal(requests[1].url, '/data/measurement-set-1-1-4000.json'); 218 218 set.fetchBetween(1207, 1293, () => callCount++); 219 219 return waitForMeasurementSet(); … … 222 222 assert.equal(callCount, 0); 223 223 assert.equal(requests.length, 3); 224 assert.equal(requests[2].url, ' ../data/measurement-set-1-1-2000.json');224 assert.equal(requests[2].url, '/data/measurement-set-1-1-2000.json'); 225 225 set.fetchBetween(1964, 3401, () => callCount++); 226 226 return waitForMeasurementSet(); … … 229 229 assert.equal(callCount, 0); 230 230 assert.equal(requests.length, 4); 231 assert.equal(requests[3].url, ' ../data/measurement-set-1-1-3000.json');231 assert.equal(requests[3].url, '/data/measurement-set-1-1-3000.json'); 232 232 }); 233 233 }); … … 238 238 set.fetchBetween(0, 3000, () => callCount++); 239 239 assert.equal(requests.length, 1); 240 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');240 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 241 241 242 242 requests[0].resolve({ … … 263 263 set.fetchBetween(1000, 3000, () => callCount++).catch(() => rejected = true); 264 264 assert.equal(requests.length, 1); 265 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');265 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 266 266 267 267 requests[0].reject(500); … … 279 279 set.fetchBetween(1000, 2000, () => callCount++); 280 280 assert.equal(requests.length, 1); 281 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');281 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 282 282 283 283 requests[0].resolve({ … … 295 295 assert.equal(callCount, 0); 296 296 assert.equal(requests.length, 2); 297 assert.equal(requests[1].url, ' ../api/measurement-set?platform=1&metric=1');297 assert.equal(requests[1].url, '/api/measurement-set?platform=1&metric=1'); 298 298 }); 299 299 }); … … 304 304 set.fetchBetween(1000, 2000, () => callCount++); 305 305 assert.equal(requests.length, 1); 306 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');306 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 307 307 308 308 requests[0].reject(404); … … 311 311 assert.equal(callCount, 0); 312 312 assert.equal(requests.length, 2); 313 assert.equal(requests[1].url, ' ../api/measurement-set?platform=1&metric=1');313 assert.equal(requests[1].url, '/api/measurement-set?platform=1&metric=1'); 314 314 }); 315 315 }); … … 320 320 set.fetchBetween(1000, 3000, () => callCount++); 321 321 assert.equal(requests.length, 1); 322 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');322 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 323 323 324 324 requests[0].resolve({ … … 339 339 assert.equal(set._sortedClusters.length, 1); 340 340 assert.equal(requests.length, 2); 341 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-2000.json');341 assert.equal(requests[1].url, '/data/measurement-set-1-1-2000.json'); 342 342 343 343 requests[1].resolve({ … … 360 360 assert.equal(set._sortedClusters.length, 2); 361 361 assert.equal(requests.length, 3); 362 assert.equal(requests[2].url, ' ../api/measurement-set?platform=1&metric=1');362 assert.equal(requests[2].url, '/api/measurement-set?platform=1&metric=1'); 363 363 364 364 requests[2].resolve({ … … 379 379 assert.equal(set._sortedClusters.length, 2); 380 380 assert.equal(requests.length, 4); 381 assert.equal(requests[3].url, ' ../data/measurement-set-1-1-2000.json');381 assert.equal(requests[3].url, '/data/measurement-set-1-1-2000.json'); 382 382 383 383 requests[3].resolve({ … … 406 406 set.fetchBetween(2000, 3000, () => callCount++); 407 407 assert.equal(requests.length, 1); 408 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');408 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 409 409 410 410 let alternativeCallCount = 0; … … 434 434 set.fetchBetween(3200, 3700, () => callCountFor4000++); 435 435 assert.equal(requests.length, 1); 436 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');436 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 437 437 438 438 requests[0].resolve({ … … 453 453 assert.equal(callCountFor4000, 0); 454 454 assert.equal(requests.length, 2); 455 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-4000.json');455 assert.equal(requests[1].url, '/data/measurement-set-1-1-4000.json'); 456 456 457 457 set.fetchBetween(3708, 4800, () => callCountFor4000To5000++); … … 466 466 assert.equal(callCountFor2000, 0); 467 467 assert.equal(requests.length, 3); 468 assert.equal(requests[2].url, ' ../data/measurement-set-1-1-2000.json');468 assert.equal(requests[2].url, '/data/measurement-set-1-1-2000.json'); 469 469 470 470 requests[2].resolve({ … … 487 487 assert.equal(callCountFor2000To4000, 1); 488 488 assert.equal(requests.length, 4); 489 assert.equal(requests[3].url, ' ../data/measurement-set-1-1-3000.json');489 assert.equal(requests[3].url, '/data/measurement-set-1-1-3000.json'); 490 490 491 491 requests[3].resolve({ … … 534 534 const promise = set.fetchBetween(2000, 3000); 535 535 assert.equal(requests.length, 1); 536 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');536 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 537 537 538 538 requests[0].resolve({ … … 557 557 const promise = set.fetchBetween(2000, 3000); 558 558 assert.equal(requests.length, 1); 559 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');559 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 560 560 561 561 requests[0].resolve({ … … 579 579 const promise = set.fetchBetween(2000, 3000); 580 580 assert.equal(requests.length, 1); 581 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');581 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 582 582 583 583 requests[0].resolve({ … … 594 594 return waitForMeasurementSet().then(() => { 595 595 assert.equal(requests.length, 2); 596 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-3000.json');596 assert.equal(requests[1].url, '/data/measurement-set-1-1-3000.json'); 597 597 requests[1].resolve({ 598 598 'clusterStart': 1000, … … 614 614 set.fetchBetween(2000, 3000); 615 615 assert.equal(requests.length, 1); 616 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');616 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 617 617 618 618 requests[0].resolve({ … … 629 629 return waitForMeasurementSet().then(() => { 630 630 assert.equal(requests.length, 2); 631 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-3000.json');631 assert.equal(requests[1].url, '/data/measurement-set-1-1-3000.json'); 632 632 requests[1].resolve({ 633 633 'clusterStart': 1000, … … 649 649 set.fetchBetween(2000, 5000); 650 650 assert.equal(requests.length, 1); 651 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');651 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 652 652 653 653 requests[0].resolve({ … … 664 664 return waitForMeasurementSet().then(() => { 665 665 assert.equal(requests.length, 3); 666 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-3000.json');667 assert.equal(requests[2].url, ' ../data/measurement-set-1-1-4000.json');666 assert.equal(requests[1].url, '/data/measurement-set-1-1-3000.json'); 667 assert.equal(requests[2].url, '/data/measurement-set-1-1-4000.json'); 668 668 requests[1].resolve({ 669 669 'clusterStart': 1000, … … 687 687 const promise = set.fetchBetween(2000, 3000); 688 688 assert.equal(requests.length, 1); 689 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');689 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 690 690 691 691 requests[0].resolve({ … … 776 776 const promise = set.fetchBetween(1476426488465, 1484203801573); 777 777 assert.equal(requests.length, 1); 778 assert.equal(requests[0].url, ' ../data/measurement-set-15-769.json');778 assert.equal(requests[0].url, '/data/measurement-set-15-769.json'); 779 779 780 780 requests[0].resolve(sampleCluster); … … 976 976 const promise = set.fetchBetween(4000, 5000); 977 977 assert.equal(requests.length, 1); 978 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');978 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 979 979 980 980 requests[0].resolve({ … … 1016 1016 const promise = set.fetchBetween(3000, 5000); 1017 1017 assert.equal(requests.length, 1); 1018 assert.equal(requests[0].url, ' ../data/measurement-set-1-1.json');1018 assert.equal(requests[0].url, '/data/measurement-set-1-1.json'); 1019 1019 1020 1020 requests[0].resolve({ … … 1031 1031 return waitForMeasurementSet().then(() => { 1032 1032 assert.equal(requests.length, 2); 1033 assert.equal(requests[1].url, ' ../data/measurement-set-1-1-4000.json');1033 assert.equal(requests[1].url, '/data/measurement-set-1-1-4000.json'); 1034 1034 return set.fetchSegmentation('segmentTimeSeriesByMaximizingSchwarzCriterion', [], 'current', false); 1035 1035 }).then((segmentation) => {
Note: See TracChangeset
for help on using the changeset viewer.