Refactor the execCmd function on E2e tests

Refactor the execCmd function on E2e tests

Refactor the execCmd function on E2e tests

Refactor the execCmd function on E2e tests

- Use an interface to return the command results, like queries, shell commands, etc
- This is composed by a new class, with several functions to deal with the multiple types of the command responses.
- Implemented a new way to expect for new commands results

Change-Id: I828223db2f3ed631f3a3a07c296dbb99a1cb7d3c

Author: Guilherme Saraiva

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

@@ -39,6 +39,8 @@ export const openEditorsTreeSection = "OPEN EDITORS";
 export const tasksTreeSection = "MYSQL SHELL TASKS";
 
 // TIMEOUTS
+export const wait150MiliSeconds = 150;
+export const wait2seconds = 2000;
 export const wait5seconds = 5000;
 export const wait10seconds = 10000;
 export const wait15seconds = 15000; //queryWaits
@@ -93,6 +95,8 @@ export const collapseAll = "Collapse All";
 export const mysqlRestService = "MySQL REST Service";
 
 // CONTEXT MENUS ITEMS
+export const executeBlock = "Execute Block";
+export const executeBlockAndAdvance = "Execute Block and Advance";
 export const restartInternalShell = "Restart the Internal MySQL Shell Process";
 export const connectToExternalShell = "Connect to External MySQL Shell Process";
 export const relaunchWelcomeWizard = "Relaunch Welcome Wizard";

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

@@ -35,6 +35,7 @@ import * as constants from "./constants";
 import * as interfaces from "./interfaces";
 import * as locator from "./locators";
 import { keyboard, Key as nutKey } from "@nut-tree/nut-js";
+import { CommandExecutor } from "./cmdExecutor";
 
 export class Database {
 
@@ -217,8 +218,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,
-            `${constants.dbDefaultEditor} tab was not opened`);
+        await driver.wait(Until.tabIsOpened(constants.dbDefaultEditor), constants.wait5seconds);
         await Misc.switchToFrame();
         await driver.wait(until.elementLocated(locator.dbConnectionDialog.exists), constants.wait10seconds);
 
@@ -273,6 +273,19 @@ export class Database {
         await dialog.findElement(locator.passwordDialog.ok).click();
     };
 
+    public static existsToolbarButton = async (button: string): Promise<boolean> => {
+        const toolbar = await driver.wait(until.elementLocated(locator.notebook.toolbar.exists),
+            constants.wait5seconds, "Toolbar was not found");
+        const buttons = await toolbar.findElements(locator.notebook.toolbar.button.exists);
+        for (const btn of buttons) {
+            if ((await btn.getAttribute("data-tooltip")) === button) {
+                return true;
+            }
+        }
+
+        return false;
+    };
+
     public static getToolbarButton = async (button: string): Promise<WebElement | undefined> => {
         const toolbar = await driver.wait(until.elementLocated(locator.notebook.toolbar.exists),
             constants.wait5seconds, "Toolbar was not found");
@@ -311,6 +324,32 @@ export class Database {
         }, constants.wait5seconds, "Could not set a new line on the editor");
     };
 
