azdata.Account -> AzureAccount (#16842)

This commit is contained in:
Charles Gagnon
2021-08-20 10:28:33 -07:00
committed by GitHub
parent d1dc226ff6
commit 5b3fbaa5ff
24 changed files with 115 additions and 96 deletions

View File

@@ -23,6 +23,7 @@ import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/s
import { AzureResourceItemType, AzureResourceServiceNames } from '../../../azureResource/constants';
import { AzureResourceMessageTreeNode } from '../../../azureResource/messageTreeNode';
import { generateGuid } from '../../../azureResource/utils';
import { AzureAccount } from 'azurecore';
// Mock services
let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
@@ -35,7 +36,7 @@ let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
// Mock test data
const mockTenantId = 'mock_tenant_id';
const mockAccount: azdata.Account = {
const mockAccount: AzureAccount = {
key: {
accountId: '97915f6d-84fa-4926-b60c-38db64327ad7',
providerId: 'mock_provider'
@@ -50,9 +51,16 @@ const mockAccount: azdata.Account = {
properties: {
tenants: [
{
id: mockTenantId
id: mockTenantId,
displayName: 'Mock Tenant'
}
]
],
providerSettings: {
settings: { },
id: 'azure',
displayName: 'Azure'
},
isMsAccount: true
},
isStale: false
};

View File

@@ -5,7 +5,6 @@
import * as should from 'should';
import * as TypeMoq from 'typemoq';
import * as azdata from 'azdata';
import * as vscode from 'vscode';
import 'mocha';
import { AppContext } from '../../../appContext';
@@ -18,6 +17,7 @@ import { AzureResourceService } from '../../../azureResource/resourceService';
import { AzureResourceResourceTreeNode } from '../../../azureResource/resourceTreeNode';
import { IAzureResourceCacheService } from '../../../azureResource/interfaces';
import { generateGuid } from '../../../azureResource/utils';
import { AzureAccount } from 'azurecore';
// Mock services
let appContext: AppContext;
@@ -28,7 +28,7 @@ let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
// Mock test data
const mockAccount: azdata.Account = {
const mockAccount: AzureAccount = {
key: {
accountId: 'mock_account',
providerId: 'mock_provider'

View File

@@ -17,6 +17,7 @@ import { AzureResourceAccountTreeNode } from '../../../azureResource/tree/accoun
import { AzureResourceAccountNotSignedInTreeNode } from '../../../azureResource/tree/accountNotSignedInTreeNode';
import { AzureResourceServiceNames } from '../../../azureResource/constants';
import { generateGuid } from '../../../azureResource/utils';
import { AzureAccount } from 'azurecore';
// Mock services
let mockAppContext: AppContext;
@@ -25,7 +26,7 @@ let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
// Mock test data
const mockAccount1: azdata.Account = {
const mockAccount1: AzureAccount = {
key: {
accountId: 'mock_account_1',
providerId: 'mock_provider'
@@ -39,7 +40,7 @@ const mockAccount1: azdata.Account = {
properties: undefined,
isStale: false
};
const mockAccount2: azdata.Account = {
const mockAccount2: AzureAccount = {
key: {
accountId: 'mock_account_2',
providerId: 'mock_provider'