commit d01805a537f0a3d84e646abba32d4984a5e185c2
author Priyanka <priyankaspatel@google.com> Tue Dec 03 12:06:53 2024 +0000
committer Priyanka <priyankaspatel@google.com> Tue Dec 03 12:39:03 2024 +0000
tree dc54c3c7b34e9e32aee34b408421c5b3d25afa1c
parent 596f5f934f0878ea17e51db6e07680cdd0f60e13

Collect unarchived uploaded files into one archive.

Bug: 381838074
Test: npm run test:unit:ci
Change-Id: Iaa2f4b2008bddd26e6e52aaf856405ea54cfd634

tools/winscope/src/app/mediator_test.ts

diff --git a/tools/winscope/src/app/mediator_test.ts b/tools/winscope/src/app/mediator_test.ts
index 2317623..3fb4761 100644
--- a/tools/winscope/src/app/mediator_test.ts
+++ b/tools/winscope/src/app/mediator_test.ts
@@ -326,14 +326,14 @@
         requested: [
           {
             name: 'Collected Trace',
-            types: [TraceType.EVENT_LOG, TraceType.CUJS],
+            types: [TraceType.SURFACE_FLINGER],
           },
           {
             name: 'Uncollected Trace',
             types: [TraceType.TRANSITION],
           },
         ],
-        collected: inputFiles.concat([eventLogFile]),
+        collected: [inputFiles[0]],
       }),
     );
     expect(
@@ -772,7 +772,9 @@
     files = inputFiles,
     viewersToReassignTraces = [viewerStub0, viewerStub1],
   ) {
-    await mediator.onWinscopeEvent(new AppFilesUploaded(files));
+    for (const file of files) {
+      await mediator.onWinscopeEvent(new AppFilesUploaded([file]));
+    }
     userNotifierChecker.expectNone();
     viewersToReassignTraces.forEach((viewer) =>
       reassignViewerStubTrace(viewer),

tools/winscope/src/app/trace_pipeline.ts

diff --git a/tools/winscope/src/app/trace_pipeline.ts b/tools/winscope/src/app/trace_pipeline.ts
index 5c5e8a8..60b1812 100644
--- a/tools/winscope/src/app/trace_pipeline.ts
+++ b/tools/winscope/src/app/trace_pipeline.ts
@@ -300,6 +300,7 @@
 
     progressListener?.onProgressUpdate(progressMessage, 0);
 
+    const currArchive: UnzippedArchive = [];
     for (let i = 0; i < files.length; i++) {
       let file = files[i];
 
@@ -325,11 +326,10 @@
           UserNotifier.add(new CorruptedArchive(file));
         }
       } else {
-        unzippedArchives.push([new TraceFile(file, undefined)]);
-        onSubProgressUpdate(100);
+        currArchive.push(new TraceFile(file, undefined));
       }
     }
-
+    unzippedArchives.push(currArchive);
     progressListener?.onProgressUpdate(progressMessage, 100);
 
     return unzippedArchives;

tools/winscope/src/app/trace_pipeline_test.ts

diff --git a/tools/winscope/src/app/trace_pipeline_test.ts b/tools/winscope/src/app/trace_pipeline_test.ts
index fc588d8..7aff854 100644
--- a/tools/winscope/src/app/trace_pipeline_test.ts
+++ b/tools/winscope/src/app/trace_pipeline_test.ts
@@ -448,11 +448,11 @@
   });
 
   it('can filter traces without visualization', async () => {
-    await loadFiles([validSfFile, shellTransitionFile]);
-    await expectLoadResult(2, []);
+    await loadFiles([shellTransitionFile]);
+    await expectLoadResult(1, []);
 
     tracePipeline.filterTracesWithoutVisualization();
-    expect(tracePipeline.getTraces().getSize()).toEqual(1);
+    expect(tracePipeline.getTraces().getSize()).toEqual(0);
     expect(
       tracePipeline.getTraces().getTrace(TraceType.SHELL_TRANSITION),
     ).toBeUndefined();