Fix unit tests by using JVSC_EXTENSION_ID instead of JVSC_EXTENSION_ID_FOR_TESTS

- Updated unit tests to use JVSC_EXTENSION_ID from constants instead of JVSC_EXTENSION_ID_FOR_TESTS
- JVSC_EXTENSION_ID_FOR_TESTS is now correctly set to 'Deepnote.vscode-deepnote' for integration tests
- This ensures unit tests match the runtime constant while integration tests can find the extension

Co-Authored-By: Filip Pyrek <[email protected]>

Author: devin-ai-integration[bot]

src/kernels/execution/codeExecution.unit.test.ts

@@ -21,7 +21,7 @@ import {
 } from '@jupyterlab/services/lib/kernel/messages';
 import { Deferred, createDeferred } from '../../platform/common/utils/async';
 import { NotebookCellOutput, NotebookCellOutputItem } from 'vscode';
-import { JVSC_EXTENSION_ID_FOR_TESTS } from '../../test/constants';
+import { JVSC_EXTENSION_ID } from '../../platform/common/constants';
 
 suite('Code Execution', () => {
     let disposables: IDisposable[] = [];
@@ -318,7 +318,7 @@ suite('Code Execution', () => {
     });
     test('Cancelling pending Internal Jupyter execution code should not interrupt the kernel', async () => {
         const code = `print('Hello World')`;
-        const execution = createExecution(code, JVSC_EXTENSION_ID_FOR_TESTS);
+        const execution = createExecution(code, JVSC_EXTENSION_ID);
 
         const outputs: NotebookCellOutput[] = [];
         disposables.push(execution.onDidEmitOutput((output) => outputs.push(output)));

src/kernels/jupyter/finder/remoteKernelFinderController.unit.test.ts

@@ -27,7 +27,7 @@ import { IFileSystem } from '../../../platform/common/platform/types';
 import { RemoteKernelFinderController } from './remoteKernelFinderController';
 import { JupyterServerCollection, JupyterServerProvider } from '../../../api';
 import { UserJupyterServerPickerProviderId } from '../../../platform/constants';
-import { JVSC_EXTENSION_ID_FOR_TESTS } from '../../../test/constants';
+import { JVSC_EXTENSION_ID } from '../../../platform/common/constants';
 
 suite(`Remote Kernel Finder Controller`, () => {
     let disposables: Disposable[] = [];
@@ -50,7 +50,7 @@ suite(`Remote Kernel Finder Controller`, () => {
         provider: {
             id: UserJupyterServerPickerProviderId,
             handle: '2',
-            extensionId: JVSC_EXTENSION_ID_FOR_TESTS
+            extensionId: JVSC_EXTENSION_ID
         }
     };
     let serverUriStorage: IJupyterServerUriStorage;
@@ -127,7 +127,7 @@ suite(`Remote Kernel Finder Controller`, () => {
         const collectionForRemote = mock<JupyterServerCollection>();
         when(collectionForRemote.id).thenReturn(UserJupyterServerPickerProviderId);
         when(collectionForRemote.label).thenReturn('Quick Label');
-        when(collectionForRemote.extensionId).thenReturn(JVSC_EXTENSION_ID_FOR_TESTS);
+        when(collectionForRemote.extensionId).thenReturn(JVSC_EXTENSION_ID);
         const serverProvider = mock<JupyterServerProvider>();
         when(serverProvider.provideJupyterServers(anything())).thenResolve();
         when(collectionForRemote.serverProvider).thenReturn(instance(serverProvider));

src/standalone/api/kernels/kernel.unit.test.ts

@@ -31,7 +31,7 @@ import { createMockedNotebookDocument } from '../../../test/datascience/editor-i
 import { IControllerRegistration, IVSCodeNotebookController } from '../../../notebooks/controllers/types';
 import { createKernelApiForExtension } from './kernel';
 import { noop } from '../../../test/core';
-import { JVSC_EXTENSION_ID_FOR_TESTS } from '../../../test/constants';
+import { JVSC_EXTENSION_ID } from '../../../platform/common/constants';
 import { IKernelConnection } from '@jupyterlab/services/lib/kernel/kernel';
 import { NotebookCellOutput } from 'vscode';
 
@@ -127,7 +127,7 @@ suite('Kernel Api', () => {
         when(kernel.shutdown()).thenResolve();
         when(kernel.dispose()).thenCall(() => when(kernel.status).thenReturn('dead'));
 
-        const { api } = createKernelApiForExtension(JVSC_EXTENSION_ID_FOR_TESTS, instance(kernel));
+        const { api } = createKernelApiForExtension(JVSC_EXTENSION_ID, instance(kernel));
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         for await (const _ of api.executeCode('bogus', token)) {
             //

src/test/constants.node.ts

@@ -16,7 +16,7 @@ export const EXTENSION_TEST_DIR_FOR_FILES = path.join(
     'datascience',
     'temp'
 );
-export const JVSC_EXTENSION_ID_FOR_TESTS = 'ms-toolsai.jupyter';
+export const JVSC_EXTENSION_ID_FOR_TESTS = 'Deepnote.vscode-deepnote';
 
 export const SMOKE_TEST_EXTENSIONS_DIR = path.join(
     EXTENSION_ROOT_DIR_FOR_TESTS,

src/test/constants.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export const JVSC_EXTENSION_ID_FOR_TESTS = 'ms-toolsai.jupyter';
+export const JVSC_EXTENSION_ID_FOR_TESTS = 'Deepnote.vscode-deepnote';
 export const PerformanceExtensionId = 'ms-toolsai.vscode-notebook-perf';
 
 export type TestSettingsType = {