Strict Null Checks on platform/accounts (#6735)

* add some patches for strict null

* renable strict null checks

* wip

* finish adding account to strict nulls

* fix backup component

* wip

* fix tests

src/sql/platform/accounts/browser/accountListRenderer.ts

@@ -33,26 +33,29 @@ export class AccountListDelegate implements IListVirtualDelegate<azdata.Account>
 	}
 }
 
-export interface AccountListTemplate {
+export interface AccountPickerListTemplate {
 	root: HTMLElement;
 	icon: HTMLElement;
 	badgeContent: HTMLElement;
 	contextualDisplayName: HTMLElement;
 	label: HTMLElement;
 	displayName: HTMLElement;
-	content?: HTMLElement;
-	actions?: ActionBar;
 }
 
-export class AccountPickerListRenderer implements IListRenderer<azdata.Account, AccountListTemplate> {
+export interface AccountListTemplate extends AccountPickerListTemplate {
+	content: HTMLElement;
+	actions: ActionBar;
+}
+
+export class AccountPickerListRenderer implements IListRenderer<azdata.Account, AccountPickerListTemplate> {
 	public static TEMPLATE_ID = 'accountListRenderer';
 
 	public get templateId(): string {
 		return AccountPickerListRenderer.TEMPLATE_ID;
 	}
 
-	public renderTemplate(container: HTMLElement): AccountListTemplate {
-		const tableTemplate: AccountListTemplate = Object.create(null);
+	public renderTemplate(container: HTMLElement): AccountPickerListTemplate {
+		const tableTemplate: AccountPickerListTemplate = Object.create(null);
 		const badge = DOM.$('div.badge');
 		tableTemplate.root = DOM.append(container, DOM.$('div.list-row.account-picker-list'));
 		tableTemplate.icon = DOM.append(tableTemplate.root, DOM.$('div.icon'));
@@ -64,7 +67,7 @@ export class AccountPickerListRenderer implements IListRenderer<azdata.Account,
 		return tableTemplate;
 	}
 
-	public renderElement(account: azdata.Account, index: number, templateData: AccountListTemplate): void {
+	public renderElement(account: azdata.Account, index: number, templateData: AccountPickerListTemplate): void {
 		// Set the account icon
 		templateData.icon.classList.add('account-logo', account.displayInfo.accountType);
 
@@ -84,11 +87,11 @@ export class AccountPickerListRenderer implements IListRenderer<azdata.Account,
 		}
 	}
 
-	public disposeTemplate(template: AccountListTemplate): void {
+	public disposeTemplate(template: AccountPickerListTemplate): void {
 		// noop
 	}
 
-	public disposeElement(element: azdata.Account, index: number, templateData: AccountListTemplate): void {
+	public disposeElement(element: azdata.Account, index: number, templateData: AccountPickerListTemplate): void {
 		// noop
 	}
 }
@@ -105,7 +108,7 @@ export class AccountListRenderer extends AccountPickerListRenderer {
 	}
 
 	public renderTemplate(container: HTMLElement): AccountListTemplate {
-		const tableTemplate = super.renderTemplate(container);
+		const tableTemplate = super.renderTemplate(container) as AccountListTemplate;
 		tableTemplate.content = DOM.append(tableTemplate.label, DOM.$('div.content'));
 		tableTemplate.actions = new ActionBar(tableTemplate.root, { animated: false });
 

src/sql/platform/accounts/browser/accountPicker.ts

@@ -44,8 +44,8 @@ export class AccountPicker extends Disposable {
 	private _addAccountStartEmitter: Emitter<void>;
 	public get addAccountStartEvent(): Event<void> { return this._addAccountStartEmitter.event; }
 
-	private _onAccountSelectionChangeEvent: Emitter<azdata.Account>;
-	public get onAccountSelectionChangeEvent(): Event<azdata.Account> { return this._onAccountSelectionChangeEvent.event; }
+	private _onAccountSelectionChangeEvent: Emitter<azdata.Account | undefined>;
+	public get onAccountSelectionChangeEvent(): Event<azdata.Account | undefined> { return this._onAccountSelectionChangeEvent.event; }
 
 	constructor(
 		private _providerId: string,
@@ -145,7 +145,7 @@ export class AccountPicker extends Disposable {
 	}
 
 	// PRIVATE HELPERS /////////////////////////////////////////////////////
-	private onAccountSelectionChange(account: azdata.Account) {
+	private onAccountSelectionChange(account: azdata.Account | undefined) {
 		this.viewModel.selectedAccount = account;
 		if (account && account.isStale) {
 			this._refreshAccountAction.account = account;
@@ -157,7 +157,7 @@ export class AccountPicker extends Disposable {
 		this._onAccountSelectionChangeEvent.fire(account);
 	}
 
-	private renderLabel(container: HTMLElement): IDisposable {
+	private renderLabel(container: HTMLElement): IDisposable | null {
 		if (container.hasChildNodes()) {
 			for (let i = 0; i < container.childNodes.length; i++) {
 				container.removeChild(container.childNodes.item(i));
@@ -189,7 +189,7 @@ export class AccountPicker extends Disposable {
 			const row = DOM.append(container, DOM.$('div.no-account-container'));
 			row.innerText = AddAccountAction.LABEL + '...';
 		}
-		return undefined;
+		return null;
 	}
 
 	private updateAccountList(accounts: azdata.Account[]): void {
@@ -197,7 +197,7 @@ export class AccountPicker extends Disposable {
 		const selectedElements = this._accountList.getSelectedElements();
 
 		// find selected index
-		let selectedIndex: number;
+		let selectedIndex: number | undefined;
 		if (selectedElements.length > 0 && accounts.length > 0) {
 			selectedIndex = accounts.findIndex((account) => {
 				return (account.key.accountId === selectedElements[0].key.accountId);

src/sql/platform/accounts/browser/accountPickerService.ts

@@ -25,8 +25,8 @@ export class AccountPickerService implements IAccountPickerService {
 	private _addAccountStartEmitter: Emitter<void>;
 	public get addAccountStartEvent(): Event<void> { return this._addAccountStartEmitter.event; }
 
-	private _onAccountSelectionChangeEvent: Emitter<azdata.Account>;
-	public get onAccountSelectionChangeEvent(): Event<azdata.Account> { return this._onAccountSelectionChangeEvent.event; }
+	private _onAccountSelectionChangeEvent: Emitter<azdata.Account | undefined>;
+	public get onAccountSelectionChangeEvent(): Event<azdata.Account | undefined> { return this._onAccountSelectionChangeEvent.event; }
 
 	constructor(
 		@IInstantiationService private _instantiationService: IInstantiationService
@@ -41,7 +41,7 @@ export class AccountPickerService implements IAccountPickerService {
 	/**
 	 * Get selected account
 	 */
-	public get selectedAccount(): azdata.Account {
+	public get selectedAccount(): azdata.Account | undefined {
 		return this._accountPicker.viewModel.selectedAccount;
 	}
 

src/sql/platform/accounts/browser/autoOAuthDialogController.ts

@@ -14,7 +14,7 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess
 export class AutoOAuthDialogController {
 	// MEMBER VARIABLES ////////////////////////////////////////////////////
 	private _autoOAuthDialog: AutoOAuthDialog;
-	private _providerId: string;
+	private _providerId?: string;
 	private _userCode: string;
 	private _uri: string;
 
@@ -22,15 +22,13 @@ export class AutoOAuthDialogController {
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IAccountManagementService private _accountManagementService: IAccountManagementService,
 		@IErrorMessageService private _errorMessageService: IErrorMessageService
-	) {
-		this._providerId = null;
-	}
+	) { }
 
 	/**
 	 * Open auto OAuth dialog
 	 */
 	public openAutoOAuthDialog(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable<void> {
-		if (this._providerId !== null) {
+		if (this._providerId !== undefined) {
 			// If a oauth flyout is already open, return an error
 			const errorMessage = localize('oauthFlyoutIsAlreadyOpen', "Cannot start auto OAuth. An auto OAuth is already in progress.");
 			this._errorMessageService.showDialog(Severity.Error, '', errorMessage);
@@ -60,16 +58,16 @@ export class AutoOAuthDialogController {
 	 */
 	public closeAutoOAuthDialog(): void {
 		this._autoOAuthDialog.close();
-		this._providerId = null;
+		this._providerId = undefined;
 	}
 
 	// PRIVATE HELPERS /////////////////////////////////////////////////////
 	private handleOnCancel(): void {
-		this._accountManagementService.cancelAutoOAuthDeviceCode(this._providerId);
+		this._accountManagementService.cancelAutoOAuthDeviceCode(this._providerId!); // this should be always true
 	}
 
 	private handleOnClose(): void {
-		this._providerId = null;
+		this._providerId = undefined;
 	}
 
 	private handleOnAddAccount(): void {

src/sql/platform/accounts/browser/firewallRuleDialog.ts

@@ -278,7 +278,7 @@ export class FirewallRuleDialog extends Modal {
 		}
 	}
 
-	public onAccountSelectionChange(account: azdata.Account): void {
+	public onAccountSelectionChange(account: azdata.Account | undefined): void {
 		this.viewModel.selectedAccount = account;
 		if (account && !account.isStale) {
 			this._createButton.enabled = true;

src/sql/platform/accounts/browser/firewallRuleDialogController.ts

@@ -57,31 +57,28 @@ export class FirewallRuleDialogController {
 		this._errorMessageService.showDialog(Severity.Error, this._addAccountErrorTitle, message);
 	}
 
-	private handleOnCreateFirewallRule(): void {
+	private async handleOnCreateFirewallRule(): Promise<void> {
 		const resourceProviderId = this._resourceProviderId;
-
-		this._accountManagementService.getSecurityToken(this._firewallRuleDialog.viewModel.selectedAccount, AzureResource.ResourceManagement).then(tokenMappings => {
-			let firewallRuleInfo: azdata.FirewallRuleInfo = {
+		try {
+			const securityTokenMappings = await this._accountManagementService.getSecurityToken(this._firewallRuleDialog.viewModel.selectedAccount!, AzureResource.ResourceManagement);
+			const firewallRuleInfo: azdata.FirewallRuleInfo = {
 				startIpAddress: this._firewallRuleDialog.viewModel.isIPAddressSelected ? this._firewallRuleDialog.viewModel.defaultIPAddress : this._firewallRuleDialog.viewModel.fromSubnetIPRange,
 				endIpAddress: this._firewallRuleDialog.viewModel.isIPAddressSelected ? this._firewallRuleDialog.viewModel.defaultIPAddress : this._firewallRuleDialog.viewModel.toSubnetIPRange,
 				serverName: this._connection.serverName,
-				securityTokenMappings: tokenMappings
+				securityTokenMappings
 			};
 
-			this._resourceProviderService.createFirewallRule(this._firewallRuleDialog.viewModel.selectedAccount, firewallRuleInfo, resourceProviderId).then(createFirewallRuleResponse => {
-				if (createFirewallRuleResponse.result) {
-					this._firewallRuleDialog.close();
-					this._deferredPromise.resolve(true);
-				} else {
-					this._errorMessageService.showDialog(Severity.Error, this._firewallRuleErrorTitle, createFirewallRuleResponse.errorMessage);
-				}
-				this._firewallRuleDialog.onServiceComplete();
-			}, error => {
-				this.showError(error);
-			});
-		}, error => {
-			this.showError(error);
-		});
+			const response = await this._resourceProviderService.createFirewallRule(this._firewallRuleDialog.viewModel.selectedAccount!, firewallRuleInfo, resourceProviderId);
+			if (response.result) {
+				this._firewallRuleDialog.close();
+				this._deferredPromise.resolve(true);
+			} else {
+				this._errorMessageService.showDialog(Severity.Error, this._firewallRuleErrorTitle, response.errorMessage);
+			}
+			this._firewallRuleDialog.onServiceComplete();
+		} catch (e) {
+			this.showError(e);
+		}
 	}
 
 	private showError(error: any): void {

src/sql/platform/accounts/common/accountPicker.ts

@@ -15,6 +15,6 @@ export interface IAccountPickerService {
 	addAccountCompleteEvent: Event<void>;
 	addAccountErrorEvent: Event<string>;
 	addAccountStartEvent: Event<void>;
-	onAccountSelectionChangeEvent: Event<azdata.Account>;
-	selectedAccount: azdata.Account;
+	onAccountSelectionChangeEvent: Event<azdata.Account | undefined>;
+	selectedAccount: azdata.Account | undefined;
 }

src/sql/platform/accounts/common/accountPickerViewModel.ts

@@ -17,7 +17,7 @@ export class AccountPickerViewModel {
 	private _updateAccountListEmitter: Emitter<UpdateAccountListEventParams>;
 	public get updateAccountListEvent(): Event<UpdateAccountListEventParams> { return this._updateAccountListEmitter.event; }
 
-	public selectedAccount: azdata.Account;
+	public selectedAccount: azdata.Account | undefined;
 
 	constructor(
 		private _providerId: string,

src/sql/platform/accounts/common/accountStore.ts

@@ -89,7 +89,7 @@ export default class AccountStore implements IAccountStore {
 		activeOperation = activeOperation.then(op);
 
 		// Add a catch at the end to make sure we can continue after any errors
-		activeOperation = activeOperation.then(null, (err) => {
+		activeOperation = activeOperation.then(undefined, (err) => {
 			// TODO: Log the error
 		});
 
@@ -107,7 +107,7 @@ export default class AccountStore implements IAccountStore {
 				accountAdded: false,
 				accountModified: false,
 				accountRemoved: false,
-				changedAccount: null,
+				changedAccount: undefined,
 				updatedAccounts: accounts
 			};
 		}
@@ -135,7 +135,7 @@ export default class AccountStore implements IAccountStore {
 			accountAdded: false,
 			accountModified: false,
 			accountRemoved: match >= 0,
-			changedAccount: null,
+			changedAccount: undefined,
 			updatedAccounts: accounts
 		};
 	}
@@ -149,7 +149,7 @@ export default class AccountStore implements IAccountStore {
 				accountAdded: false,
 				accountModified: false,
 				accountRemoved: false,
-				changedAccount: null,
+				changedAccount: undefined,
 				updatedAccounts: accounts
 			};
 		}

src/sql/platform/accounts/common/eventTypes.ts

@@ -22,7 +22,7 @@ export interface AccountAdditionResult {
 	/**
 	 * The account that was added/updated (with any updates applied)
 	 */
-	changedAccount: azdata.Account;
+	changedAccount: azdata.Account | undefined;
 }
 
 /**

src/sql/platform/accounts/common/firewallRuleViewModel.ts

@@ -10,7 +10,7 @@ import * as azdata from 'azdata';
  */
 export class FirewallRuleViewModel {
 	public isIPAddressSelected: boolean;
-	public selectedAccount: azdata.Account;
+	public selectedAccount: azdata.Account | undefined;
 
 	private _defaultIPAddress: string;
 	private _defaultFromSubnetIPRange: string;

src/sql/platform/accounts/test/browser/accountDialogController.test.ts

@@ -20,7 +20,7 @@ suite('Account Management Dialog Controller Tests', () => {
 	test('Open Account Dialog - Dialog Doesn\'t Exist', () => {
 		// Setup: Create instance of the controller
 		let instantiationService = createInstantiationService();
-		let controller = new AccountDialogController(instantiationService, undefined);
+		let controller = new AccountDialogController(instantiationService, undefined!);
 		assert.strictEqual(controller.accountDialog, undefined);
 
 		// If: I open the account dialog when one hasn't been opened
@@ -34,7 +34,7 @@ suite('Account Management Dialog Controller Tests', () => {
 	test('Open Account Dialog - Dialog Exists', () => {
 		// Setup: Create instance of the controller with an account dialog already loaded
 		let instantiationService = createInstantiationService();
-		let controller = new AccountDialogController(instantiationService, undefined);
+		let controller = new AccountDialogController(instantiationService, undefined!);
 		controller.openAccountDialog();
 		let accountDialog = controller.accountDialog;
 
@@ -86,7 +86,7 @@ function createInstantiationService(addAccountFailureEmitter?: Emitter<string>):
 		.returns(() => undefined);
 
 	// Create a mock account dialog
-	let accountDialog = new AccountDialog(null, null, instantiationService.object, null, null, null, null, new MockContextKeyService(), null, undefined, undefined);
+	let accountDialog = new AccountDialog(undefined!, undefined!, instantiationService.object, undefined!, undefined!, undefined!, undefined!, new MockContextKeyService(), undefined!, undefined!, undefined!);
 	let mockAccountDialog = TypeMoq.Mock.ofInstance(accountDialog);
 	mockAccountDialog.setup(x => x.onAddAccountErrorEvent)
 		.returns(() => { return addAccountFailureEmitter ? addAccountFailureEmitter.event : mockEvent.event; });

src/sql/platform/accounts/test/browser/accountPickerService.test.ts

@@ -13,6 +13,7 @@ import { AccountPickerService } from 'sql/platform/accounts/browser/accountPicke
 import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
 import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
 let mockAddAccountCompleteEmitter: Emitter<void>;
@@ -98,7 +99,8 @@ function createInstantiationService(): InstantiationService {
 		.returns(() => mockAccountViewModel.object);
 
 	// Create a mock account picker
-	let accountPicker = new AccountPicker(null, null, instantiationService.object, null);
+
+	let accountPicker = new AccountPicker('provider', new TestThemeService(), instantiationService.object, undefined!);
 	let mockAccountDialog = TypeMoq.Mock.ofInstance(accountPicker);
 
 	mockAccountDialog.setup(x => x.addAccountCompleteEvent)

src/sql/platform/accounts/test/browser/autoOAuthDialogController.test.ts

@@ -37,7 +37,7 @@ suite('auto OAuth dialog controller tests', () => {
 		mockOnCloseEvent = new Emitter<void>();
 
 		// Create a mock auto OAuth dialog
-		let autoOAuthDialog = new AutoOAuthDialog(null, null, null, null, new MockContextKeyService(), null, undefined, undefined);
+		let autoOAuthDialog = new AutoOAuthDialog(undefined!, undefined!, undefined!, undefined!, new MockContextKeyService(), undefined!, undefined!, undefined!);
 		mockAutoOAuthDialog = TypeMoq.Mock.ofInstance(autoOAuthDialog);
 
 		mockAutoOAuthDialog.setup(x => x.onCancel).returns(() => mockOnCancelEvent.event);

src/sql/platform/accounts/test/browser/firewallRuleDialogController.test.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
-import { Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { FirewallRuleDialog } from 'sql/platform/accounts/browser/firewallRuleDialog';
 import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
@@ -60,7 +60,7 @@ suite('Firewall rule dialog controller tests', () => {
 			.returns(() => mockFirewallRuleViewModel.object);
 
 		// Create a mock account picker
-		let firewallRuleDialog = new FirewallRuleDialog(null, null, null, instantiationService.object, null, null, new MockContextKeyService(), null, null, undefined, undefined);
+		let firewallRuleDialog = new FirewallRuleDialog(undefined!, undefined!, undefined!, instantiationService.object, undefined!, undefined!, new MockContextKeyService(), undefined!, undefined!, undefined!, undefined!);
 		mockFirewallRuleDialog = TypeMoq.Mock.ofInstance(firewallRuleDialog);
 
 		let mockEvent = new Emitter<any>();
@@ -87,12 +87,12 @@ suite('Firewall rule dialog controller tests', () => {
 			savePassword: true,
 			groupFullName: 'g2/g2-2',
 			groupId: 'group id',
-			getOptionsKey: undefined,
-			matches: undefined,
+			getOptionsKey: () => '',
+			matches: () => false,
 			providerName: mssqlProviderName,
 			options: {},
 			saveProfile: true,
-			id: undefined
+			id: ''
 		};
 	});
 
@@ -103,7 +103,7 @@ suite('Firewall rule dialog controller tests', () => {
 		mockErrorMessageService.setup(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()));
 
 		// ... Create instance of the controller with an opened dialog
-		let controller = new FirewallRuleDialogController(instantiationService.object, null, null, mockErrorMessageService.object);
+		let controller = new FirewallRuleDialogController(instantiationService.object, undefined!, undefined!, mockErrorMessageService.object);
 		controller.openFirewallRuleDialog(connectionProfile, IPAddress, 'resourceID');
 
 		// If: The firewall rule dialog reports a failure
@@ -114,7 +114,7 @@ suite('Firewall rule dialog controller tests', () => {
 		mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
 	});
 
-	test('create firewall rule success', (done) => {
+	test('create firewall rule success', async () => {
 		let deferredPromise = new Deferred();
 
 		mockFirewallRuleDialog.setup(x => x.onServiceComplete())
@@ -129,24 +129,22 @@ suite('Firewall rule dialog controller tests', () => {
 		let mockResourceProvider = getMockResourceProvider(true, { result: true, errorMessage: '' });
 
 		// ... Create instance of the controller with an opened dialog
-		let controller = new FirewallRuleDialogController(instantiationService.object, mockResourceProvider.object, mockAccountManagementService.object, null);
+		let controller = new FirewallRuleDialogController(instantiationService.object, mockResourceProvider.object, mockAccountManagementService.object, undefined!);
 		controller.openFirewallRuleDialog(connectionProfile, IPAddress, 'resourceID');
 
 		// If: The firewall rule dialog's create firewall rule get fired
 		mockOnCreateFirewallRule.fire();
 
 		// Then: it should get security token from account management service and call create firewall rule in resource provider
-		deferredPromise.promise.then(() => {
-			mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockFirewallRuleDialog.verify(x => x.close(), TypeMoq.Times.once());
-			mockFirewallRuleDialog.verify(x => x.onServiceComplete(), TypeMoq.Times.once());
-			done();
-		});
+		await deferredPromise;
+		mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockFirewallRuleDialog.verify(x => x.close(), TypeMoq.Times.once());
+		mockFirewallRuleDialog.verify(x => x.onServiceComplete(), TypeMoq.Times.once());
 	});
 
-	test('create firewall rule fails during getSecurity', (done) => {
-		let deferredPromise = new Deferred();
+	test('create firewall rule fails during getSecurity', async () => {
+		let deferredPromise = new Deferred<{}>();
 
 		// ... Create a mock instance of the error message service
 		let mockErrorMessageService = getMockErrorMessageService(deferredPromise);
@@ -165,16 +163,14 @@ suite('Firewall rule dialog controller tests', () => {
 		mockOnCreateFirewallRule.fire();
 
 		// Then: it should get security token from account management service and an error dialog should have been opened
-		deferredPromise.promise.then(() => {
-			mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.never());
-			done();
-		});
+		await deferredPromise;
+		mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.never());
 	});
 
-	test('create firewall rule fails during createFirewallRule in ResourceProvider - result is false', (done) => {
-		let deferredPromise = new Deferred();
+	test('create firewall rule fails during createFirewallRule in ResourceProvider - result is false', async () => {
+		let deferredPromise = new Deferred<{}>();
 
 		// ... Create a mock instance of the error message service
 		let mockErrorMessageService = getMockErrorMessageService(deferredPromise);
@@ -193,16 +189,15 @@ suite('Firewall rule dialog controller tests', () => {
 		mockOnCreateFirewallRule.fire();
 
 		// Then: it should get security token from account management service and an error dialog should have been opened
-		deferredPromise.promise.then(() => {
-			mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			done();
-		});
+		await deferredPromise;
+
+		mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
 	});
 
-	test('create firewall rule fails during createFirewallRule in ResourceProvider - reject promise', (done) => {
-		let deferredPromise = new Deferred();
+	test('create firewall rule fails during createFirewallRule in ResourceProvider - reject promise', async () => {
+		let deferredPromise = new Deferred<{}>();
 
 		// ... Create a mock instance of the error message service
 		let mockErrorMessageService = getMockErrorMessageService(deferredPromise);
@@ -221,12 +216,10 @@ suite('Firewall rule dialog controller tests', () => {
 		mockOnCreateFirewallRule.fire();
 
 		// Then: it should get security token from account management service and an error dialog should have been opened
-		deferredPromise.promise.then(() => {
-			mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
-			done();
-		});
+		await deferredPromise;
+		mockAccountManagementService.verify(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockResourceProvider.verify(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());
 	});
 });
 
@@ -234,7 +227,7 @@ function getMockAccountManagementService(resolveSecurityToken: boolean): TypeMoq
 	let accountManagementTestService = new TestAccountManagementService();
 	let mockAccountManagementService = TypeMoq.Mock.ofInstance(accountManagementTestService);
 	mockAccountManagementService.setup(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
-		.returns(() => resolveSecurityToken ? Promise.resolve({}) : Promise.reject(null).then());
+		.returns(() => resolveSecurityToken ? Promise.resolve({}) : Promise.reject(null));
 	return mockAccountManagementService;
 }
 
@@ -242,7 +235,7 @@ function getMockResourceProvider(resolveCreateFirewallRule: boolean, response?:
 	let resourceProviderStub = new TestResourceProvider();
 	let mockResourceProvider = TypeMoq.Mock.ofInstance(resourceProviderStub);
 	mockResourceProvider.setup(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()))
-		.returns(() => resolveCreateFirewallRule ? Promise.resolve(response) : Promise.reject(null).then());
+		.returns(() => resolveCreateFirewallRule ? Promise.resolve(response) : Promise.reject(null));
 	return mockResourceProvider;
 }
 

src/sql/platform/accounts/test/common/accountStore.test.ts

@@ -21,7 +21,7 @@ suite('Account Store Tests', () => {
 				// ... I should have gotten back a result indicating the account was added
 				assert.ok(result.accountAdded);
 				assert.ok(!result.accountModified);
-				assertAccountEqual(result.changedAccount, account1);
+				assertAccountEqual(result.changedAccount!, account1);
 
 				// ... The memento should have been initialized and account added
 				assert.ok(Array.isArray(memento[AccountStore.MEMENTO_KEY]));
@@ -47,7 +47,7 @@ suite('Account Store Tests', () => {
 				// ... I should have gotten back a result indicating the account was added
 				assert.ok(result.accountAdded);
 				assert.ok(!result.accountModified);
-				assertAccountEqual(result.changedAccount, account1);
+				assertAccountEqual(result.changedAccount!, account1);
 
 				// ... The memento should have the account added
 				assert.ok(Array.isArray(memento[AccountStore.MEMENTO_KEY]));
@@ -77,7 +77,7 @@ suite('Account Store Tests', () => {
 				// ... I should have gotten back a result indicating the account was updated
 				assert.ok(result.accountModified);
 				assert.ok(!result.accountAdded);
-				assertAccountEqual(result.changedAccount, param);
+				assertAccountEqual(result.changedAccount!, param);
 
 				// ... The memento should have been initialized and account updated
 				assert.ok(Array.isArray(memento[AccountStore.MEMENTO_KEY]));

src/sql/platform/accounts/test/common/testAccountManagementService.ts

@@ -11,20 +11,20 @@ import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 's
 export class TestAccountManagementService implements IAccountManagementService {
 	_serviceBrand: any;
 
-	public get addAccountProviderEvent(): Event<AccountProviderAddedEventParams> { return () => { return undefined; }; }
-	public get removeAccountProviderEvent(): Event<azdata.AccountProviderMetadata> { return () => { return undefined; }; }
-	public get updateAccountListEvent(): Event<UpdateAccountListEventParams> { return () => { return undefined; }; }
+	public get addAccountProviderEvent(): Event<AccountProviderAddedEventParams> { return Event.None; }
+	public get removeAccountProviderEvent(): Event<azdata.AccountProviderMetadata> { return Event.None; }
+	public get updateAccountListEvent(): Event<UpdateAccountListEventParams> { return Event.None; }
 
 	accountUpdated(account: azdata.Account): Thenable<void> {
-		return undefined;
+		return Promise.resolve();
 	}
 
 	addAccount(providerId: string): Thenable<void> {
-		return undefined;
+		return Promise.resolve();
 	}
 
 	beginAutoOAuthDeviceCode(title: string, message: string, userCode: string, uri: string): Thenable<void> {
-		return undefined;
+		return Promise.resolve();
 	}
 
 	cancelAutoOAuthDeviceCode(providerId: string): void {
@@ -40,27 +40,27 @@ export class TestAccountManagementService implements IAccountManagementService {
 	}
 
 	getAccountProviderMetadata(): Thenable<azdata.AccountProviderMetadata[]> {
-		return undefined;
+		return Promise.resolve([]);
 	}
 
 	getAccountsForProvider(providerId: string): Thenable<azdata.Account[]> {
-		return undefined;
+		return Promise.resolve([]);
 	}
 
 	getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> {
-		return undefined;
+		return Promise.resolve([]);
 	}
 
 	removeAccount(accountKey: azdata.AccountKey): Thenable<boolean> {
-		return undefined;
+		throw new Error('Method not implemented');
 	}
 
 	refreshAccount(account: azdata.Account): Thenable<azdata.Account> {
-		return undefined;
+		throw new Error('Method not implemented');
 	}
 
 	openAccountListDialog(): Promise<any> {
-		return undefined;
+		return Promise.resolve();
 	}
 
 	registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): void {
@@ -94,7 +94,7 @@ export class AccountProviderStub implements azdata.AccountProvider {
 	}
 
 	prompt(): Thenable<azdata.Account> {
-		return Promise.resolve(undefined);
+		throw new Error('Method not implemented');
 	}
 
 	refresh(account: azdata.Account): Thenable<azdata.Account> {