Fix tests

Author: Kartik Raj

src/client/proposedApi.ts

@@ -8,7 +8,7 @@ import { IConfigurationService, IDisposableRegistry, IExtensions, IInterpreterPa
 import { Architecture } from './common/utils/platform';
 import { IServiceContainer } from './ioc/types';
 import {
-    ActiveEnvironmentIdChangeEvent,
+    ActiveEnvironmentPathChangeEvent,
     Environment,
     EnvironmentsChangeEvent,
     ProposedExtensionAPI,
@@ -38,7 +38,7 @@ type ActiveEnvironmentChangeEvent = {
     path: string;
 };
 
-const onDidActiveInterpreterChangedEvent = new EventEmitter<ActiveEnvironmentIdChangeEvent>();
+const onDidActiveInterpreterChangedEvent = new EventEmitter<ActiveEnvironmentPathChangeEvent>();
 export function reportActiveInterpreterChanged(e: ActiveEnvironmentChangeEvent): void {
     onDidActiveInterpreterChangedEvent.fire({ id: getEnvID(e.path), path: e.path, resource: e.resource });
     reportActiveInterpreterChangedDeprecated({ path: e.path, resource: e.resource?.uri });

src/client/proposedApiTypes.ts

@@ -27,7 +27,7 @@ export interface ProposedExtensionAPI {
         /**
          * This event is triggered when the active environment setting changes.
          */
-        readonly onDidChangeActiveEnvironmentPath: Event<ActiveEnvironmentIdChangeEvent>;
+        readonly onDidChangeActiveEnvironmentPath: Event<ActiveEnvironmentPathChangeEvent>;
         /**
          * Carries environments found by the extension at the time of fetching the property. Note this may not
          * contain all environments in the system as a refresh might be going on.
@@ -177,7 +177,7 @@ export type EnvironmentsChangeEvent = {
     readonly type: 'add' | 'remove' | 'update';
 };
 
-export type ActiveEnvironmentIdChangeEvent = EnvironmentPath & {
+export type ActiveEnvironmentPathChangeEvent = EnvironmentPath & {
     /**
      * Workspace folder the environment changed for.
      */

src/test/proposedApi.unit.test.ts

@@ -28,7 +28,8 @@ import { Architecture } from '../client/common/utils/platform';
 import { PythonEnvCollectionChangedEvent } from '../client/pythonEnvironments/base/watcher';
 import { normCasePath } from '../client/common/platform/fs-paths';
 import {
-    ActiveEnvironmentIdChangeEvent,
+    ActiveEnvironmentPathChangeEvent,
+    EnvironmentPath,
     EnvironmentsChangeEvent,
     ProposedExtensionAPI,
 } from '../client/proposedApiTypes';
@@ -74,7 +75,7 @@ suite('Proposed Extension API', () => {
     });
 
     test('Provide an event to track when active environment details change', async () => {
-        const events: ActiveEnvironmentIdChangeEvent[] = [];
+        const events: ActiveEnvironmentPathChangeEvent[] = [];
         proposed.environment.onDidChangeActiveEnvironmentPath((e) => {
             events.push(e);
         });
@@ -91,7 +92,11 @@ suite('Proposed Extension API', () => {
             .setup((c) => c.getSettings(undefined))
             .returns(() => (({ pythonPath } as unknown) as IPythonSettings));
         const actual = proposed.environment.getActiveEnvironmentPath();
-        assert.deepEqual(actual, { id: normCasePath(pythonPath), path: pythonPath });
+        assert.deepEqual(actual, ({
+            id: normCasePath(pythonPath),
+            path: pythonPath,
+            pathType: 'interpreterPath',
+        } as unknown) as EnvironmentPath);
     });
 
     test('getActiveEnvironmentPath: default python', () => {
@@ -100,7 +105,11 @@ suite('Proposed Extension API', () => {
             .setup((c) => c.getSettings(undefined))
             .returns(() => (({ pythonPath } as unknown) as IPythonSettings));
         const actual = proposed.environment.getActiveEnvironmentPath();
-        assert.deepEqual(actual, { id: 'DEFAULT_PYTHON', path: pythonPath });
+        assert.deepEqual(actual, ({
+            id: 'DEFAULT_PYTHON',
+            path: pythonPath,
+            pathType: 'interpreterPath',
+        } as unknown) as EnvironmentPath);
     });
 
     test('getActiveEnvironmentPath: With resource', () => {
@@ -110,7 +119,11 @@ suite('Proposed Extension API', () => {
             .setup((c) => c.getSettings(resource))
             .returns(() => (({ pythonPath } as unknown) as IPythonSettings));
         const actual = proposed.environment.getActiveEnvironmentPath(resource);
-        assert.deepEqual(actual, { id: normCasePath(pythonPath), path: pythonPath });
+        assert.deepEqual(actual, ({
+            id: normCasePath(pythonPath),
+            path: pythonPath,
+            pathType: 'interpreterPath',
+        } as unknown) as EnvironmentPath);
     });
 
     test('resolveEnvironment: invalid environment (when passed as string)', async () => {