ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-25 14:20:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd (#5074)

Browse Source 
* Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd

* fix tests
This commit is contained in:
Anthony Dresser
2019-04-16 22:11:30 -07:00
committed by GitHub
parent 2f8519cb6b
commit 8956b591f7
217 changed files with 5120 additions and 3926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sqltest/parts/insights/insightsUtils.test.ts
View File

@@ -12,7 +12,7 @@ import * as path from 'vs/base/common/path';
import * as pfs from 'vs/base/node/pfs';
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
import { Workspace, toWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
import { TestContextService } from 'vs/workbench/test/workbenchTestServices';
import { IExtensionHostDebugParams, IDebugParams, ParsedArgs } from 'vs/platform/environment/common/environment';
@@ -113,7 +113,7 @@ suite('Insights Utils tests', function () {
const contextService = new TestContextService(
new Workspace(
'TestWorkspace',
toWorkspaceFolders([{ path: queryFileDir }])
[toWorkspaceFolder(URI.file(queryFileDir))]
));
const configurationResolverService = new ConfigurationResolverService(
undefined,
@@ -133,8 +133,8 @@ suite('Insights Utils tests', function () {
const contextService = new TestContextService(
new Workspace(
'TestWorkspace',
toWorkspaceFolders([{ path: os.tmpdir() }])
));
[toWorkspaceFolder(URI.file(os.tmpdir()))])
);
const configurationResolverService = new ConfigurationResolverService(
undefined,
new TestEnvironmentService({}),
@@ -194,7 +194,7 @@ suite('Insights Utils tests', function () {
test('resolveQueryFilePath resolves path correctly with env var and non-empty workspace', async () => {
const contextService = new TestContextService(
new Workspace('TestWorkspace', toWorkspaceFolders([{ path: os.tmpdir() }])));
new Workspace('TestWorkspace', [toWorkspaceFolder(URI.file(os.tmpdir()))]));
// Create mock window service with env variable containing test folder for resolution
const configurationResolverService = new ConfigurationResolverService(