1 files changed, 56 insertions, 0 deletions
diff --git a/chromium/third_party/catapult/tracing/tracing/value/ui/collected_related_event_set_span_test.html b/chromium/third_party/catapult/tracing/tracing/value/ui/collected_related_event_set_span_test.html
new file mode 100644
index 00000000000..c14f75a9826
--- /dev/null
+++ b/chromium/third_party/catapult/tracing/tracing/value/ui/collected_related_event_set_span_test.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<!--
+Copyright 2017 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/base/utils.html">
+<link rel="import" href="/tracing/core/test_utils.html">
+<link rel="import" href="/tracing/value/histogram.html">
+<link rel="import" href="/tracing/value/ui/diagnostic_span.html">
+
+<script>
+'use strict';
+
+tr.b.unittest.testSuite(function() {
+  test('merge', function() {
+    let aSlice;
+    let bSlice;
+    const model = tr.c.TestUtils.newModel(function(model) {
+      aSlice = tr.c.TestUtils.newSliceEx({
+        type: tr.model.ThreadSlice,
+        title: 'a',
+        start: 0,
+        duration: 10
+      });
+      bSlice = tr.c.TestUtils.newSliceEx({
+        type: tr.model.ThreadSlice,
+        title: 'b',
+        start: 1,
+        duration: 10
+      });
+      const thread = model.getOrCreateProcess(1).getOrCreateThread(2);
+      thread.sliceGroup.pushSlice(aSlice);
+      thread.sliceGroup.pushSlice(bSlice);
+    });
+    assert.notEqual(aSlice.stableId, bSlice.stableId);
+
+    const aHist = new tr.v.Histogram('a', tr.b.Unit.byName.count);
+    const bHist = new tr.v.Histogram('b', tr.b.Unit.byName.count);
+
+    aHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(aSlice));
+    bHist.diagnostics.set('events', new tr.v.d.RelatedEventSet(bSlice));
+
+    let mergedHist = aHist.clone();
+    mergedHist.addHistogram(bHist);
+    mergedHist = tr.v.Histogram.fromDict(mergedHist.asDict());
+
+    const mergedEvents = mergedHist.diagnostics.get('events');
+    const span = tr.v.ui.createDiagnosticSpan(mergedEvents);
+    assert.strictEqual(
+        'TR-V-UI-COLLECTED-RELATED-EVENT-SET-SPAN', span.tagName);
+    this.addHTMLOutput(span);
+  });
+});
+</script>