Rename getLoadedTraceFiles to getLoadedTraces
Bug: 277181336 Test: npm run test:all Change-Id: I7eb981367191a47d3b50b31ee66f14774936923a
This commit is contained in:
@@ -289,7 +289,7 @@ export class AppComponent implements TraceDataListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getLoadedTraceTypes(): TraceType[] {
|
getLoadedTraceTypes(): TraceType[] {
|
||||||
return this.tracePipeline.getLoadedTraceFiles().map((trace) => trace.type);
|
return this.tracePipeline.getLoadedTraces().map((trace) => trace.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
onTraceDataLoaded(viewers: Viewer[]) {
|
onTraceDataLoaded(viewers: Viewer[]) {
|
||||||
@@ -337,7 +337,7 @@ export class AppComponent implements TraceDataListener {
|
|||||||
|
|
||||||
private makeActiveTraceFileInfo(view: View): string {
|
private makeActiveTraceFileInfo(view: View): string {
|
||||||
const traceFile = this.tracePipeline
|
const traceFile = this.tracePipeline
|
||||||
.getLoadedTraceFiles()
|
.getLoadedTraces()
|
||||||
.find((file) => file.type === view.dependencies[0]);
|
.find((file) => file.type === view.dependencies[0]);
|
||||||
|
|
||||||
if (!traceFile) {
|
if (!traceFile) {
|
||||||
|
|||||||
@@ -56,9 +56,9 @@ import {LoadProgressComponent} from './load_progress_component';
|
|||||||
</load-progress>
|
</load-progress>
|
||||||
|
|
||||||
<mat-list
|
<mat-list
|
||||||
*ngIf="!isLoadingFiles && this.tracePipeline.getLoadedTraceFiles().length > 0"
|
*ngIf="!isLoadingFiles && this.tracePipeline.getLoadedTraces().length > 0"
|
||||||
class="uploaded-files">
|
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>
|
<mat-icon matListIcon>
|
||||||
{{ TRACE_INFO[trace.type].icon }}
|
{{ TRACE_INFO[trace.type].icon }}
|
||||||
</mat-icon>
|
</mat-icon>
|
||||||
@@ -73,7 +73,7 @@ import {LoadProgressComponent} from './load_progress_component';
|
|||||||
</mat-list>
|
</mat-list>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
*ngIf="!isLoadingFiles && tracePipeline.getLoadedTraceFiles().length === 0"
|
*ngIf="!isLoadingFiles && tracePipeline.getLoadedTraces().length === 0"
|
||||||
class="drop-info">
|
class="drop-info">
|
||||||
<p class="mat-body-3 icon">
|
<p class="mat-body-3 icon">
|
||||||
<mat-icon inline fontIcon="upload"></mat-icon>
|
<mat-icon inline fontIcon="upload"></mat-icon>
|
||||||
@@ -83,7 +83,7 @@ import {LoadProgressComponent} from './load_progress_component';
|
|||||||
</mat-card-content>
|
</mat-card-content>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
*ngIf="!isLoadingFiles && tracePipeline.getLoadedTraceFiles().length > 0"
|
*ngIf="!isLoadingFiles && tracePipeline.getLoadedTraces().length > 0"
|
||||||
class="trace-actions-container">
|
class="trace-actions-container">
|
||||||
<button
|
<button
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ class TracePipeline {
|
|||||||
return this.files;
|
return this.files;
|
||||||
}
|
}
|
||||||
|
|
||||||
getLoadedTraceFiles(): LoadedTrace[] {
|
getLoadedTraces(): LoadedTrace[] {
|
||||||
return this.parsers.map(
|
return this.parsers.map(
|
||||||
(parser: Parser<object>) => new LoadedTrace(parser.getDescriptors(), parser.getTraceType())
|
(parser: Parser<object>) => new LoadedTrace(parser.getDescriptors(), parser.getTraceType())
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -28,11 +28,11 @@ describe('TracePipeline', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('can load valid trace files', async () => {
|
it('can load valid trace files', async () => {
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(0);
|
||||||
|
|
||||||
await loadValidSfWmTraces();
|
await loadValidSfWmTraces();
|
||||||
|
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(2);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(2);
|
||||||
|
|
||||||
const traceEntries = TracesUtils.extractEntries(tracePipeline.getTraces());
|
const traceEntries = TracesUtils.extractEntries(tracePipeline.getTraces());
|
||||||
expect(traceEntries.get(TraceType.WINDOW_MANAGER)?.length).toBeGreaterThan(0);
|
expect(traceEntries.get(TraceType.WINDOW_MANAGER)?.length).toBeGreaterThan(0);
|
||||||
@@ -47,18 +47,18 @@ describe('TracePipeline', () => {
|
|||||||
const errors = await tracePipeline.loadTraceFiles(invalidTraceFiles);
|
const errors = await tracePipeline.loadTraceFiles(invalidTraceFiles);
|
||||||
tracePipeline.buildTraces();
|
tracePipeline.buildTraces();
|
||||||
expect(errors.length).toEqual(1);
|
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 () => {
|
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 = [
|
const files = [
|
||||||
new TraceFile(await UnitTestUtils.getFixtureFile('winscope_homepage.png')),
|
new TraceFile(await UnitTestUtils.getFixtureFile('winscope_homepage.png')),
|
||||||
new TraceFile(await UnitTestUtils.getFixtureFile('traces/dump_WindowManager.pb')),
|
new TraceFile(await UnitTestUtils.getFixtureFile('traces/dump_WindowManager.pb')),
|
||||||
];
|
];
|
||||||
const errors = await tracePipeline.loadTraceFiles(files);
|
const errors = await tracePipeline.loadTraceFiles(files);
|
||||||
tracePipeline.buildTraces();
|
tracePipeline.buildTraces();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(1);
|
||||||
expect(errors.length).toEqual(1);
|
expect(errors.length).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -72,26 +72,26 @@ describe('TracePipeline', () => {
|
|||||||
|
|
||||||
expect(errors.length).toEqual(0);
|
expect(errors.length).toEqual(0);
|
||||||
|
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('can remove traces', async () => {
|
it('can remove traces', async () => {
|
||||||
await loadValidSfWmTraces();
|
await loadValidSfWmTraces();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(2);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(2);
|
||||||
|
|
||||||
tracePipeline.removeTraceFile(TraceType.SURFACE_FLINGER);
|
tracePipeline.removeTraceFile(TraceType.SURFACE_FLINGER);
|
||||||
tracePipeline.buildTraces();
|
tracePipeline.buildTraces();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(1);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(1);
|
||||||
|
|
||||||
tracePipeline.removeTraceFile(TraceType.WINDOW_MANAGER);
|
tracePipeline.removeTraceFile(TraceType.WINDOW_MANAGER);
|
||||||
tracePipeline.buildTraces();
|
tracePipeline.buildTraces();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('gets loaded trace files', async () => {
|
it('gets loaded trace files', async () => {
|
||||||
await loadValidSfWmTraces();
|
await loadValidSfWmTraces();
|
||||||
|
|
||||||
const files = tracePipeline.getLoadedTraceFiles();
|
const files = tracePipeline.getLoadedTraces();
|
||||||
expect(files.length).toEqual(2);
|
expect(files.length).toEqual(2);
|
||||||
expect(files[0].descriptors).toBeTruthy();
|
expect(files[0].descriptors).toBeTruthy();
|
||||||
expect(files[0].descriptors.length).toBeGreaterThan(0);
|
expect(files[0].descriptors.length).toBeGreaterThan(0);
|
||||||
@@ -127,10 +127,10 @@ describe('TracePipeline', () => {
|
|||||||
|
|
||||||
it('can be cleared', async () => {
|
it('can be cleared', async () => {
|
||||||
await loadValidSfWmTraces();
|
await loadValidSfWmTraces();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toBeGreaterThan(0);
|
expect(tracePipeline.getLoadedTraces().length).toBeGreaterThan(0);
|
||||||
|
|
||||||
tracePipeline.clear();
|
tracePipeline.clear();
|
||||||
expect(tracePipeline.getLoadedTraceFiles().length).toEqual(0);
|
expect(tracePipeline.getLoadedTraces().length).toEqual(0);
|
||||||
expect(() => {
|
expect(() => {
|
||||||
tracePipeline.getTraces();
|
tracePipeline.getTraces();
|
||||||
}).toThrow();
|
}).toThrow();
|
||||||
|
|||||||
Reference in New Issue
Block a user