From 658965ecdbc82289caf0a6f93e42b05cd252a176 Mon Sep 17 00:00:00 2001 From: Jamie Wong Date: Sun, 25 Oct 2020 01:16:38 -0700 Subject: [PATCH] Add test to cover falling back to matching on name instead of key --- .../event-reordering-name-match.json | 7 +++ .../__snapshots__/trace-event.test.ts.snap | 44 +++++++++++++++++++ src/import/trace-event.test.ts | 4 ++ 3 files changed, 55 insertions(+) create mode 100644 sample/profiles/trace-event/event-reordering-name-match.json diff --git a/sample/profiles/trace-event/event-reordering-name-match.json b/sample/profiles/trace-event/event-reordering-name-match.json new file mode 100644 index 000000000..0dea1ffb2 --- /dev/null +++ b/sample/profiles/trace-event/event-reordering-name-match.json @@ -0,0 +1,7 @@ +[ + {"tid": 1, "ph": "X", "pid": 0, "name": "alpha", "args": {"x": 0}, "ts": 0, "dur": 10}, + {"tid": 1, "ph": "B", "pid": 0, "name": "beta", "args": {"x": 0}, "ts": 1}, + {"tid": 1, "ph": "B", "pid": 0, "name": "gamma", "args": {"x": 0}, "ts": 1}, + {"tid": 1, "ph": "E", "pid": 0, "name": "beta", "args": {"x": 1}, "ts": 2}, + {"tid": 1, "ph": "E", "pid": 0, "name": "gamma", "args": {"x": 1}, "ts": 2} +] diff --git a/src/import/__snapshots__/trace-event.test.ts.snap b/src/import/__snapshots__/trace-event.test.ts.snap index 380b91e7d..1cef24e6c 100644 --- a/src/import/__snapshots__/trace-event.test.ts.snap +++ b/src/import/__snapshots__/trace-event.test.ts.snap @@ -298,6 +298,50 @@ exports[`importTraceEvents event re-ordering: indexToView 1`] = `0`; exports[`importTraceEvents event re-ordering: profileGroup.name 1`] = `"must-retain-original-order.json"`; +exports[`importTraceEvents event reordering name match 1`] = ` +Object { + "frames": Array [ + Frame { + "col": undefined, + "file": undefined, + "key": "alpha {\\"x\\":0}", + "line": undefined, + "name": "alpha {\\"x\\":0}", + "selfWeight": 9, + "totalWeight": 10, + }, + Frame { + "col": undefined, + "file": undefined, + "key": "beta {\\"x\\":0}", + "line": undefined, + "name": "beta {\\"x\\":0}", + "selfWeight": 0, + "totalWeight": 1, + }, + Frame { + "col": undefined, + "file": undefined, + "key": "gamma {\\"x\\":0}", + "line": undefined, + "name": "gamma {\\"x\\":0}", + "selfWeight": 1, + "totalWeight": 1, + }, + ], + "name": "pid 0, tid 1", + "stacks": Array [ + "alpha {\\"x\\":0} 1.00µs", + "alpha {\\"x\\":0};beta {\\"x\\":0};gamma {\\"x\\":0} 1.00µs", + "alpha {\\"x\\":0} 8.00µs", + ], +} +`; + +exports[`importTraceEvents event reordering name match: indexToView 1`] = `0`; + +exports[`importTraceEvents event reordering name match: profileGroup.name 1`] = `"event-reordering-name-match.json"`; + exports[`importTraceEvents invalid x nesting 1`] = ` Object { "frames": Array [ diff --git a/src/import/trace-event.test.ts b/src/import/trace-event.test.ts index d2bb03457..457886d50 100644 --- a/src/import/trace-event.test.ts +++ b/src/import/trace-event.test.ts @@ -95,3 +95,7 @@ test('importTraceEvents BEX interaction', async () => { test('importTraceEvents invalid x nesting', async () => { await checkProfileSnapshot('./sample/profiles/trace-event/invalid-x-nesting.json') }) + +test('importTraceEvents event reordering name match', async () => { + await checkProfileSnapshot('./sample/profiles/trace-event/event-reordering-name-match.json') +})