From 461a529bf6e6e0edad9945c871e331ff6d7f5ea2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 4 May 2016 21:13:48 +0200
Subject: [PATCH] move more tests to common

---
 .../workbench/parts/files/test/browser/fileEditorInput.test.ts | 2 +-
 .../workbench/parts/files/test/browser/fileEditorModel.test.ts | 2 +-
 .../parts/files/test/browser/workingFilesModel.test.ts         | 2 +-
 src/vs/workbench/parts/output/test/outputWorker.test.ts        | 2 +-
 .../workbench/parts/search/test/browser/searchViewlet.test.ts  | 2 +-
 src/vs/workbench/parts/search/test/common/searchModel.test.ts  | 2 +-
 src/vs/workbench/test/browser/part.test.ts                     | 2 +-
 .../workbench/test/browser/parts/quickOpen/quickopen.test.ts   | 3 ++-
 src/vs/workbench/test/browser/services.test.ts                 | 2 +-
 .../test/{browser/parts => common}/editor/editorInput.test.ts  | 0
 .../test/{browser/parts => common}/editor/editorModel.test.ts  | 0
 .../{browser/parts => common}/editor/editorOptions.test.ts     | 0
 .../test/common/{ => editor}/editorStacksModel.test.ts         | 0
 .../{browser/parts => common}/editor/stringEditorInput.test.ts | 2 +-
 .../{browser/parts => common}/editor/stringEditorModel.test.ts | 0
 src/vs/workbench/test/{browser => common}/events.test.ts       | 0
 src/vs/workbench/test/{browser => common}/memento.test.ts      | 2 +-
 src/vs/workbench/test/{browser => common}/servicesTestUtils.ts | 2 --
 src/vs/workbench/test/{browser => common}/storage.test.ts      | 2 +-
 19 files changed, 13 insertions(+), 14 deletions(-)
 rename src/vs/workbench/test/{browser/parts => common}/editor/editorInput.test.ts (100%)
 rename src/vs/workbench/test/{browser/parts => common}/editor/editorModel.test.ts (100%)
 rename src/vs/workbench/test/{browser/parts => common}/editor/editorOptions.test.ts (100%)
 rename src/vs/workbench/test/common/{ => editor}/editorStacksModel.test.ts (100%)
 rename src/vs/workbench/test/{browser/parts => common}/editor/stringEditorInput.test.ts (98%)
 rename src/vs/workbench/test/{browser/parts => common}/editor/stringEditorModel.test.ts (100%)
 rename src/vs/workbench/test/{browser => common}/events.test.ts (100%)
 rename src/vs/workbench/test/{browser => common}/memento.test.ts (98%)
 rename src/vs/workbench/test/{browser => common}/servicesTestUtils.ts (98%)
 rename src/vs/workbench/test/{browser => common}/storage.test.ts (99%)

diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
index d1df146ffbb..503e748e7a6 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -25,7 +25,7 @@ import {IPartService} from 'vs/workbench/services/part/common/partService';
 import {ITextFileService} from 'vs/workbench/parts/files/common/files';
 import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
 import {FileTracker} from 'vs/workbench/parts/files/browser/fileTracker';
