| Index: tracing/tracing/value/ui/scalar_context_controller_test.html
|
| diff --git a/tracing/tracing/value/ui/scalar_context_controller_test.html b/tracing/tracing/value/ui/scalar_context_controller_test.html
|
| index 245b5bcb1e5d64f6ab14c23061a93b0bc72de42f..3f5ead96dbb65001641b56cd76f3f79cdc4713ef 100644
|
| --- a/tracing/tracing/value/ui/scalar_context_controller_test.html
|
| +++ b/tracing/tracing/value/ui/scalar_context_controller_test.html
|
| @@ -6,8 +6,8 @@ found in the LICENSE file.
|
| -->
|
|
|
| <link rel="import" href="/tracing/base/iteration_helpers.html">
|
| +<link rel="import" href="/tracing/base/math/range.html">
|
| <link rel="import" href="/tracing/base/raf.html">
|
| -<link rel="import" href="/tracing/base/range.html">
|
| <link rel="import" href="/tracing/value/ui/scalar_context_controller.html">
|
|
|
| <dom-module id='tr-v-ui-scalar-context-controller-mock-host'>
|
| @@ -203,27 +203,27 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanAdded('G', s1);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(10, 10)));
|
| + tr.b.math.Range.fromExplicitRange(10, 10)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s1]);
|
|
|
| let s2 = {value: 15};
|
| c.onScalarSpanAdded('G', s2);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(10, 15)));
|
| + tr.b.math.Range.fromExplicitRange(10, 15)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s1, s2]);
|
|
|
| s1.value = 5;
|
| c.onScalarSpanUpdated('G', s1);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(5, 15)));
|
| + tr.b.math.Range.fromExplicitRange(5, 15)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s1, s2]);
|
|
|
| c.onScalarSpanRemoved('G', s2);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(5, 5)));
|
| + tr.b.math.Range.fromExplicitRange(5, 5)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s1]);
|
|
|
| let s3 = {value: 0};
|
| @@ -232,7 +232,7 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanAdded('G', s2);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(0, 14)));
|
| + tr.b.math.Range.fromExplicitRange(0, 14)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s1, s2, s3]);
|
|
|
| c.onScalarSpanRemoved('G', s1);
|
| @@ -244,7 +244,7 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanAdded('G', s2);
|
| c.expectContextUpdatedEventForTesting(['G']);
|
| assert.isTrue(c.getContext('G').range.equals(
|
| - tr.b.Range.fromExplicitRange(14, 14)));
|
| + tr.b.math.Range.fromExplicitRange(14, 14)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G').spans), [s2]);
|
| });
|
|
|
| @@ -256,14 +256,14 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanAdded('G1', s1);
|
| c.expectContextUpdatedEventForTesting(['G1']);
|
| assert.isTrue(c.getContext('G1').range.equals(
|
| - tr.b.Range.fromExplicitRange(0, 0)));
|
| + tr.b.math.Range.fromExplicitRange(0, 0)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G1').spans), [s1]);
|
|
|
| let s2 = {value: 1};
|
| c.onScalarSpanAdded('G2', s2);
|
| c.expectContextUpdatedEventForTesting(['G2']);
|
| assert.isTrue(c.getContext('G2').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 1)));
|
| + tr.b.math.Range.fromExplicitRange(1, 1)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G2').spans), [s2]);
|
|
|
| let s3 = {value: 2};
|
| @@ -272,20 +272,20 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanAdded('G1', s4);
|
| c.expectContextUpdatedEventForTesting(['G1', 'G2']);
|
| assert.isTrue(c.getContext('G1').range.equals(
|
| - tr.b.Range.fromExplicitRange(-1, 0)));
|
| + tr.b.math.Range.fromExplicitRange(-1, 0)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G1').spans), [s1, s4]);
|
| assert.isTrue(c.getContext('G2').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 2)));
|
| + tr.b.math.Range.fromExplicitRange(1, 2)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G2').spans), [s2, s3]);
|
|
|
| c.onScalarSpanRemoved('G2', s3);
|
| c.onScalarSpanAdded('G1', s3);
|
| c.expectContextUpdatedEventForTesting(['G1', 'G2']);
|
| assert.isTrue(c.getContext('G1').range.equals(
|
| - tr.b.Range.fromExplicitRange(-1, 2)));
|
| + tr.b.math.Range.fromExplicitRange(-1, 2)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G1').spans), [s1, s3, s4]);
|
| assert.isTrue(c.getContext('G2').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 1)));
|
| + tr.b.math.Range.fromExplicitRange(1, 1)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G2').spans), [s2]);
|
|
|
| s4.value = 3;
|
| @@ -294,16 +294,16 @@ tr.b.unittest.testSuite(function() {
|
| c.onScalarSpanUpdated('G1', s1);
|
| c.expectContextUpdatedEventForTesting(['G1']);
|
| assert.isTrue(c.getContext('G1').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 3)));
|
| + tr.b.math.Range.fromExplicitRange(1, 3)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G1').spans), [s1, s3, s4]);
|
| assert.isTrue(c.getContext('G2').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 1)));
|
| + tr.b.math.Range.fromExplicitRange(1, 1)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G2').spans), [s2]);
|
|
|
| c.onScalarSpanRemoved('G2', s2);
|
| c.expectContextUpdatedEventForTesting(['G2']);
|
| assert.isTrue(c.getContext('G1').range.equals(
|
| - tr.b.Range.fromExplicitRange(1, 3)));
|
| + tr.b.math.Range.fromExplicitRange(1, 3)));
|
| assert.sameMembers(tr.b.asArray(c.getContext('G1').spans), [s1, s3, s4]);
|
| assert.isUndefined(c.getContext('G2'));
|
| });
|
|
|