onDidEndTerminalShellExecution never gets fired

microsoft · Sep 11, 2024 · a51b6b4 · a51b6b4
1 parent a75656b
commit a51b6b4
Showing 1 changed file with 31 additions and 33 deletions.
diff --git a/src/test/common/terminals/service.unit.test.ts b/src/test/common/terminals/service.unit.test.ts
@@ -36,13 +36,13 @@ suite('Terminal Service', () => {
     let mockServiceContainer: TypeMoq.IMock<IServiceContainer>;
     let terminalAutoActivator: TypeMoq.IMock<ITerminalAutoActivation>;
     let terminalShellIntegration: TypeMoq.IMock<TerminalShellIntegration>;
-    // let onDidEndTerminalShellExecutionEmitter: EventEmitter<TerminalShellExecutionEndEvent>;
-    // let event: TerminalShellExecutionEndEvent;
+    let onDidEndTerminalShellExecutionEmitter: EventEmitter<TerminalShellExecutionEndEvent>;
+    let event: TerminalShellExecutionEndEvent;
     setup(() => {
         terminal = TypeMoq.Mock.ofType<VSCodeTerminal>();
         terminalShellIntegration = TypeMoq.Mock.ofType<TerminalShellIntegration>();
-        // terminal.setup((t) => t.shellIntegration).returns(() => terminalShellIntegration.object);
-        terminal.setup((t) => t.shellIntegration).returns(() => undefined);
+        terminal.setup((t) => t.shellIntegration).returns(() => terminalShellIntegration.object);
+        // terminal.setup((t) => t.shellIntegration).returns(() => undefined);
         const shellExecution: TypeMoq.IMock<TerminalShellExecution> = TypeMoq.Mock.ofType<TerminalShellExecution>();
 
         terminalShellIntegration
@@ -51,36 +51,34 @@ suite('Terminal Service', () => {
 
         terminalManager = TypeMoq.Mock.ofType<ITerminalManager>();
         // terminalManager.setup((t) => t.onDidEndTerminalShellExecution(TypeMoq.It.isAny()))
-        const onDidEndTerminalShellExecutionEmitter = new EventEmitter<TerminalShellExecutionEndEvent>();
+        onDidEndTerminalShellExecutionEmitter = new EventEmitter<TerminalShellExecutionEndEvent>();
         terminalManager
-            .setup((t) => t.onDidEndTerminalShellExecution(TypeMoq.It.isAny()))
-            .callback((handler) => {
-                onDidEndTerminalShellExecutionEmitter.event(handler);
-            });
-
-        // const execution: TerminalShellExecution = {
-        //     commandLine: {
-        //         value: 'dummy text',
-        //         isTrusted: true,
-        //         confidence: 2,
-        //     },
-        //     cwd: undefined,
-        //     read: function (): AsyncIterable<string> {
-        //         throw new Error('Function not implemented.');
-        //     },
-        // };
-        // const exitCode = 0;
-
-        // // Mock the execution object and exitCode
-        // event = {
-        //     execution,
-        //     exitCode,
-        //     terminal: terminal.object,
-        //     shellIntegration: terminalShellIntegration.object,
-        // };
-
-        // // Trigger the event
-        // onDidEndTerminalShellExecutionEmitter.fire(event);
+            .setup((t) => t.onDidEndTerminalShellExecution)
+            .returns(() => onDidEndTerminalShellExecutionEmitter.event);
+
+        const execution: TerminalShellExecution = {
+            commandLine: {
+                value: 'dummy text',
+                isTrusted: true,
+                confidence: 2,
+            },
+            cwd: undefined,
+            read: function (): AsyncIterable<string> {
+                throw new Error('Function not implemented.');
+            },
+        };
+        const exitCode = 0;
+
+        // Mock the execution object and exitCode
+        event = {
+            execution,
+            exitCode,
+            terminal: terminal.object,
+            shellIntegration: terminalShellIntegration.object,
+        };
+
+        // Trigger the event
+        onDidEndTerminalShellExecutionEmitter.fire(event);
 
         platformService = TypeMoq.Mock.ofType<IPlatformService>();
         workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();