FUSETOOLS2-1010 - fixing more code smells (#448)

* FUSETOOLS2-1010 - fixing more code smells

* a few adjustments
* adding windows specific delay

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

Author: bfitzpat

src/extensionFunctions.ts

@@ -469,19 +469,19 @@ export async function getWebviewContent() : Promise<string|void> {
 }
 
 async function loadFileWithRetry ( uri:vscode.Uri ) : Promise<string | void | undefined> {
-	return await getDataFromFile(uri).catch( async () => {
+	return getDataFromFile(uri).catch( async () => {
 		await delay(3000);
-		return await getDataFromFile(uri).catch( async (error) => {
+		return getDataFromFile(uri).catch( async (error) => {
 			showFileUnavailable(error);
 		});
 	});
 }
 
 async function loadFileFromHTTPWithRetry ( uri:vscode.Uri ) : Promise<string | void | undefined> {
 	const urlToFetch = uri.toString();
-	return await getDataFromUrl(urlToFetch).catch( async () => {
+	return getDataFromUrl(urlToFetch).catch( async () => {
 		await delay(3000);
-		return await getDataFromUrl(urlToFetch).catch( async (error) => {
+		return getDataFromUrl(urlToFetch).catch( async (error) => {
 			showFileUnavailable(error);
 		});
 	});

src/test/suite/stubDemoTutorial.test.ts

@@ -16,8 +16,8 @@
  */
 
 import { expect } from 'chai';
-import { window, commands, env, Uri, Terminal, Pseudoterminal, Event, TerminalDimensions, EventEmitter } from 'vscode';
-import { START_DIDACT_COMMAND, sendTerminalText, gatherAllCommandsLinks, getContext, findTerminal } from '../../extensionFunctions';
+import { window, commands, env, Uri, Terminal } from 'vscode';
+import { START_DIDACT_COMMAND, sendTerminalText, gatherAllCommandsLinks, getContext } from '../../extensionFunctions';
 import { didactManager } from '../../didactManager';
 import { DidactUri } from '../../didactUri';
 import { handleText } from '../../commandHandler';
@@ -27,6 +27,8 @@ const testMD = Uri.parse('vscode://redhat.vscode-didact?extension=demos/markdown
 
 const delayTime = 1500;
 
+const WINDOWS: string = 'win32';
+
 suite('stub out a tutorial', () => {
 
 	test('that we can send an echo command to the terminal and get the response', async () => {
@@ -41,9 +43,9 @@ suite('stub out a tutorial', () => {
 			if (didactManager.active()) {
 
 				suite('walk through all the sendNamedTerminalAString commands in the demo', () => {
-					const commands : any[] = gatherAllCommandsLinks().filter( (href) => href.match(/=vscode.didact.sendNamedTerminalAString&/g));
-					expect(commands).to.not.be.empty;
-					commands.forEach(function(href: string) {
+					const commandsToTest : any[] = gatherAllCommandsLinks().filter( (href) => href.match(/=vscode.didact.sendNamedTerminalAString&/g));
+					expect(commandsToTest).to.not.be.empty;
+					commandsToTest.forEach(function(href: string) {
 						test(`test terminal command "${href}"`, async () => {
 							const ctxt = getContext();
 							if (ctxt) {
@@ -77,16 +79,19 @@ async function validateTerminalResponse(terminalName : string, terminalText : st
 	if (term) {
 		console.log(`-current terminal = ${term?.name}`);
 		await sendTerminalText(terminalName, terminalText);
-			const resultValue = await waitUntil(async () => {
+		await waitUntil(async () => {
 			focusOnNamedTerminal(terminalName);
+			if (process.platform === WINDOWS) {
+				await delay(1000);
+			}
 			const result = await getTerminalOutput(terminalName);
 			console.log(`-validateTerminalResponse terminal output = ${result}`);
 			if (terminalResponse) {
 				return result.includes(terminalResponse);
 			} else {
 				return result.includes(terminalText);
 			}
-		}, 5000);
+		}, 10000);
 		findAndDisposeTerminal(terminalName);
 	}
 }
@@ -103,7 +108,7 @@ async function getTerminalOutput(terminalName : string) : Promise<string> {
 	await executeAndWait('workbench.action.terminal.copySelection');
 	await executeAndWait('workbench.action.terminal.clearSelection');	
 	const clipboard_content = await env.clipboard.readText();
-	return clipboard_content.trim();;
+	return clipboard_content.trim();
 }
 
 function delay(ms: number) {