-import {TestFileService, TestEditorService, TestPartService, TestConfigurationService, TestEventService, TestContextService, TestStorageService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestFileService, TestEditorService, TestPartService, TestConfigurationService, TestEventService, TestContextService, TestStorageService} from 'vs/workbench/test/common/servicesTestUtils';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
 
 function toResource(path) {
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts
index f4c1b7c75b8..056adcec4c9 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts
@@ -29,7 +29,7 @@ import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/edito
 import PartService = require('vs/workbench/services/part/common/partService');
 import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
 import {ITextFileService, EventType} from 'vs/workbench/parts/files/common/files';
-import {TestFileService, TestPartService, TestEditorService, TestConfigurationService, TestUntitledEditorService, TestStorageService, TestContextService, TestMessageService, TestEventService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestFileService, TestPartService, TestEditorService, TestConfigurationService, TestUntitledEditorService, TestStorageService, TestContextService, TestMessageService, TestEventService} from 'vs/workbench/test/common/servicesTestUtils';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
 
 function toResource(path) {
diff --git a/src/vs/workbench/parts/files/test/browser/workingFilesModel.test.ts b/src/vs/workbench/parts/files/test/browser/workingFilesModel.test.ts
index e946926e65e..b9b11f931dd 100644
--- a/src/vs/workbench/parts/files/test/browser/workingFilesModel.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/workingFilesModel.test.ts
@@ -24,7 +24,7 @@ import {InstantiationService} from 'vs/platform/instantiation/common/instantiati
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {IPartService} from 'vs/workbench/services/part/common/partService';
 import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
-import {TestFileService, TestPartService, TestEditorService, TestConfigurationService, TestUntitledEditorService, TestStorageService, TestContextService, TestMessageService, TestEventService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestFileService, TestPartService, TestEditorService, TestConfigurationService, TestUntitledEditorService, TestStorageService, TestContextService, TestMessageService, TestEventService} from 'vs/workbench/test/common/servicesTestUtils';
 import {WorkingFileEntry, WorkingFilesModel} from 'vs/workbench/parts/files/common/workingFilesModel';
 import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
diff --git a/src/vs/workbench/parts/output/test/outputWorker.test.ts b/src/vs/workbench/parts/output/test/outputWorker.test.ts
index 75fa10d19fc..0dcf3d03fae 100644
--- a/src/vs/workbench/parts/output/test/outputWorker.test.ts
+++ b/src/vs/workbench/parts/output/test/outputWorker.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import {isMacintosh, isLinux} from 'vs/base/common/platform';
 import {OutputWorker} from 'vs/workbench/parts/output/common/outputWorker';
-import {TestContextService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestContextService} from 'vs/workbench/test/common/servicesTestUtils';
 
 function toOSPath(p: string): string {
 	if (isMacintosh || isLinux) {
diff --git a/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts b/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
index 16ff45d571a..c9f5a516a51 100644
--- a/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
+++ b/src/vs/workbench/parts/search/test/browser/searchViewlet.test.ts
@@ -14,7 +14,7 @@ import {IModelService} from 'vs/editor/common/services/modelService';
 import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
 import {InstantiationService} from 'vs/platform/instantiation/common/instantiationService';
 import {SearchSorter, SearchDataSource} from 'vs/workbench/parts/search/browser/searchViewlet';
-import {TestContextService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestContextService} from 'vs/workbench/test/common/servicesTestUtils';
 
 suite('Search - Viewlet', () => {
 	let instantiation: IInstantiationService;
diff --git a/src/vs/workbench/parts/search/test/common/searchModel.test.ts b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
index cc4cdaef912..fc105bea9ba 100644
--- a/src/vs/workbench/parts/search/test/common/searchModel.test.ts
+++ b/src/vs/workbench/parts/search/test/common/searchModel.test.ts
@@ -15,7 +15,7 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import {IModelService} from 'vs/editor/common/services/modelService';
 import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
 import {InstantiationService} from 'vs/platform/instantiation/common/instantiationService';
-import {TestContextService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestContextService} from 'vs/workbench/test/common/servicesTestUtils';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IFileMatch} from 'vs/platform/search/common/search';
 
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index b7aaac60e91..e10b646d9cd 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import {Build, Builder} from 'vs/base/browser/builder';
 import {Part} from 'vs/workbench/browser/part';
 import * as Types from 'vs/base/common/types';
-import * as TestUtils from 'vs/workbench/test/browser/servicesTestUtils';
+import * as TestUtils from 'vs/workbench/test/common/servicesTestUtils';
 import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import {IStorageService} from 'vs/platform/storage/common/storage';
diff --git a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts
index 4be09731db7..6571ac42d89 100644
--- a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts
+++ b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts
@@ -6,7 +6,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import {TestContextService, TestStorageService, TestEventService, TestEditorService, TestQuickOpenService} from 'vs/workbench/test/browser/servicesTestUtils';
+import 'vs/workbench/browser/parts/editor/editor.contribution'; // make sure to load all contributed editor things into tests
+import {TestContextService, TestStorageService, TestEventService, TestEditorService, TestQuickOpenService} from 'vs/workbench/test/common/servicesTestUtils';
 import {MockKeybindingService} from 'vs/platform/keybinding/test/common/mockKeybindingService';
 import {Registry} from 'vs/platform/platform';
 import {EditorHistoryModel, EditorHistoryEntry} from 'vs/workbench/browser/parts/quickopen/editorHistoryModel';
diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts
index 71674fed566..87c85000454 100644
--- a/src/vs/workbench/test/browser/services.test.ts
+++ b/src/vs/workbench/test/browser/services.test.ts
@@ -29,7 +29,7 @@ import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEdit
 import {TextFileEditorModel} from 'vs/workbench/parts/files/common/editors/textFileEditorModel';
 import {ITextFileService} from 'vs/workbench/parts/files/common/files';
 import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
-import {TestEventService, TestPartService, TestStorageService, TestConfigurationService, TestRequestService, TestContextService, TestWorkspace, TestEditorService, MockRequestService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestEventService, TestPartService, TestStorageService, TestConfigurationService, TestRequestService, TestContextService, TestWorkspace, TestEditorService, MockRequestService} from 'vs/workbench/test/common/servicesTestUtils';
 import {Viewlet} from 'vs/workbench/browser/viewlet';
 import {EventType} from 'vs/workbench/common/events';
 import {ITelemetryService, NullTelemetryService} from 'vs/platform/telemetry/common/telemetry';
diff --git a/src/vs/workbench/test/browser/parts/editor/editorInput.test.ts b/src/vs/workbench/test/common/editor/editorInput.test.ts
similarity index 100%
rename from src/vs/workbench/test/browser/parts/editor/editorInput.test.ts
rename to src/vs/workbench/test/common/editor/editorInput.test.ts
diff --git a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts b/src/vs/workbench/test/common/editor/editorModel.test.ts
similarity index 100%
rename from src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
rename to src/vs/workbench/test/common/editor/editorModel.test.ts
diff --git a/src/vs/workbench/test/browser/parts/editor/editorOptions.test.ts b/src/vs/workbench/test/common/editor/editorOptions.test.ts
similarity index 100%
rename from src/vs/workbench/test/browser/parts/editor/editorOptions.test.ts
rename to src/vs/workbench/test/common/editor/editorOptions.test.ts
diff --git a/src/vs/workbench/test/common/editorStacksModel.test.ts b/src/vs/workbench/test/common/editor/editorStacksModel.test.ts
similarity index 100%
rename from src/vs/workbench/test/common/editorStacksModel.test.ts
rename to src/vs/workbench/test/common/editor/editorStacksModel.test.ts
diff --git a/src/vs/workbench/test/browser/parts/editor/stringEditorInput.test.ts b/src/vs/workbench/test/common/editor/stringEditorInput.test.ts
similarity index 98%
rename from src/vs/workbench/test/browser/parts/editor/stringEditorInput.test.ts
rename to src/vs/workbench/test/common/editor/stringEditorInput.test.ts
index ce70952d7a0..93495c478e5 100644
--- a/src/vs/workbench/test/browser/parts/editor/stringEditorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/stringEditorInput.test.ts
@@ -10,7 +10,7 @@ import URI from 'vs/base/common/uri';
 import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
 import {ResourceEditorModel} from 'vs/workbench/common/editor/resourceEditorModel';
-import {TestEditorService} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestEditorService} from 'vs/workbench/test/common/servicesTestUtils';
 import {IModelService} from 'vs/editor/common/services/modelService';
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {ServiceCollection} from 'vs/platform/instantiation/common/serviceCollection';
diff --git a/src/vs/workbench/test/browser/parts/editor/stringEditorModel.test.ts b/src/vs/workbench/test/common/editor/stringEditorModel.test.ts
similarity index 100%
rename from src/vs/workbench/test/browser/parts/editor/stringEditorModel.test.ts
rename to src/vs/workbench/test/common/editor/stringEditorModel.test.ts
diff --git a/src/vs/workbench/test/browser/events.test.ts b/src/vs/workbench/test/common/events.test.ts
similarity index 100%
rename from src/vs/workbench/test/browser/events.test.ts
rename to src/vs/workbench/test/common/events.test.ts
diff --git a/src/vs/workbench/test/browser/memento.test.ts b/src/vs/workbench/test/common/memento.test.ts
similarity index 98%
rename from src/vs/workbench/test/browser/memento.test.ts
rename to src/vs/workbench/test/common/memento.test.ts
index 654e3d47a35..ee8a854d851 100644
--- a/src/vs/workbench/test/browser/memento.test.ts
+++ b/src/vs/workbench/test/common/memento.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
 import {StorageScope} from 'vs/platform/storage/common/storage';
-import * as TestUtils from 'vs/workbench/test/browser/servicesTestUtils';
+import * as TestUtils from 'vs/workbench/test/common/servicesTestUtils';
 import {Memento, Scope} from 'vs/workbench/common/memento';
 import {Storage, InMemoryLocalStorage} from 'vs/workbench/common/storage';
 
diff --git a/src/vs/workbench/test/browser/servicesTestUtils.ts b/src/vs/workbench/test/common/servicesTestUtils.ts
similarity index 98%
rename from src/vs/workbench/test/browser/servicesTestUtils.ts
rename to src/vs/workbench/test/common/servicesTestUtils.ts
index 8d1bfe4307d..1790f47e49c 100644
--- a/src/vs/workbench/test/browser/servicesTestUtils.ts
+++ b/src/vs/workbench/test/common/servicesTestUtils.ts
@@ -5,7 +5,6 @@
 
 'use strict';
 
-import 'vs/workbench/browser/parts/editor/editor.contribution'; // make sure to load all contributed editor things into tests
 import {Promise, TPromise} from 'vs/base/common/winjs.base';
 import EventEmitter = require('vs/base/common/eventEmitter');
 import Paths = require('vs/base/common/paths');
@@ -27,7 +26,6 @@ import {IEditorInput, IEditorModel, Position, IEditor, IResourceInput, ITextEdit
 import {IEventService} from 'vs/platform/event/common/event';
 import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
 import {IMessageService, IConfirmation} from 'vs/platform/message/common/message';
-import Lifecycle = require('vs/base/common/lifecycle');
 import {BaseRequestService} from 'vs/platform/request/common/baseRequestService';
 import {IWorkspace, IConfiguration} from 'vs/platform/workspace/common/workspace';
 
diff --git a/src/vs/workbench/test/browser/storage.test.ts b/src/vs/workbench/test/common/storage.test.ts
similarity index 99%
rename from src/vs/workbench/test/browser/storage.test.ts
rename to src/vs/workbench/test/common/storage.test.ts
index abed5b3bf09..1da50b04f8b 100644
--- a/src/vs/workbench/test/browser/storage.test.ts
+++ b/src/vs/workbench/test/common/storage.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import {clone} from 'vs/base/common/objects';
 import {StorageScope} from 'vs/platform/storage/common/storage';
-import {TestContextService, TestWorkspace} from 'vs/workbench/test/browser/servicesTestUtils';
+import {TestContextService, TestWorkspace} from 'vs/workbench/test/common/servicesTestUtils';
 import {Storage, InMemoryLocalStorage} from 'vs/workbench/common/storage';
 
 suite('Workbench Storage', () => {
-- 
GitLab