tracing/tracing/value/diagnostics/merged_device_info_test.html - Issue 2988823002: DeviceInfo into GenericSets

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tracing/tracing/value/diagnostics/merged_device_info_test.html

Issue 2988823002: DeviceInfo into GenericSets (Closed)

Patch Set: Created 3 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« tracing/tracing/value/add_device_info.py ('K') | « tracing/tracing/value/diagnostics/merged_device_info.html ('k') | tracing/tracing/value/diagnostics/reserved_infos.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tracing/tracing/value/diagnostics/merged_device_info_test.html

diff --git a/tracing/tracing/value/diagnostics/merged_device_info_test.html b/tracing/tracing/value/diagnostics/merged_device_info_test.html

deleted file mode 100644

index d888d93dcee5ffb73ea611a320b80d61f4226136..0000000000000000000000000000000000000000

--- a/tracing/tracing/value/diagnostics/merged_device_info_test.html

+++ /dev/null

@@ -1,50 +0,0 @@

-<!DOCTYPE html>

-<!--

-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/core/test_utils.html">

-<link rel="import" href="/tracing/value/diagnostics/device_info.html">

-<link rel="import" href="/tracing/value/diagnostics/generic_set.html">

-<link rel="import" href="/tracing/value/diagnostics/merged_device_info.html">

-<script>

-'use strict';

-tr.b.unittest.testSuite(function() {

- test('merge', function() {

- const deviceA = new tr.v.d.DeviceInfo({

- chromeVersion: '1.2.3.4',

- osName: 'GNU/Linux',

- osVersion: '1.2',

- });

- const deviceB = new tr.v.d.DeviceInfo({

- chromeVersion: '2.3.4.5',

- osName: 'GNU/Linux',

- osVersion: '2.3',

- });

- assert.isFalse(deviceA.canAddDiagnostic(new tr.v.d.GenericSet()));

- assert.isFalse(deviceA.canAddDiagnostic(deviceB));

- assert.isFalse(deviceB.canAddDiagnostic(deviceA));

- const merged = new tr.v.d.MergedDeviceInfo();

- assert.isFalse(merged.canAddDiagnostic(new tr.v.d.GenericSet()));

- assert.isTrue(merged.canAddDiagnostic(deviceA));

- assert.isTrue(merged.canAddDiagnostic(deviceB));

- merged.addDiagnostic(deviceA);

- merged.addDiagnostic(deviceB);

- const clone = tr.v.d.Diagnostic.fromDict(merged.asDict());

- assert.deepEqual(Array.from(clone.chromeVersions), ['1.2.3.4', '2.3.4.5']);

- assert.strictEqual(tr.b.getOnlyElement(clone.osNames), 'GNU/Linux');

- assert.deepEqual(Array.from(clone.osVersions), ['1.2', '2.3']);

- });

-});

-</script>