<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213122] trunk/Websites/perf.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213122">213122</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 21:01:45 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix tests after <a href="http://trac.webkit.org/projects/webkit/changeset/213119">r213119</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/213120">r213120</a>.
* browser-tests/time-series-chart-tests.js:
(return.ChartTest.importChartScripts.context.then):
(string_appeared_here.then): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgbrowserteststimeseriescharttestsjs">trunk/Websites/perf.webkit.org/browser-tests/time-series-chart-tests.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (213121 => 213122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2017-02-28 05:00:28 UTC (rev 213121)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2017-02-28 05:01:45 UTC (rev 213122)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2017-02-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Fix tests after r213119 and r213120.
+
+ * browser-tests/time-series-chart-tests.js:
+ (return.ChartTest.importChartScripts.context.then):
+ (string_appeared_here.then): Deleted.
+
+2017-02-27 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Removed the unused code that was supposed to be removed in the previous commit.
</span><span class="cx">
</span><span class="cx"> * browser-tests/time-series-chart-tests.js:
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgbrowserteststimeseriescharttestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/browser-tests/time-series-chart-tests.js (213121 => 213122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/browser-tests/time-series-chart-tests.js 2017-02-28 05:00:28 UTC (rev 213121)
+++ trunk/Websites/perf.webkit.org/browser-tests/time-series-chart-tests.js 2017-02-28 05:01:45 UTC (rev 213122)
</span><span class="lines">@@ -282,8 +282,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> it('should generate [0.5, 1.0, 1.5, 2.0] for [0.3, 2.3] when maxLabels is 5', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.3, 2.3, 5, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.5, 1.0, 1.5, 2.0]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.5 pt', '1.0 pt', '1.5 pt', '2.0 pt']);
</span><span class="lines">@@ -291,8 +292,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [0.4, 0.6, 0.8, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.2] for [0.3, 2.3] when maxLabels is 10', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.3, 2.3, 10, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.4, 0.6, 0.8, 1, 1.2, 1.4, 1.6, 1.8, 2, 2.2]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.4 pt', '0.6 pt', '0.8 pt', '1.0 pt', '1.2 pt', '1.4 pt', '1.6 pt', '1.8 pt', '2.0 pt', '2.2 pt']);
</span><span class="lines">@@ -300,8 +302,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [1, 2] for [0.3, 2.3] when maxLabels is 2', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.3, 2.3, 2, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([1, 2]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['1.0 pt', '2.0 pt']);
</span><span class="lines">@@ -309,8 +312,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [0.4, 0.6, 0.8, 1.0, 1.2] for [0.3, 1.3] when maxLabels is 5', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.3, 1.3, 5, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.4, 0.6, 0.8, 1.0, 1.2]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.4 pt', '0.6 pt', '0.8 pt', '1.0 pt', '1.2 pt']);
</span><span class="lines">@@ -318,8 +322,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [0.2, 0.4, 0.6, 0.8, 1, 1.2] for [0.2, 1.3] when maxLabels is 10', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.2, 1.3, 10, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.2, 0.4, 0.6, 0.8, 1, 1.2]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.2 pt', '0.4 pt', '0.6 pt', '0.8 pt', '1.0 pt', '1.2 pt']);
</span><span class="lines">@@ -327,8 +332,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [0.5, 1.0] for [0.3, 1.3] when maxLabels is 4', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.3, 1.3, 4, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.5, 1.0]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.5 pt', '1.0 pt']);
</span><span class="lines">@@ -336,8 +342,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [10, 20, 30] for [4, 35] when maxLabels is 4', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(4, 35, 4, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([10, 20, 30]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['10 pt', '20 pt', '30 pt']);
</span><span class="lines">@@ -345,8 +352,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [10, 20, 30] for [4, 35] when maxLabels is 6', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(4, 35, 6, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([10, 20, 30]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['10 pt', '20 pt', '30 pt']);
</span><span class="lines">@@ -354,8 +362,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [10, 15, 20, 25, 30, 35] for [6, 35] when maxLabels is 6', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(6, 35, 6, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([10, 15, 20, 25, 30, 35]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['10 pt', '15 pt', '20 pt', '25 pt', '30 pt', '35 pt']);
</span><span class="lines">@@ -363,8 +372,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [110, 115, 120, 125, 130] for [107, 134] when maxLabels is 6', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(107, 134, 6, Metric.makeFormatter('pt', 3));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([110, 115, 120, 125, 130]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['110 pt', '115 pt', '120 pt', '125 pt', '130 pt']);
</span><span class="lines">@@ -372,8 +382,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [5e7, 10e7] for [1e7, 1e8] when maxLabels is 4', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(1e7, 1e8, 4, Metric.makeFormatter('pt', 3));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([5e7, 10e7]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['50.0 Mpt', '100 Mpt']);
</span><span class="lines">@@ -381,8 +392,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [2e7, 4e7, 6e7, 8e7, 10e7] for [1e7, 1e8] when maxLabels is 5', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(1e7, 1e8, 5, Metric.makeFormatter('pt', 3));
</span><span class="cx"> expect(grid.map((item) => item.value)).to.eql([2e7, 4e7, 6e7, 8e7, 10e7]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['20.0 Mpt', '40.0 Mpt', '60.0 Mpt', '80.0 Mpt', '100 Mpt']);
</span><span class="lines">@@ -390,8 +402,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [-1.5, -1.0, -0.5, 0.0, 0.5] for [-1.8, 0.7] when maxLabels is 5', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(-1.8, 0.7, 5, Metric.makeFormatter('pt', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([-1.5, -1.0, -0.5, 0.0, 0.5]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['-1.5 pt', '-1.0 pt', '-0.5 pt', '0.0 pt', '0.5 pt']);
</span><span class="lines">@@ -399,8 +412,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [200ms, 400ms, 600ms, 800ms, 1.00s, 1.20s] for [0.2, 1.3] when maxLabels is 10 and unit is seconds', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.2, 1.3, 10, Metric.makeFormatter('s', 3));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([0.2, 0.4, 0.6, 0.8, 1, 1.2]);
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['200 ms', '400 ms', '600 ms', '800 ms', '1.00 s', '1.20 s']);
</span><span class="lines">@@ -408,8 +422,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [2.0GB, 4.0GB, 6.0GB] for [1.2GB, 7.2GB] when maxLabels is 4 and unit is bytes', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const gigabytes = Math.pow(1024, 3);
</span><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(1.2 * gigabytes, 7.2 * gigabytes, 4, Metric.makeFormatter('B', 2));
</span><span class="cx"> expect(grid.map((item) => approximate(item.value))).to.eql([2 * gigabytes, 4 * gigabytes, 6 * gigabytes]);
</span><span class="lines">@@ -418,8 +433,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> it('should generate [0.6GB, 0.8GB, 1.0GB, 1.2GB] for [0.53GB, 1.23GB] when maxLabels is 4 and unit is bytes', () => {
</span><del>- return new BrowsingContext().importScripts(scripts, 'TimeSeriesChart', 'Metric').then((symbols) => {
- const [TimeSeriesChart, Metric] = symbols;
</del><ins>+ const context = new BrowsingContext;
+ return ChartTest.importChartScripts(context).then((TimeSeriesChart) => {
+ const Metric = context.symbols.Metric;
</ins><span class="cx"> const gigabytes = Math.pow(1024, 3);
</span><span class="cx"> const grid = TimeSeriesChart.computeValueGrid(0.53 * gigabytes, 1.23 * gigabytes, 4, Metric.makeFormatter('B', 2));
</span><span class="cx"> expect(grid.map((item) => item.label)).to.eql(['0.6 GB', '0.8 GB', '1.0 GB', '1.2 GB']);
</span></span></pre>
</div>
</div>
</body>
</html>