提交 9948719a 编写于 作者: D Daniel Imms

Fix test compilation

上级 e6f03c84
...@@ -19,6 +19,7 @@ import { FileService } from 'vs/workbench/services/files/node/fileService'; ...@@ -19,6 +19,7 @@ import { FileService } from 'vs/workbench/services/files/node/fileService';
import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
import { parseArgs } from 'vs/platform/environment/node/argv'; import { parseArgs } from 'vs/platform/environment/node/argv';
import { RawTextSource } from 'vs/editor/common/model/textSource'; import { RawTextSource } from 'vs/editor/common/model/textSource';
import { TestContextService } from 'vs/workbench/test/workbenchTestServices';
class TestEnvironmentService extends EnvironmentService { class TestEnvironmentService extends EnvironmentService {
...@@ -47,7 +48,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', crypto.cre ...@@ -47,7 +48,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', crypto.cre
class TestBackupFileService extends BackupFileService { class TestBackupFileService extends BackupFileService {
constructor(workspace: Uri, backupHome: string, workspacesJsonPath: string) { constructor(workspace: Uri, backupHome: string, workspacesJsonPath: string) {
const fileService = new FileService(workspace.fsPath, { disableWatcher: true }); const fileService = new FileService(workspace.fsPath, { disableWatcher: true }, new TestContextService());
super(workspaceBackupPath, fileService); super(workspaceBackupPath, fileService);
} }
......
...@@ -18,7 +18,7 @@ import { parseArgs } from 'vs/platform/environment/node/argv'; ...@@ -18,7 +18,7 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
import { IWorkspaceContextService, LegacyWorkspace } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService, LegacyWorkspace } from 'vs/platform/workspace/common/workspace';
import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
import extfs = require('vs/base/node/extfs'); import extfs = require('vs/base/node/extfs');
import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService } from 'vs/workbench/test/workbenchTestServices'; import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService } from 'vs/workbench/test/workbenchTestServices';
import uuid = require('vs/base/common/uuid'); import uuid = require('vs/base/common/uuid');
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
import { WorkspaceConfigurationService } from 'vs/workbench/services/configuration/node/configuration'; import { WorkspaceConfigurationService } from 'vs/workbench/services/configuration/node/configuration';
...@@ -124,7 +124,7 @@ suite('ConfigurationEditingService', () => { ...@@ -124,7 +124,7 @@ suite('ConfigurationEditingService', () => {
instantiationService.stub(ITelemetryService, NullTelemetryService); instantiationService.stub(ITelemetryService, NullTelemetryService);
instantiationService.stub(IModeService, ModeServiceImpl); instantiationService.stub(IModeService, ModeServiceImpl);
instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl)); instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
instantiationService.stub(IFileService, new FileService(workspaceDir, { disableWatcher: true })); instantiationService.stub(IFileService, new FileService(workspaceDir, { disableWatcher: true }, new TestContextService()));
instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService)); instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService)); instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
......
...@@ -19,6 +19,7 @@ import extfs = require('vs/base/node/extfs'); ...@@ -19,6 +19,7 @@ import extfs = require('vs/base/node/extfs');
import encodingLib = require('vs/base/node/encoding'); import encodingLib = require('vs/base/node/encoding');
import utils = require('vs/workbench/services/files/test/node/utils'); import utils = require('vs/workbench/services/files/test/node/utils');
import { onError } from 'vs/base/test/common/utils'; import { onError } from 'vs/base/test/common/utils';
import { TestContextService } from "vs/workbench/test/workbenchTestServices";
suite('FileService', () => { suite('FileService', () => {
let service: FileService; let service: FileService;
...@@ -35,7 +36,7 @@ suite('FileService', () => { ...@@ -35,7 +36,7 @@ suite('FileService', () => {
return onError(error, done); return onError(error, done);
} }
service = new FileService(testDir, { disableWatcher: true }); service = new FileService(testDir, { disableWatcher: true }, new TestContextService());
done(); done();
}); });
}); });
...@@ -735,7 +736,7 @@ suite('FileService', () => { ...@@ -735,7 +736,7 @@ suite('FileService', () => {
encoding: 'windows1252', encoding: 'windows1252',
encodingOverride: encodingOverride, encodingOverride: encodingOverride,
disableWatcher: true disableWatcher: true
}); }, new TestContextService());
_service.resolveContent(uri.file(path.join(testDir, 'index.html'))).done(c => { _service.resolveContent(uri.file(path.join(testDir, 'index.html'))).done(c => {
assert.equal(c.encoding, 'windows1252'); assert.equal(c.encoding, 'windows1252');
...@@ -761,7 +762,7 @@ suite('FileService', () => { ...@@ -761,7 +762,7 @@ suite('FileService', () => {
let _service = new FileService(_testDir, { let _service = new FileService(_testDir, {
disableWatcher: true disableWatcher: true
}); }, new TestContextService());
extfs.copy(_sourceDir, _testDir, () => { extfs.copy(_sourceDir, _testDir, () => {
fs.readFile(resource.fsPath, (error, data) => { fs.readFile(resource.fsPath, (error, data) => {
......
...@@ -73,7 +73,7 @@ suite('Keybindings Editing', () => { ...@@ -73,7 +73,7 @@ suite('Keybindings Editing', () => {
instantiationService.stub(ITelemetryService, NullTelemetryService); instantiationService.stub(ITelemetryService, NullTelemetryService);
instantiationService.stub(IModeService, ModeServiceImpl); instantiationService.stub(IModeService, ModeServiceImpl);
instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl)); instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
instantiationService.stub(IFileService, new FileService(testDir, { disableWatcher: true })); instantiationService.stub(IFileService, new FileService(testDir, { disableWatcher: true }, new TestContextService()));
instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService)); instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService)); instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService)); instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册