| Index: tracing/tracing/value/diagnostics/diagnostic_map_test.html
|
| diff --git a/tracing/tracing/value/diagnostics/diagnostic_map_test.html b/tracing/tracing/value/diagnostics/diagnostic_map_test.html
|
| index 1fd3c4e69364c3c3a00a15955042124d7db2cbde..9b15ae7d1379d7147b22f4aa8393d3eb6a7fe519 100644
|
| --- a/tracing/tracing/value/diagnostics/diagnostic_map_test.html
|
| +++ b/tracing/tracing/value/diagnostics/diagnostic_map_test.html
|
| @@ -18,7 +18,6 @@ tr.b.unittest.testSuite(function() {
|
| diagnostics.set('generic', new tr.v.d.GenericSet([{a: ['b', 3]}]));
|
| diagnostics.set('breakdown', new tr.v.d.Breakdown());
|
| diagnostics.set('events', new tr.v.d.RelatedEventSet());
|
| - diagnostics.set('set', new tr.v.d.RelatedHistogramSet());
|
| diagnostics.set('map', new tr.v.d.RelatedHistogramMap());
|
| diagnostics.set('histogram breakdown',
|
| new tr.v.d.RelatedHistogramBreakdown());
|
| @@ -29,7 +28,6 @@ tr.b.unittest.testSuite(function() {
|
| tr.b.getOnlyElement(diagnostics.get('generic')));
|
| assert.instanceOf(clone.get('breakdown'), tr.v.d.Breakdown);
|
| assert.instanceOf(clone.get('events'), tr.v.d.RelatedEventSet);
|
| - assert.instanceOf(clone.get('set'), tr.v.d.RelatedHistogramSet);
|
| assert.instanceOf(clone.get('map'), tr.v.d.RelatedHistogramMap);
|
| assert.instanceOf(clone.get('histogram breakdown'),
|
| tr.v.d.RelatedHistogramBreakdown);
|
| @@ -69,7 +67,7 @@ tr.b.unittest.testSuite(function() {
|
| };
|
| const generic = new tr.v.d.GenericSet(['generic diagnostic']);
|
| const generic2 = new tr.v.d.GenericSet(['generic diagnostic 2']);
|
| - const relatedSet = new tr.v.d.RelatedHistogramSet();
|
| + const relatedMap = new tr.v.d.RelatedHistogramMap();
|
| const events = new tr.v.d.RelatedEventSet([event]);
|
|
|
| // When Histograms are merged, first an empty clone is created with an empty
|
| @@ -96,7 +94,7 @@ tr.b.unittest.testSuite(function() {
|
| // Merging unmergeable diagnostics should produce an
|
| // UnmergeableDiagnosticSet.
|
| const hist4 = new tr.v.Histogram('', tr.b.Unit.byName.count);
|
| - hist4.diagnostics.set('a', relatedSet);
|
| + hist4.diagnostics.set('a', relatedMap);
|
| hist.diagnostics.addDiagnostics(hist4.diagnostics);
|
| assert.instanceOf(hist.diagnostics.get('a'),
|
| tr.v.d.UnmergeableDiagnosticSet);
|
| @@ -104,7 +102,7 @@ tr.b.unittest.testSuite(function() {
|
| assert.strictEqual(
|
| tr.b.getOnlyElement(generic), tr.b.getOnlyElement(diagnostics[0]));
|
| // Don't test merging relationships here.
|
| - assert.instanceOf(diagnostics[1], tr.v.d.RelatedHistogramSet);
|
| + assert.instanceOf(diagnostics[1], tr.v.d.RelatedHistogramMap);
|
|
|
| // UnmergeableDiagnosticSets are mergeable.
|
| const hist5 = new tr.v.Histogram('', tr.b.Unit.byName.count);
|
| @@ -117,7 +115,7 @@ tr.b.unittest.testSuite(function() {
|
| assert.lengthOf(diagnostics, 3);
|
| assert.instanceOf(diagnostics[0], tr.v.d.GenericSet);
|
| assert.deepEqual(Array.from(diagnostics[0]), [...generic, ...generic2]);
|
| - assert.instanceOf(diagnostics[1], tr.v.d.RelatedHistogramSet);
|
| + assert.instanceOf(diagnostics[1], tr.v.d.RelatedHistogramMap);
|
| assert.instanceOf(diagnostics[2], tr.v.d.CollectedRelatedEventSet);
|
| });
|
|
|
| @@ -125,7 +123,6 @@ tr.b.unittest.testSuite(function() {
|
| const aHist0 = new tr.v.Histogram('a', tr.b.Unit.byName.count);
|
| const bHist0 = new tr.v.Histogram('b', tr.b.Unit.byName.count);
|
|
|
| - aHist0.diagnostics.set('set', new tr.v.d.RelatedHistogramSet([bHist0]));
|
| let map = new tr.v.d.RelatedHistogramMap();
|
| map.set('c', bHist0);
|
| aHist0.diagnostics.set('map', map);
|
| @@ -143,15 +140,13 @@ tr.b.unittest.testSuite(function() {
|
| const aHist1 = new tr.v.Histogram('a', tr.b.Unit.byName.count);
|
| const bHist1 = new tr.v.Histogram('b', tr.b.Unit.byName.count);
|
|
|
| - aHist1.diagnostics.set('set', new tr.v.d.RelatedHistogramSet([bHist1]));
|
| map = new tr.v.d.RelatedHistogramMap();
|
| map.set('c', bHist1);
|
| aHist1.diagnostics.set('map', map);
|
| breakdown = new tr.v.d.RelatedHistogramBreakdown();
|
| breakdown.set('d', bHist1);
|
| aHist1.diagnostics.set('breakdown', breakdown);
|
| - aHist1.diagnostics.set('unmergeable', new tr.v.d.RelatedHistogramSet(
|
| - [bHist1]));
|
| + aHist1.diagnostics.set('unmergeable', new tr.v.d.RelatedHistogramMap());
|
|
|
| const histograms1 = new tr.v.HistogramSet([aHist1, bHist1]);
|
|
|
| @@ -172,10 +167,6 @@ tr.b.unittest.testSuite(function() {
|
| aMergedHist.diagnostics.mergeRelationships(aMergedHist);
|
| bMergedHist.diagnostics.mergeRelationships(bMergedHist);
|
|
|
| - const aMergedSet = aMergedHist.diagnostics.get('set');
|
| - assert.instanceOf(aMergedSet, tr.v.d.RelatedHistogramSet);
|
| - assert.strictEqual(bMergedHist, tr.b.getOnlyElement(aMergedSet));
|
| -
|
| const aMergedMap = aMergedHist.diagnostics.get('map');
|
| assert.instanceOf(aMergedMap, tr.v.d.RelatedHistogramMap);
|
| assert.lengthOf(aMergedMap, 1);
|
|
|