mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-13 19:48:37 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -30,10 +30,10 @@ import { MockQuickInputService } from 'sql/workbench/contrib/notebook/test/commo
|
||||
class TestClientSession extends ClientSessionStub {
|
||||
private _errorState: boolean = false;
|
||||
setErrorState = (value: boolean) => this._errorState = value;
|
||||
get isInErrorState(): boolean {
|
||||
override get isInErrorState(): boolean {
|
||||
return this._errorState;
|
||||
}
|
||||
get kernel(): azdata.nb.IKernel {
|
||||
override get kernel(): azdata.nb.IKernel {
|
||||
return <azdata.nb.IKernel>{
|
||||
name: 'StandardKernel1'
|
||||
};
|
||||
@@ -43,11 +43,11 @@ class TestNotebookModel extends NotebookModelStub {
|
||||
private _clientSession: TestClientSession = new TestClientSession();
|
||||
public kernelChangedEmitter: Emitter<azdata.nb.IKernelChangedArgs> = new Emitter<azdata.nb.IKernelChangedArgs>();
|
||||
|
||||
public get kernelChanged() {
|
||||
public override get kernelChanged() {
|
||||
return this.kernelChangedEmitter.event;
|
||||
}
|
||||
|
||||
public get clientSession(): TestClientSession {
|
||||
public override get clientSession(): TestClientSession {
|
||||
return this._clientSession;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ class TestNotebookModel extends NotebookModelStub {
|
||||
return [...this._standardKernelsMap.values()].map(x => x.displayName);
|
||||
}
|
||||
|
||||
public get specs(): azdata.nb.IAllKernels | undefined {
|
||||
public override get specs(): azdata.nb.IAllKernels | undefined {
|
||||
return {
|
||||
defaultKernel: 'SpecKernel1',
|
||||
// The name and displayName are set to same value
|
||||
@@ -100,7 +100,7 @@ class TestNotebookModel extends NotebookModelStub {
|
||||
};
|
||||
}
|
||||
|
||||
public getStandardKernelFromName(name: string): IStandardKernelWithProvider {
|
||||
public override getStandardKernelFromName(name: string): IStandardKernelWithProvider {
|
||||
return this._standardKernelsMap.get(name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,25 +64,25 @@ class NotebookModelStub extends stubs.NotebookModelStub {
|
||||
private _kernelChangedEmitter = new Emitter<nb.IKernelChangedArgs>();
|
||||
private _onActiveCellChanged = new Emitter<ICellModel>();
|
||||
|
||||
public get contentChanged(): Event<NotebookContentChange> {
|
||||
public override get contentChanged(): Event<NotebookContentChange> {
|
||||
return this.contentChangedEmitter.event;
|
||||
}
|
||||
|
||||
get kernelChanged(): Event<nb.IKernelChangedArgs> {
|
||||
override get kernelChanged(): Event<nb.IKernelChangedArgs> {
|
||||
return this._kernelChangedEmitter.event;
|
||||
}
|
||||
|
||||
get onActiveCellChanged(): Event<ICellModel> {
|
||||
override get onActiveCellChanged(): Event<ICellModel> {
|
||||
return this._onActiveCellChanged.event;
|
||||
}
|
||||
|
||||
updateActiveCell(cell: ICellModel) {
|
||||
override updateActiveCell(cell: ICellModel) {
|
||||
// do nothing.
|
||||
// When relevant a mock is used to intercept this call to do any verifications or run
|
||||
// any code relevant for testing in the context of the test.
|
||||
}
|
||||
|
||||
get activeCell(): ICellModel {
|
||||
override get activeCell(): ICellModel {
|
||||
return <ICellModel>{};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,21 +7,23 @@ import * as assert from 'assert';
|
||||
import * as Platform from 'vs/platform/registry/common/platform';
|
||||
import { ViewletDescriptor, Extensions, ViewletRegistry, Viewlet } from 'vs/workbench/browser/viewlet';
|
||||
import * as Types from 'vs/base/common/types';
|
||||
import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices';
|
||||
import { Extensions as ViewContainerExtensions, IViewDescriptor, IViewsRegistry } from 'vs/workbench/common/views';
|
||||
import { NotebookExplorerViewPaneContainer, NOTEBOOK_VIEW_CONTAINER } from 'sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet';
|
||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
|
||||
|
||||
suite('Notebook Explorer Views', () => {
|
||||
|
||||
class NotebookExplorerTestViewlet extends Viewlet {
|
||||
|
||||
constructor() {
|
||||
const instantiationService = workbenchInstantiationService();
|
||||
super('notebookExplorer', instantiationService.createInstance(NotebookExplorerViewPaneContainer), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
|
||||
super('notebookExplorer', undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
|
||||
}
|
||||
|
||||
public layout(dimension: any): void {
|
||||
public override layout(dimension: any): void {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
protected createViewPaneContainer(parent: HTMLElement): ViewPaneContainer {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
|
||||
|
||||
@@ -62,13 +62,13 @@ suite('Notebook Input', function (): void {
|
||||
testTitle, fileUri, undefined,
|
||||
undefined, instantiationService, mockNotebookService.object, mockExtensionService.object);
|
||||
|
||||
let inputId = fileNotebookInput.getTypeId();
|
||||
let inputId = fileNotebookInput.typeId;
|
||||
assert.strictEqual(inputId, FileNotebookInput.ID);
|
||||
assert.strictEqual(fileNotebookInput.isUntitled(), false, 'File Input should not be untitled');
|
||||
});
|
||||
|
||||
test('Untitled Notebook Input', async function (): Promise<void> {
|
||||
let inputId = untitledNotebookInput.getTypeId();
|
||||
let inputId = untitledNotebookInput.typeId;
|
||||
assert.strictEqual(inputId, UntitledNotebookInput.ID);
|
||||
assert.ok(untitledNotebookInput.isUntitled(), 'Untitled Input should be untitled');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user