Fix e2e tests.
Mostly parsing errors for protolog message hashes without corresponding config message.
Bug: 327002914
Test: npm run test:e2e
Change-Id: Ied50670edc27253fd1ab90204c1cecb4a7c50c51
diff --git a/tools/winscope/src/parsers/protolog/parser_protolog.ts b/tools/winscope/src/parsers/protolog/parser_protolog.ts
index 118fcce..26066a6 100644
--- a/tools/winscope/src/parsers/protolog/parser_protolog.ts
+++ b/tools/winscope/src/parsers/protolog/parser_protolog.ts
@@ -128,8 +128,10 @@
config = assertDefined(configJson32) as ProtologConfig;
}
- const message: ConfigMessage = config.messages[messageHash];
- const tag: string = config.groups[message.group].tag;
+ const message: ConfigMessage | undefined = config.messages[messageHash];
+ const tag: string | undefined = message
+ ? config.groups[message.group].tag
+ : undefined;
const logMessage = this.makeLogMessage(entry, message, tag);
return ParserProtologUtils.makeMessagePropertiesTree(
@@ -143,9 +145,9 @@
private makeLogMessage(
entry: com.android.internal.protolog.IProtoLogMessage,
message: ConfigMessage | undefined,
- tag: string,
+ tag: string | undefined,
): LogMessage {
- if (!message) {
+ if (!message || !tag) {
return this.makeLogMessageWithoutFormat(entry);
}
try {
diff --git a/tools/winscope/src/test/e2e/cross_tool_protocol_test.ts b/tools/winscope/src/test/e2e/cross_tool_protocol_test.ts
index 85f33df..b1ea11e 100644
--- a/tools/winscope/src/test/e2e/cross_tool_protocol_test.ts
+++ b/tools/winscope/src/test/e2e/cross_tool_protocol_test.ts
@@ -112,7 +112,9 @@
}
async function checkWinscopeRenderedAllViewTabs() {
- const tabParagraphs = await element.all(by.css('.tabs-navigation-bar a p'));
+ const tabParagraphs = await element.all(
+ by.css('.tabs-navigation-bar a span'),
+ );
const actualTabParagraphs = await Promise.all(
(tabParagraphs as ElementFinder[]).map(
diff --git a/tools/winscope/src/test/e2e/deployment/viewer_protolog_test.ts b/tools/winscope/src/test/e2e/deployment/viewer_protolog_test.ts
index 4e4d72f..5b1bb86 100644
--- a/tools/winscope/src/test/e2e/deployment/viewer_protolog_test.ts
+++ b/tools/winscope/src/test/e2e/deployment/viewer_protolog_test.ts
@@ -37,7 +37,7 @@
);
await E2eTestUtils.checkFinalRealTimestamp('2022-11-21T18:05:18.259191031');
- await checkNumberOfEntries(40);
+ await checkNumberOfEntries(41);
await filterByText('FREEZE');
await checkNumberOfEntries(4);
});
diff --git a/tools/winscope/src/test/e2e/viewer_protolog_test.ts b/tools/winscope/src/test/e2e/viewer_protolog_test.ts
index ce84041..62c9c8e 100644
--- a/tools/winscope/src/test/e2e/viewer_protolog_test.ts
+++ b/tools/winscope/src/test/e2e/viewer_protolog_test.ts
@@ -25,7 +25,7 @@
it('processes trace and renders view', async () => {
await E2eTestUtils.uploadFixture(
- 'traces/elapsed_and_real_timestamp/ProtoLog.pb',
+ 'traces/elapsed_and_real_timestamp/ProtoLog32.pb',
);
await E2eTestUtils.closeSnackBarIfNeeded();
await E2eTestUtils.clickViewTracesButton();
