Fix CRUD tests and Windows rename log file

This patch fixes the CRUD tests and the renaming of log files for Windows - Does not fail if the renaming goes wrong

Change-Id: Ib4f8bd342cd90f3cae9ef6e54bc71b168be0099f

Author: Guilherme Saraiva

gui/extension/tests/e2e/lib/cmdExecutor.ts

@@ -31,7 +31,7 @@ import * as constants from "./constants";
 import * as locator from "./locators";
 import * as interfaces from "./interfaces";
 import { Misc, driver } from "./misc";
-import * as Until from "./until";
+import * as waitUntil from "./until";
 
 /**
  * This class aggregates the functions that will execute commands on notebooks or shell sessions, as well as its results
@@ -297,8 +297,8 @@ export class CommandExecutor {
         if (await Database.existsToolbarButton(constants.execCaret)) {
             const toolbarButton = await Database.getToolbarButton(constants.execCaret);
             await toolbarButton.click();
-            await driver.wait(Until.toolbarButtonIsDisabled(constants.execCaret), constants.wait5seconds);
-            await driver.wait(Until.toolbarButtonIsEnabled(constants.execCaret), constants.wait5seconds);
+            await driver.wait(waitUntil.toolbarButtonIsDisabled(constants.execCaret), constants.wait5seconds);
+            await driver.wait(waitUntil.toolbarButtonIsEnabled(constants.execCaret), constants.wait5seconds);
         } else {
             await (await Database.getToolbarButton(constants.execFullBlockJs)).click();
         }
@@ -681,17 +681,17 @@ export class CommandExecutor {
                         if (tableRows) {
                             await driver.wait(until.stalenessOf(tableRows as WebElement), constants.wait2seconds,
                                 "Result table was not updated");
-                            await driver.wait(Until.elementLocated(result,
+                            await driver.wait(waitUntil.elementLocated(result,
                                 locator.notebook.codeEditor.editor.result.tableHeaders),
                                 constants.wait2seconds, "Result Table headers were not loaded");
-                            await driver.wait(Until.elementLocated(result,
+                            await driver.wait(waitUntil.elementLocated(result,
                                 locator.notebook.codeEditor.editor.result.tableCell),
                                 constants.wait2seconds, "Table cells were not loaded").catch(async () => {
                                     const result = fromScript ? await this
                                         .getResultScript() : await this.getResult(cmd, searchOnExistingId);
                                     await result.findElement(locator.notebook.codeEditor.editor.result.tableColumnTitle)
                                         .click();
-                                    await driver.wait(Until
+                                    await driver.wait(waitUntil
                                         .elementLocated(result, locator.notebook.codeEditor.editor.result.tableCell),
                                         constants.wait2seconds,
                                         `Table cell was not set after click on column title (bug)`);
@@ -710,16 +710,16 @@ export class CommandExecutor {
                         }
                     }
                 } else if (isTableResult) {
-                    await driver.wait(Until.elementLocated(result,
+                    await driver.wait(waitUntil.elementLocated(result,
                         locator.notebook.codeEditor.editor.result.tableHeaders),
                         constants.wait2seconds, "Table headers were not loaded");
-                    await driver.wait(Until.elementLocated(result,
+                    await driver.wait(waitUntil.elementLocated(result,
                         locator.notebook.codeEditor.editor.result.tableCell),
                         constants.wait2seconds, "Table cells were not loaded").catch(async () => {
                             const result = await this.getResult(cmd, searchOnExistingId);
                             await result.findElement(locator.notebook.codeEditor.editor.result.tableColumnTitle)
                                 .click();
-                            await driver.wait(Until
+                            await driver.wait(waitUntil
                                 .elementLocated(result, locator.notebook.codeEditor.editor.result.tableCell),
                                 constants.wait2seconds, `Table cell was not set after click on column title (bug)`);
                         });

gui/extension/tests/e2e/lib/constants.ts

@@ -60,6 +60,7 @@ export const bastionPassword = "MySQLR0cks!";
 // TIMEOUTS
 export const wait150MiliSeconds = 150;
 export const wait2seconds = 2000;
+export const wait3seconds = 3000;
 export const wait5seconds = 5000;
 export const wait10seconds = 10000;
 export const wait15seconds = 15000; //queryWaits

gui/extension/tests/e2e/lib/db.ts

@@ -30,7 +30,7 @@ import {
 } from "vscode-extension-tester";
 import { basename } from "path";
 import { driver, Misc } from "./misc";
-import * as Until from "./until";
+import * as waitUntil from "./until";
 import * as constants from "./constants";
 import * as interfaces from "./interfaces";
 import * as locator from "./locators";
@@ -217,7 +217,7 @@ export class Database {
         await Misc.switchBackToTopFrame();
         await Misc.clickSectionToolbarButton(await Misc.getSection(constants.dbTreeSection),
             constants.createDBConnection);
-        await driver.wait(Until.tabIsOpened(constants.dbDefaultEditor), constants.wait5seconds);
+        await driver.wait(waitUntil.tabIsOpened(constants.dbDefaultEditor), constants.wait5seconds);
         await Misc.switchToFrame();
         await driver.wait(until.elementLocated(locator.dbConnectionDialog.exists), constants.wait10seconds);
 
@@ -1583,7 +1583,7 @@ export class Database {
     public static setDBConnectionCredentials = async (data: interfaces.IDBConnection,
         timeout?: number): Promise<void> => {
         await Database.setPassword(data);
-        if (Until.credentialHelperOk) {
+        if (waitUntil.credentialHelperOk) {
             await Misc.setConfirmDialog("no", timeout);
         }
     };

gui/extension/tests/e2e/lib/interfaces.ts

@@ -222,5 +222,5 @@ export interface ICommandTabResult {
 
 export interface ICommandResultIdHolder {
     id?: string;
-    suite?: string
+    suite?: string;
 }

gui/extension/tests/e2e/lib/misc.ts

@@ -30,12 +30,12 @@ import { join } from "path";
 import {
     BottomBarPanel, Condition, CustomTreeSection, EditorView, error, InputBox, ITimeouts,
     Key, OutputView, SideBarView, TreeItem, until, VSBrowser,
-    WebDriver, ModalDialog,
+    WebDriver, ModalDialog, NotificationType,
     WebElement, Workbench, Button, Notification,
 } from "vscode-extension-tester";
 import * as constants from "./constants";
 import { keyboard, Key as nutKey } from "@nut-tree/nut-js";
-import * as Until from "./until";
+import * as waitUntil from "./until";
 import * as locator from "./locators";
 import * as interfaces from "./interfaces";
 export let driver: WebDriver;
@@ -299,7 +299,7 @@ export class Misc {
         };
 
         const treeDBSection = await Misc.getSection(constants.dbTreeSection);
-        await driver.wait(Until.isNotLoading(constants.dbTreeSection), constants.wait5seconds);
+        await driver.wait(waitUntil.isNotLoading(constants.dbTreeSection), constants.wait5seconds);
         await treeDBSection.click();
         const moreActions = await treeDBSection.findElement(locator.section.moreActions);
         await moreActions.click();
@@ -437,12 +437,17 @@ export class Misc {
 
     public static prepareExtensionLogsForExport = async (testSuite: string): Promise<void> => {
         const logPathFolder = await Misc.getExtentionOutputLogsFolder();
-        // rename the file
-        await fs.rename(join(logPathFolder, constants.feLogFile),
-            join(logPathFolder, `${testSuite}_output_tab.log`));
-        // copy to workspace
-        await fs.copyFile(join(logPathFolder, `${testSuite}_output_tab.log`),
-            join(constants.workspace, `${testSuite}_output_tab.log`));
+        try {
+            // rename the file
+            await fs.rename(join(logPathFolder, constants.feLogFile),
+                join(logPathFolder, `${testSuite}_output_tab.log`));
+            // copy to workspace
+            await fs.copyFile(join(logPathFolder, `${testSuite}_output_tab.log`),
+                join(constants.workspace, `${testSuite}_output_tab.log`));
+        } catch (e) {
+            // continue
+        }
+
     };
 
     public static killRouterFromTerminal = (): void => {
@@ -607,13 +612,22 @@ export class Misc {
         }, constants.wait5seconds, "Could not switch back to top frame");
     };
 
-    public static getNotification = async (text: string, dismiss = true): Promise<Notification> => {
+    public static getNotification = async (text: string, dismiss = true,
+        expectFailure = false): Promise<Notification> => {
         let notif: Notification;
+
+        await driver.wait(waitUntil.notificationsExist(), constants.wait5seconds);
+
         await driver.wait(async () => {
             try {
                 const ntfs = await new Workbench().getNotifications();
                 if (ntfs.length > 0) {
                     for (const ntf of ntfs) {
+                        if (expectFailure === false) {
+                            if (await ntf.getType() === NotificationType.Error) {
+                                throw new Error("An error has occurred");
+                            }
+                        }
                         if ((await ntf.getMessage()).includes(text)) {
                             notif = ntf;
                             if (dismiss) {
@@ -629,7 +643,7 @@ export class Misc {
                     throw e;
                 }
             }
-        }, constants.wait10seconds, `Could not find '${text}' notification`);
+        }, constants.wait2seconds, `Could not find '${text}' notification`);
 
         return notif;
     };
@@ -705,6 +719,17 @@ export class Misc {
         }, timeout, `Could not find text '${textToSearch[0]}' on the terminal`);
     };
 
+    public static getRouterPort = async (): Promise<string> => {
+        const routerConfigFilePath = Misc.getRouterConfigFile();
+        const fileContent = (await fs.readFile(routerConfigFilePath)).toString();
+        const lines = fileContent.split("\n");
+        for (let i = 0; i <= lines.length - 1; i++) {
+            if (lines[i] === "[http_server]") {
+                return lines[i + 1].match(/port=(\d+)/)[1];
+            }
+        }
+    };
+
     public static terminalHasErrors = async (): Promise<boolean> => {
         const out = await Misc.getTerminalOutput();
 
@@ -764,7 +789,7 @@ export class Misc {
             await inputBox.confirm();
         }
 
-        if (Until.credentialHelperOk) {
+        if (waitUntil.credentialHelperOk) {
             await driver.wait(async () => {
                 inputBox = await InputBox.create();
                 if ((await inputBox.isPassword()) === false) {
@@ -1070,15 +1095,15 @@ export class Misc {
         }
 
         const sectionTree = await Misc.getSection(section);
-        await driver.wait(Until.isNotLoading(section), constants.wait20seconds);
+        await driver.wait(waitUntil.isNotLoading(section), constants.wait20seconds);
         let reload = false;
 
         await driver.wait(async () => {
             try {
                 if (reload) {
                     if (section === constants.dbTreeSection || section === constants.ociTreeSection) {
                         await Misc.clickSectionToolbarButton(sectionTree, reloadLabel);
-                        await driver.wait(Until.isNotLoading(section), constants.wait20seconds);
+                        await driver.wait(waitUntil.isNotLoading(section), constants.wait20seconds);
                     }
                 }
                 if (itemName instanceof RegExp) {
@@ -1126,15 +1151,15 @@ export class Misc {
     public static existsTreeElement = async (section: string, itemName: string | RegExp): Promise<boolean> => {
         let reloadLabel: string;
         const sectionTree = await Misc.getSection(section);
-        await driver.wait(Until.isNotLoading(section), constants.wait10seconds);
+        await driver.wait(waitUntil.isNotLoading(section), constants.wait10seconds);
         if (section === constants.dbTreeSection || section === constants.ociTreeSection) {
             if (section === constants.dbTreeSection) {
                 reloadLabel = "Reload the connection list";
             } else if (section === constants.ociTreeSection) {
                 reloadLabel = "Reload the OCI Profile list";
             }
             await Misc.clickSectionToolbarButton(sectionTree, reloadLabel);
-            await driver.wait(Until.isNotLoading(section), constants.wait20seconds);
+            await driver.wait(waitUntil.isNotLoading(section), constants.wait20seconds);
         }
 
         if (itemName instanceof RegExp) {
@@ -1425,7 +1450,7 @@ export class Misc {
             const treeItem = await Misc.getTreeElement(section, item);
             if (!(await treeItem.isExpanded())) {
                 await treeItem.expand();
-                await driver.wait(Until.isNotLoading(section), loadingTimeout);
+                await driver.wait(waitUntil.isNotLoading(section), loadingTimeout);
             }
         }
     };

gui/extension/tests/e2e/lib/until.ts

@@ -27,6 +27,7 @@ import {
     logging,
     WebElement,
     Locator,
+    Workbench,
 } from "vscode-extension-tester";
 import { execSync } from "child_process";
 import { join } from "path";
@@ -38,6 +39,7 @@ import * as interfaces from "./interfaces";
 import { Database } from "./db";
 export let credentialHelperOk = true;
 
+
 export const isNotLoading = (section: string): Condition<boolean> => {
     return new Condition(`for ${section} to NOT be loading`, async () => {
         const sec = await Misc.getSection(section);
@@ -211,6 +213,33 @@ export const editorHasNewPrompt = (): Condition<boolean> => {
     });
 };
 
+export const notificationsExist = (): Condition<boolean> => {
+    return new Condition(`for notifications to be displayed`, async () => {
+        return (await new Workbench().getNotifications()).length > 0;
+    });
+};
+
+export const fetchIsSuccessful = (url: string, data?: RequestInit): Condition<boolean> => {
+    return new Condition(`for router ${url} to return success`, async () => {
+        let response: Response;
+
+        return driver.wait(async () => {
+            try {
+                response = await fetch(url, data);
+
+                await response.json();
+
+                return true;
+            } catch (e) {
+                // continue
+                console.log("-------");
+                console.log(e);
+                console.log("-------");
+            }
+        }, constants.wait5seconds, `Could not get URL for ${url}`);
+    });
+};
+
 export const routerIsRunning = (): Condition<boolean> => {
     return new Condition("for Router to be running", () => {
         if (Misc.isWindows()) {