move tests to /node/ or make them not use node globals

jrieken · jrieken · commit 5e5f9fb3e63d · 2020-02-05T09:44:49.000+01:00
diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts
@@ -26,25 +26,22 @@ export class DeferredPromise<T> {
 
 	public complete(value: T) {
 		return new Promise(resolve => {
-			process.nextTick(() => {
-				this.completeCallback(value);
-				resolve();
-			});
+			this.completeCallback(value);
+			resolve();
 		});
 	}
 
 	public error(err: any) {
 		return new Promise(resolve => {
-			process.nextTick(() => {
-				this.errorCallback(err);
-				resolve();
-			});
+			this.errorCallback(err);
+			resolve();
 		});
 	}
 
 	public cancel() {
-		process.nextTick(() => {
+		new Promise(resolve => {
 			this.errorCallback(canceled());
+			resolve();
 		});
 	}
 }
diff --git a/src/vs/base/test/node/path.test.ts b/src/vs/base/test/node/path.test.ts
diff --git a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -15,6 +15,7 @@ import { workbenchInstantiationService } from 'vs/workbench/test/browser/workben
 import { createMockSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
 import { isStatusbarInDebugMode } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
 import { State } from 'vs/workbench/contrib/debug/common/debug';
+import { isWindows } from 'vs/base/common/platform';
 const $ = dom.$;
 
 suite('Debug - Base Debug View', () => {
@@ -76,7 +77,7 @@ suite('Debug - Base Debug View', () => {
 		renderExpressionValue(expression, container, { colorize: true, maxValueLength: 4, linkDetector });
 		assert.equal(container.textContent, 'this...');
 
-		expression.value = process.platform === 'win32' ? 'C:\\foo.js:5' : '/foo.js:5';
+		expression.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
 		container = $('.container');
 		renderExpressionValue(expression, container, { colorize: true, linkDetector });
 		assert.ok(container.querySelector('a'));
@@ -109,7 +110,7 @@ suite('Debug - Base Debug View', () => {
 		assert.equal(label.element.textContent, 'foo:');
 		assert.equal(label.element.title, 'string');
 
-		variable.value = process.platform === 'win32' ? 'C:\\foo.js:5' : '/foo.js:5';
+		variable.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
 		expression = $('.');
 		name = $('.');
 		value = $('.');
diff --git a/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts b/src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts
@@ -24,7 +24,7 @@ suite('RPCProtocol', () => {
 		}
 
 		public send(buffer: VSBuffer): void {
-			process.nextTick(() => {
+			Promise.resolve().then(() => {
 				this._pair!._onMessage.fire(buffer);
 			});
 		}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ suite('RPCProtocol', () => {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public send(buffer: VSBuffer): void {`
`27`		`- process.nextTick(() => {`
	`27`	`+ Promise.resolve().then(() => {`
`28`	`28`	`this._pair!._onMessage.fire(buffer);`
`29`	`29`	`});`
`30`	`30`	`}`