+    public static getMouseCursorLine = async (): Promise<number> => {
+        const lines = await driver.findElements(locator.notebook.codeEditor.editor.lines);
+        for (let i = 0; i <= lines.length - 1; i++) {
+            const curLine = await lines[i].findElements(locator.notebook.codeEditor.editor.currentLine);
+            if (curLine.length > 0) {
+                return i;
+            }
+        }
+    };
+
+    public static getLineFromWord = async (wordRef: string): Promise<number> => {
+        const regex = wordRef
+            .replace(/\*/g, "\\*")
+            .replace(/\./g, ".*")
+            .replace(/;/g, ".*")
+            .replace(/\s/g, ".*");
+        const lines = await driver.findElements(locator.notebook.codeEditor.editor.promptLine);
+        for (let i = 0; i <= lines.length - 1; i++) {
+            const lineContent = await lines[i].getAttribute("innerHTML");
+            if (lineContent.match(regex)) {
+                return i;
+            }
+        }
+        throw new Error(`Could not find '${wordRef}'`);
+    };
+
     public static isStatementStart = async (statement: string): Promise<boolean | undefined> => {
 
         const getLineSentence = async (ctx: WebElement): Promise<string> => {
@@ -1438,7 +1477,7 @@ export class Database {
 
         const textArea = await driver?.findElement(locator.notebook.codeEditor.textArea);
         await textArea.sendKeys(cmd);
-        await Misc.execOnEditor();
+        await CommandExecutor.exec();
         timeout = timeout ?? 5000;
 
         return Database.getScriptResult(timeout);

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

@@ -21,6 +21,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+import { WebElement } from "selenium-webdriver";
+
 export interface IConnBasicMySQL {
     hostname?: string;
     protocol?: string;
@@ -206,3 +208,15 @@ export interface ITreeDBConnection {
     name: string;
     isMySQL: boolean;
 }
+
+export interface ICommandResult {
+    id: string;
+    message: string;
+    content: WebElement | ICommandTabResult[];
+    toolbar: WebElement;
+}
+
+export interface ICommandTabResult {
+    tabName: string;
+    content: string;
+}

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

@@ -85,6 +85,8 @@ export const notebook = {
         editor: {
             exists: By.className("monaco-editor-background"),
             host: By.id("editorPaneHost"),
+            lines: By.css(".view-overlays > div"),
+            promptLine: By.css(".view-lines.monaco-mouse-cursor-text > div"),
             sentence: By.css(".view-lines.monaco-mouse-cursor-text > div > span"),
             wordInSentence: By.css(".view-lines.monaco-mouse-cursor-text > div > span span"),
             line: By.css("#contentHost .editorHost .view-line"),
@@ -94,20 +96,17 @@ export const notebook = {
             autoCompleteListItem: By.css(".monaco-list .monaco-highlighted-label span"),
             result: {
                 exists: By.className("zoneHost"),
-                hasContent: By.className("renderTarget"),
+                hasContent: By.className("content"),
                 existsById: (view: string): By => {
                     return By.xpath(`//div[@class='zoneHost' and @monaco-view-zone='${view}']`);
                 },
                 host: By.className("resultHost"),
-                tabSection: {
-                    exists: By.className("resultTabview"),
-                    body: By.className("tabArea"),
-                    tab: By.css(".tabArea div"),
-                    tabname: By.css(".tabArea label"),
-                },
-                headers: By.className("tabulator-headers"),
+
+                table: By.className("tabulator"),
+                tableRows: By.css(".tabulator-selectable.tabulator-row-odd"),
+                tableHeaders: By.className("tabulator-headers"),
                 tableColumnTitle: By.className("tabulator-col-title"),
-                tableCell: By.css(".zoneHost .tabulator-cell"),
+                tableCell: By.className("tabulator-cell"),
                 status: {
                     exists: By.className("resultStatus"),
                     text: By.css(".resultStatus > label"),
@@ -116,15 +115,21 @@ export const notebook = {
                     normalize: By.id("normalizeResultStateButton"),
                     toolbar: By.css(".resultStatus .toolbar"),
                 },
-                text: By.className("resultText"),
+                tabSection: {
+                    exists: By.className("tabAreaContainer"),
+                    body: By.className("tabArea"),
+                    tab: By.css(".tabArea .tabItem > label"),
+                },
+                text: By.css(".resultText > span"),
                 graphHost: {
                     exists: By.className("graphHost"),
                     column: By.css("rect"),
                 },
                 json: {
-                    exists: By.className("jsonView"),
+                    exists: By.css(".actionOutput .jsonView"),
                     field: By.css(".jsonView span > span"),
                 },
+                singleOutput: By.className("outputHost"),
             },
         },
         prompt: {
@@ -147,7 +152,7 @@ export const notebook = {
 };
 
 export const shellSession = {
-    exists: By.id("shellModuleHost"),
+    exists: By.id("sessionSelector"),
     result: {
         label: By.className("actionLabel"),
         output: By.className("actionOutput"),
@@ -437,6 +442,10 @@ export const genericDialog = {
     exists: By.className("valueEditDialog"),
 };
 
+export const suggestWidget = {
+    exists: By.css(".suggest-widget.visible"),
+};
+
 export const htmlTag = {
     img: By.css("img"),
     li: By.css("li"),