Rename getLoadedTraceFiles to getLoadedTraces
Bug: 277181336
Test: npm run test:all
Change-Id: I7eb981367191a47d3b50b31ee66f14774936923a
diff --git a/tools/winscope/src/app/components/app_component.ts b/tools/winscope/src/app/components/app_component.ts
index 659cafc..f5e62dc 100644
--- a/tools/winscope/src/app/components/app_component.ts
+++ b/tools/winscope/src/app/components/app_component.ts
@@ -289,7 +289,7 @@
}
getLoadedTraceTypes(): TraceType[] {
- return this.tracePipeline.getLoadedTraceFiles().map((trace) => trace.type);
+ return this.tracePipeline.getLoadedTraces().map((trace) => trace.type);
}
onTraceDataLoaded(viewers: Viewer[]) {
@@ -337,7 +337,7 @@
private makeActiveTraceFileInfo(view: View): string {
const traceFile = this.tracePipeline
- .getLoadedTraceFiles()
+ .getLoadedTraces()
.find((file) => file.type === view.dependencies[0]);
if (!traceFile) {
diff --git a/tools/winscope/src/app/components/upload_traces_component.ts b/tools/winscope/src/app/components/upload_traces_component.ts
index 2e6da10..37dbd32 100644
--- a/tools/winscope/src/app/components/upload_traces_component.ts
+++ b/tools/winscope/src/app/components/upload_traces_component.ts
@@ -56,9 +56,9 @@
</load-progress>
<mat-list
- *ngIf="!isLoadingFiles && this.tracePipeline.getLoadedTraceFiles().length > 0"
+ *ngIf="!isLoadingFiles && this.tracePipeline.getLoadedTraces().length > 0"
class="uploaded-files">
- <mat-list-item *ngFor="let trace of this.tracePipeline.getLoadedTraceFiles()">
+ <mat-list-item *ngFor="let trace of this.tracePipeline.getLoadedTraces()">
<mat-icon matListIcon>
{{ TRACE_INFO[trace.type].icon }}
</mat-icon>
@@ -73,7 +73,7 @@
</mat-list>
<div
- *ngIf="!isLoadingFiles && tracePipeline.getLoadedTraceFiles().length === 0"
+ *ngIf="!isLoadingFiles && tracePipeline.getLoadedTraces().length === 0"
class="drop-info">
<p class="mat-body-3 icon">
<mat-icon inline fontIcon="upload"></mat-icon>
@@ -83,7 +83,7 @@
</mat-card-content>
<div
- *ngIf="!isLoadingFiles && tracePipeline.getLoadedTraceFiles().length > 0"
+ *ngIf="!isLoadingFiles && tracePipeline.getLoadedTraces().length > 0"
class="trace-actions-container">
<button
color="primary"
diff --git a/tools/winscope/src/app/trace_pipeline.ts b/tools/winscope/src/app/trace_pipeline.ts
index bca2541..8ab16b7 100644
--- a/tools/winscope/src/app/trace_pipeline.ts
+++ b/tools/winscope/src/app/trace_pipeline.ts
@@ -71,7 +71,7 @@
return this.files;
}
- getLoadedTraceFiles(): LoadedTrace[] {
+ getLoadedTraces(): LoadedTrace[] {
return this.parsers.map(
(parser: Parser<object>) => new LoadedTrace(parser.getDescriptors(), parser.getTraceType())
);
diff --git a/tools/winscope/src/app/trace_pipeline_test.ts b/tools/winscope/src/app/trace_pipeline_test.ts
index b001894..20e01a0 100644
--- a/tools/winscope/src/app/trace_pipeline_test.ts
+++ b/tools/winscope/src/app/trace_pipeline_test.ts
@@ -28,11 +28,11 @@
});
it('can load valid trace files', async () => {
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(0);
await loadValidSfWmTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(2);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(2);
const traceEntries = TracesUtils.extractEntries(tracePipeline.getTraces());
expect(traceEntries.get(TraceType.WINDOW_MANAGER)?.length).toBeGreaterThan(0);
@@ -47,18 +47,18 @@
const errors = await tracePipeline.loadTraceFiles(invalidTraceFiles);
tracePipeline.buildTraces();
expect(errors.length).toEqual(1);
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(0);
});
it('is robust to mixed valid and invalid trace files', async () => {
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(0);
const files = [
new TraceFile(await UnitTestUtils.getFixtureFile('winscope_homepage.png')),
new TraceFile(await UnitTestUtils.getFixtureFile('traces/dump_WindowManager.pb')),
];
const errors = await tracePipeline.loadTraceFiles(files);
tracePipeline.buildTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(1);
expect(errors.length).toEqual(1);
});
@@ -72,26 +72,26 @@
expect(errors.length).toEqual(0);
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(1);
});
it('can remove traces', async () => {
await loadValidSfWmTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(2);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(2);
tracePipeline.removeTraceFile(TraceType.SURFACE_FLINGER);
tracePipeline.buildTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(1);
tracePipeline.removeTraceFile(TraceType.WINDOW_MANAGER);
tracePipeline.buildTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(0);
});
it('gets loaded trace files', async () => {
await loadValidSfWmTraces();
- const files = tracePipeline.getLoadedTraceFiles();
+ const files = tracePipeline.getLoadedTraces();
expect(files.length).toEqual(2);
expect(files[0].descriptors).toBeTruthy();
expect(files[0].descriptors.length).toBeGreaterThan(0);
@@ -127,10 +127,10 @@
it('can be cleared', async () => {
await loadValidSfWmTraces();
- expect(tracePipeline.getLoadedTraceFiles().length).toBeGreaterThan(0);
+ expect(tracePipeline.getLoadedTraces().length).toBeGreaterThan(0);
tracePipeline.clear();
- expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
+ expect(tracePipeline.getLoadedTraces().length).toEqual(0);
expect(() => {
tracePipeline.getTraces();
}).toThrow();
