Make task execution event tests more specific

alexr00 · alexr00 · commit 388da4e6f6db · 2020-06-16T16:36:10.000+02:00
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@@ -138,35 +138,45 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 			commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
 		});
 
-		test('Execution from event is equal to original', () => {
+		test('Execution from onDidEndTaskProcess is equal to original', () => {
 			return new Promise(async (resolve, reject) => {
 				const task = new Task({ type: 'testTask' }, TaskScope.Workspace, 'echo', 'testTask', new ShellExecution('echo', ['hello test']));
 				const taskExecution = await tasks.executeTask(task);
-				let equalCount = 2;
-				function checkEqualCount() {
-					equalCount--;
-					if (equalCount === 0) {
-						resolve();
-					} else if (equalCount < 0) {
-						reject('Unexpected extra task events.');
+
+				disposables.push(tasks.onDidStartTaskProcess(e => {
+					if (e.execution !== taskExecution) {
+						reject('Unexpected task execution value in start process.');
 					}
-				}
+				}));
 
-				tasks.onDidStartTaskProcess(e => {
+				disposables.push(tasks.onDidEndTaskProcess(e => {
 					if (e.execution === taskExecution) {
-						checkEqualCount();
+						resolve();
 					} else {
-						reject('Unexpected task execution value in start process.');
+						reject('Unexpected task execution value in end process.');
 					}
-				});
+				}));
+			});
+		});
 
-				tasks.onDidEndTaskProcess(e => {
+		test('Execution from onDidStartTaskProcess is equal to original', () => {
+			return new Promise(async (resolve, reject) => {
+				const task = new Task({ type: 'testTask' }, TaskScope.Workspace, 'echo', 'testTask', new ShellExecution('echo', ['hello test']));
+				const taskExecution = await tasks.executeTask(task);
+
+				disposables.push(tasks.onDidStartTaskProcess(e => {
 					if (e.execution === taskExecution) {
-						checkEqualCount();
+						resolve();
 					} else {
+						reject('Unexpected task execution value in start process.');
+					}
+				}));
+
+				disposables.push(tasks.onDidEndTaskProcess(e => {
+					if (e.execution !== taskExecution) {
 						reject('Unexpected task execution value in end process.');
 					}
-				});
+				}));
 			});
 		});
 	});
