Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert old tests to web tests (run in web extension, local host, etc) #15231

Merged
merged 9 commits into from
Feb 27, 2024
Merged

Convert old tests to web tests (run in web extension, local host, etc) #15231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5da775
Faster completions with background execution
DonJayamanne Feb 23, 2024
3ead1e4
Faster completions with background execution
DonJayamanne Feb 26, 2024
f405d1c
Increase timeout
DonJayamanne Feb 26, 2024
bf4b161
oops
DonJayamanne Feb 26, 2024
ad65a27
Fix tests
DonJayamanne Feb 26, 2024
9752785
Misc
DonJayamanne Feb 26, 2024
e24477a
oops
DonJayamanne Feb 26, 2024
6655f6b
Web Tests
DonJayamanne Feb 26, 2024
0b673f1
Remove old tests
DonJayamanne Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ok/intellisense/completion.vscode.test.ts → ...llisense/completion.vscode.common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ import * as sinon from 'sinon';
import { commands, CompletionList, Position, window } from 'vscode';
import { traceInfo } from '../../../../platform/logging';
import { IDisposable } from '../../../../platform/common/types';
import { captureScreenShot } from '../../../common.node';
import { initialize } from '../../../initialize.node';
import {
closeNotebooksAndCleanUpAfterTests,
runCell,
insertCodeCell,
startJupyterServer,
waitForExecutionCompletedSuccessfully,
prewarmNotebooks,
createEmptyPythonNotebook
} from '../helper.node';
} from '../helper';
import { captureScreenShot, initialize, startJupyterServer } from '../../../common';
import { getTextOutputValue } from '../../../../kernels/execution/helpers';

/* eslint-disable @typescript-eslint/no-explicit-any, no-invalid-this */
Expand Down
46 changes: 21 additions & 25 deletions ...lisense/completionProvider.vscode.test.ts → .../completionProvider.vscode.common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,21 @@
import { assert } from 'chai';
import * as path from '../../../../platform/vscode-path/path';
import * as sinon from 'sinon';
import { ConfigurationTarget, Position, Uri, window, workspace, WorkspaceConfiguration, WorkspaceEdit } from 'vscode';
import { ConfigurationTarget, Position, window, workspace, WorkspaceConfiguration, WorkspaceEdit } from 'vscode';
import { traceInfo } from '../../../../platform/logging';
import { IDisposable } from '../../../../platform/common/types';
import { IExtensionTestApi } from '../../../common.node';
import { IS_REMOTE_NATIVE_TEST } from '../../../constants.node';
import { EXTENSION_ROOT_DIR_FOR_TESTS, initialize } from '../../../initialize.node';
import { IS_REMOTE_NATIVE_TEST } from '../../../constants';
import {
closeNotebooksAndCleanUpAfterTests,
runCell,
insertCodeCell,
startJupyterServer,
waitForExecutionCompletedSuccessfully,
prewarmNotebooks,
createEmptyPythonNotebook,
getCellOutputs,
waitForCompletions
} from '../helper.node';
} from '../helper';
import { IExtensionTestApi, initialize, startJupyterServer } from '../../../common';
import { KernelCompletionProvider } from '../../../../standalone/intellisense/kernelCompletionProvider';
import { IKernelProvider } from '../../../../kernels/types';

Expand Down Expand Up @@ -65,7 +63,7 @@ import { IKernelProvider } from '../../../../kernels/types';
traceInfo(`Start Test ${this.currentTest?.title}`);
sinon.restore();
await startJupyterServer();
await createEmptyPythonNotebook(disposables, Uri.file(path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'temp'))); // TODO, can't do this on web tests
await createEmptyPythonNotebook(disposables, undefined, true);
traceInfo(`Start Test (completed) ${this.currentTest?.title}`);
});
teardown(async function () {
Expand Down Expand Up @@ -97,30 +95,28 @@ import { IKernelProvider } from '../../../../kernels/types';
textToFilterCompletions?: string,
itemToExistInCompletionAfterFilter?: string
) {
await insertCodeCell('%pip install pandas', {
index: 0
});
const namesCsvPath = path.join(__dirname, 'names.csv').replace(/\\/g, '/').replace('out', 'src');
await insertCodeCell(
`import pandas as pd\ndf = pd.DataFrame({'Name': ['Foo', 'Bar', 'Baz'],'Sex': ['Male', 'Female', 'Male'],'Age': [1,2,3]})`,
{
index: 1
}
);
const cell = window.activeNotebookEditor?.notebook.cellAt(1)!;

await insertCodeCell(`import pandas as pd\ndf = pd.read_csv("${namesCsvPath}")\n`, {
index: 1
});
const cell2 = window.activeNotebookEditor?.notebook.cellAt(1)!;
await runCell(cell);

// Wait till execution count changes and status is success.
await waitForExecutionCompletedSuccessfully(cell);
const cell2 = await insertCodeCell('import os\nprint(os.getcwd())\n');
await runCell(cell2);

// Wait till execution count changes and status is success.
await waitForExecutionCompletedSuccessfully(cell2);
const cell3 = await insertCodeCell('import os\nprint(os.getcwd())\n');
await runCell(cell3);

// Wait till execution count changes and status is success.
await waitForExecutionCompletedSuccessfully(cell3);
traceInfo(`last cell output: ${getCellOutputs(cell3)}`);
traceInfo(`last cell output: ${getCellOutputs(cell2)}`);

// Now add the cell to check intellisense.
await insertCodeCell(cellCode);
const cell4 = window.activeNotebookEditor!.notebook.cellAt(3);
const cell3 = window.activeNotebookEditor!.notebook.cellAt(3);
// If we're testing string completions, ensure the cursor position is inside the string quotes.
let position = new Position(
0,
Expand All @@ -131,7 +127,7 @@ import { IKernelProvider } from '../../../../kernels/types';
.get<IKernelProvider>(IKernelProvider)
.get(window.activeNotebookEditor!.notebook)!;
const completionProvider = kernelCompletionProviderRegistry.kernelCompletionProviders.get(kernel)!;
let completions = await waitForCompletions(completionProvider, cell4, position, triggerCharacter);
let completions = await waitForCompletions(completionProvider, cell3, position, triggerCharacter);
let items = completions.map((item) => item.label);
assert.isOk(items.length);
if (itemToExistInCompletion) {
Expand Down Expand Up @@ -165,10 +161,10 @@ import { IKernelProvider } from '../../../../kernels/types';
}
// Add some text after the . and make sure we still get completions
const edit = new WorkspaceEdit();
edit.insert(cell4.document.uri, new Position(cellCode.length, 0), textToFilterCompletions);
edit.insert(cell3.document.uri, new Position(cellCode.length, 0), textToFilterCompletions);
await workspace.applyEdit(edit);
position = new Position(0, cellCode.length + textToFilterCompletions.length);
completions = await waitForCompletions(completionProvider, cell4, position, triggerCharacter);
completions = await waitForCompletions(completionProvider, cell3, position, triggerCharacter);
items = completions.map((item) => item.label);
assert.isOk(items.length);
assert.isUndefined(
Expand Down
Loading