Improve client test execution

client-tests/package.json

@@ -18,7 +18,7 @@
 		"clean": "node ../node_modules/rimraf/bin.js lib",
 		"compile": "node ../build/bin/tsc -b ./tsconfig.json",
 		"watch": "node ../build/bin/tsc -b ./tsconfig.json -w",
-		"test": "node ../build/bin/symlink-tests && node lib/runTests.js"
+		"test": "node lib/runTests.js"
 	},
 	"dependencies": {
 		"vscode-languageclient": "5.3.0-next.7",

client-tests/src/converter.test.ts

@@ -7,10 +7,10 @@
 import { strictEqual, deepEqual, ok } from 'assert';
 
 import * as proto from 'vscode-languageserver-protocol';
-import * as codeConverter from 'vscode-languageclient/lib/codeConverter';
-import * as protocolConverter from 'vscode-languageclient/lib/protocolConverter';
-import ProtocolCompletionItem from 'vscode-languageclient/lib/protocolCompletionItem';
-import * as Is from 'vscode-languageclient/lib/utils/is';
+import * as codeConverter from '../../client/lib/codeConverter';
+import * as protocolConverter from '../../client/lib/protocolConverter';
+import ProtocolCompletionItem from '../../client/lib/protocolCompletionItem';
+import * as Is from '../../client/lib/utils/is';
 
 import * as vscode from 'vscode';
 import { CompletionItemTag } from 'vscode-languageserver-protocol';

client-tests/src/helpers.test.ts

@@ -9,7 +9,7 @@ import { strictEqual, ok } from 'assert';
 import {
 	Position, Range, TextDocumentIdentifier, TextDocumentItem, VersionedTextDocumentIdentifier, Command, CodeLens, CodeActionContext,
 	Diagnostic, DiagnosticSeverity, WorkspaceChange, TextDocumentEdit, CreateFile, RenameFile, DeleteFile
-} from 'vscode-languageserver-protocol';
+} from '../../protocol/lib/main';
 
 suite('Protocol Helper Tests', () => {
 	function rangeEqual(actual: Range, expected: Range) {

client-tests/src/integration.test.ts

@@ -5,8 +5,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import * as lsclient from 'vscode-languageclient/lib/main';
 import * as path from 'path';
+import * as lsclient from '../../client/lib/main';
 
 suite('Client integration', () => {
 

client-tests/src/servers/testInitializeResult.ts

@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import {
 	createConnection, IConnection, InitializeParams, ServerCapabilities, CompletionItemKind, ResourceOperationKind, FailureHandlingKind,
 	DiagnosticTag, CompletionItemTag, TextDocumentSyncKind
-} from 'vscode-languageserver/lib/main';
+} from '../../../server/lib/main';
 
 let connection: IConnection = createConnection();
 

client-tests/src/workspaceFolders.test.ts

@@ -3,9 +3,10 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
 import * as sinon from 'sinon';
-import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/workspaceFolders';
-import { BaseLanguageClient, MessageTransports, DidChangeWorkspaceFoldersParams } from 'vscode-languageclient';
-import * as proto from 'vscode-languageserver-protocol';
+
+import { WorkspaceFoldersFeature } from '../../client/lib/workspaceFolders';
+import { BaseLanguageClient, MessageTransports, DidChangeWorkspaceFoldersParams } from '../../client/lib/main';
+import * as proto from '../../protocol/lib/main';
 
 class TestLanguageClient extends BaseLanguageClient {
 	protected createMessageTransports(): Promise<MessageTransports> {