E2E extension tests new function

This patch creates the function 'removeAllDatabaseConnections()'.
This function is now not only called at the end of each test suite, but also at the beginning of each test suite. It has happened that because of buggy tests, the DB connections are not removed at the end of the tests, causing test failures on further executions. With this patch, we ensure there are no DB connections at the beginning of the tests

Change-Id: Idc1bada93a288e6749292e539231b2e67d2c0c33

Author: Guilherme Saraiva

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

@@ -498,4 +498,15 @@ export class Workbench {
         await (await new ActivityBar().getViewControl(constants.extensionName))?.openView();
     };
 
+    /**
+     * Removes all existing database connections from the DATABASE CONNECTIONS section
+     * @returns A promise resolving when all connections are deleted
+     */
+    public static removeAllDatabaseConnections = async (): Promise<void> => {
+        const dbConnections = await Tree.getDatabaseConnections();
+        await Workbench.closeAllEditors();
+        for (const dbConnection of dbConnections) {
+            await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
+        }
+    };
 }

gui/extension/tests/e2e/tests/ui-db.ts

@@ -93,6 +93,7 @@ describe("DATABASE CONNECTIONS", () => {
             await (await activityBare.getViewControl(constants.extensionName))?.openView();
             await Workbench.dismissNotifications();
             await Workbench.toggleBottomBar(false);
+            await Workbench.removeAllDatabaseConnections();
             await Section.createDatabaseConnection(globalConn);
             await Workbench.closeAllEditors();
             await new BottomBarPanel().toggle(false);
@@ -110,11 +111,7 @@ describe("DATABASE CONNECTIONS", () => {
     after(async function () {
         try {
             await Os.prepareExtensionLogsForExport(process.env.TEST_SUITE);
-            const dbConnections = await Tree.getDatabaseConnections();
-            await Workbench.closeAllEditors();
-            for (const dbConnection of dbConnections) {
-                await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
-            }
+            await Workbench.removeAllDatabaseConnections();
         } catch (e) {
             await Misc.processFailure(this);
             throw e;

gui/extension/tests/e2e/tests/ui-notebook.ts

@@ -89,6 +89,7 @@ describe("NOTEBOOKS", () => {
         try {
             await driver.wait(waitUntil.extensionIsReady(), constants.wait2minutes);
             await Workbench.toggleBottomBar(false);
+            await Workbench.removeAllDatabaseConnections();
             await Section.createDatabaseConnection(globalConn);
             await (await DatabaseConnection.getConnection(globalConn.caption)).click();
             await driver.wait(waitUntil.dbConnectionIsOpened(globalConn), constants.wait10seconds);
@@ -105,10 +106,7 @@ describe("NOTEBOOKS", () => {
     after(async function () {
         try {
             await Os.prepareExtensionLogsForExport(process.env.TEST_SUITE);
-            const dbConnections = await Tree.getDatabaseConnections();
-            for (const dbConnection of dbConnections) {
-                await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
-            }
+            await Workbench.removeAllDatabaseConnections();
         } catch (e) {
             await Misc.processFailure(this);
             throw e;

gui/extension/tests/e2e/tests/ui-oci.ts

@@ -74,6 +74,7 @@ describe("ORACLE CLOUD INFRASTRUCTURE", () => {
         try {
             await driver.wait(waitUntil.extensionIsReady(), constants.wait2minutes);
             await Workbench.toggleBottomBar(false);
+            await Workbench.removeAllDatabaseConnections();
             await Section.focus(constants.ociTreeSection);
             const treeOCISection = await Section.getSection(constants.ociTreeSection);
             await Section.clickToolbarButton(treeOCISection, constants.configureOci);
@@ -91,6 +92,7 @@ describe("ORACLE CLOUD INFRASTRUCTURE", () => {
     after(async function () {
         try {
             await Os.prepareExtensionLogsForExport(process.env.TEST_SUITE);
+            await Workbench.removeAllDatabaseConnections();
         } catch (e) {
             await Misc.processFailure(this);
             throw e;
@@ -366,20 +368,6 @@ describe("ORACLE CLOUD INFRASTRUCTURE", () => {
 
         });
 
-        after(async function () {
-            try {
-                await Workbench.closeAllEditors();
-                await Section.focus(constants.dbTreeSection);
-                const dbConnections = await Tree.getDatabaseConnections();
-                for (const dbConnection of dbConnections) {
-                    await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
-                }
-            } catch (e) {
-                await Misc.processFailure(this);
-                throw e;
-            }
-        });
-
         it("Get Bastion Information and set it as current", async () => {
 
             const treeBastion = await Tree.getOciElementByType(constants.ociTreeSection, constants.bastionType);

gui/extension/tests/e2e/tests/ui-open-editors.ts

@@ -82,6 +82,7 @@ describe("OPEN EDITORS", () => {
             await (await activityBare.getViewControl(constants.extensionName))?.openView();
             await Workbench.dismissNotifications();
             await Workbench.toggleBottomBar(false);
+            await Workbench.removeAllDatabaseConnections();
             await Section.createDatabaseConnection(globalConn);
             await Workbench.closeAllEditors();
             await new BottomBarPanel().toggle(false);
@@ -97,10 +98,7 @@ describe("OPEN EDITORS", () => {
     after(async function () {
         try {
             await Os.prepareExtensionLogsForExport(process.env.TEST_SUITE);
-            const dbConnections = await Tree.getDatabaseConnections();
-            for (const dbConnection of dbConnections) {
-                await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
-            }
+            await Workbench.removeAllDatabaseConnections();
         } catch (e) {
             await Misc.processFailure(this);
             throw e;

gui/extension/tests/e2e/tests/ui-rest.ts

@@ -82,6 +82,7 @@ describe("MySQL REST Service", () => {
             await driver.wait(waitUntil.extensionIsReady(), constants.wait2minutes);
             await Workbench.toggleBottomBar(false);
             await Section.focus(constants.dbTreeSection);
+            await Workbench.removeAllDatabaseConnections();
             await Section.createDatabaseConnection(globalConn);
             await (await DatabaseConnection.getConnection(globalConn.caption)).click();
             await driver.wait(waitUntil.dbConnectionIsOpened(globalConn), constants.wait10seconds);
@@ -121,10 +122,7 @@ describe("MySQL REST Service", () => {
     after(async function () {
         try {
             await Os.prepareExtensionLogsForExport(process.env.TEST_SUITE);
-            const dbConnections = await Tree.getDatabaseConnections();
-            for (const dbConnection of dbConnections) {
-                await Tree.deleteDatabaseConnection(dbConnection.name, dbConnection.isMySQL, false);
-            }
+            await Workbench.removeAllDatabaseConnections();
         } catch (e) {
             await Misc.processFailure(this);
             throw e;