FUSETOOLS2-1014 - adding small delay (#441)

* FUSETOOLS2-1014 - updates to use waitUntil

* refactor validateTerminalResponse

Signed-off-by: Brian Fitzpatrick <[email protected]>

Author: bfitzpat

src/test/suite/stubDemoTutorial.test.ts

@@ -21,10 +21,11 @@ import { START_DIDACT_COMMAND, sendTerminalText, gatherAllCommandsLinks, getCont
 import { didactManager } from '../../didactManager';
 import { DidactUri } from '../../didactUri';
 import { handleText } from '../../commandHandler';
+import { waitUntil } from 'async-wait-until';
 
 const testMD = Uri.parse('vscode://redhat.vscode-didact?extension=demos/markdown/didact-demo.didact.md');
 
-const delayTime = 1000;
+const delayTime = 1500;
 
 suite('stub out a tutorial', () => {
 
@@ -58,7 +59,7 @@ suite('stub out a tutorial', () => {
 								expect(outputs).length.to.be.at.least(2);
 								const terminalName = outputs[0];
 								const terminalString = outputs[1];
-								await validateSimpleTerminalResponse(terminalName, terminalString);
+								await validateTerminalResponse(terminalName, terminalString);
 							}
 						});
 					});
@@ -69,38 +70,23 @@ suite('stub out a tutorial', () => {
 
 });
 
-async function validateSimpleTerminalResponse(terminalName : string, terminalText : string) {
-	console.log(`validateSimpleTerminalResponse terminal ${terminalName} executing text ${terminalText}`);
+async function validateTerminalResponse(terminalName : string, terminalText : string, terminalResponse? : string) {
+	console.log(`validateTerminalResponse terminal ${terminalName} executing text ${terminalText}`);
 	const term = window.createTerminal(terminalName);
 	expect(term).to.not.be.null;
 	if (term) {
 		console.log(`-current terminal = ${term?.name}`);
 		await sendTerminalText(terminalName, terminalText);
-		await delay(delayTime);
-		const term2 = focusOnNamedTerminal(terminalName);
-		await delay(delayTime);
-		let result = await getTerminalOutput(terminalName);
-		console.log(`-validateSimpleTerminalResponse terminal output = ${result}`);
-
-		// we're just making sure we get something back and can see the text we put into the terminal
-		expect(result).to.include(terminalText);
-		findAndDisposeTerminal(terminalName);
-	}
-}
-
-async function validateTerminalResponse(terminalName : string, terminalText : string, terminalResponse : string) {
-	console.log(`validateTerminalResponse terminal ${terminalName} executing text ${terminalText} and looking for response ${terminalResponse}`);
-	const term = window.createTerminal(terminalName);
-	expect(term).to.not.be.null;
-	if (term) {
-		console.log(`-current terminal = ${term?.name}`);
-		await sendTerminalText(terminalName, terminalText);
-		await delay(delayTime);
-		const term2 = focusOnNamedTerminal(terminalName);
-		await delay(delayTime);
-		let result = await getTerminalOutput(terminalName);
-		console.log(`-validateTerminalResponse terminal output = ${result}`);
-		expect(result).to.include(terminalResponse);
+			const resultValue = await waitUntil(async () => {
+			focusOnNamedTerminal(terminalName);
+			const result = await getTerminalOutput(terminalName);
+			console.log(`-validateTerminalResponse terminal output = ${result}`);
+			if (terminalResponse) {
+				return result.includes(terminalResponse);
+			} else {
+				return result.includes(terminalText);
+			}
+		}, 5000);
 		findAndDisposeTerminal(terminalName);
 	}
 }