considered AND operator for delete reports testing

OpenLiberty · Nov 20, 2024 · 32ec1b2 · 32ec1b2
1 parent 6b3d6eb
commit 32ec1b2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/liberty/devCommands.ts b/src/liberty/devCommands.ts
@@ -77,17 +77,18 @@ export async function openProject(pomPath: string): Promise<void> {
 export async function listAllCommands(): Promise<void> {
     const libertyCommands = Array.from(COMMAND_TITLES.keys());
     vscode.window.showQuickPick(libertyCommands).then(selection => {
-        if (!selection) {
-            return;
-        }
-        const command = COMMAND_TITLES.get(selection);
-        if (command !== undefined) {
-            vscode.commands.executeCommand(command);
-        } else {
-            // should never happen
-            console.error("Unable to find corresponding command for " + selection);
-        }
-
+            if (!selection) {
+                return;
+            }
+            const command = COMMAND_TITLES.get(selection);
+            if ( command !== undefined )
+            {
+                vscode.commands.executeCommand(command);
+            } else {
+                // should never happen
+                console.error("Unable to find corresponding command for " + selection);
+            }
+
     });
 }
 
@@ -192,11 +193,11 @@ export async function addProject(uri: vscode.Uri): Promise<void> {
         // scan the folder and get a list of folders with pom.xml and build.gradle
         const uris: string[] = await projectProvider.getListOfMavenAndGradleFolders(uri.fsPath);
         console.log(JSON.stringify(uris));
-        if (uris.length > 0) {
+        if ( uris.length > 0) {
             // present the list to add
             showListOfPathsToAdd(uris);
         }
-
+        
 
     } else {
         // clicked on the empty space and workspace has more than one folders, or
@@ -398,7 +399,7 @@ export async function customDevMode(libProject?: LibertyProject | undefined, par
             if (customCommand !== undefined) {
                 // save command
                 customCommand = customCommand.trim();
-                if (customCommand.length > 0) {
+                if ( customCommand.length > 0 ) {
                     const projectStartCmdParam: ProjectStartCmdParam = new ProjectStartCmdParam(libProject.getPath(), customCommand);
                     const projectProvider: ProjectProvider = ProjectProvider.getInstance();
                     const dashboardData: DashboardData = helperUtil.getStorageData(projectProvider.getContext());

diff --git a/src/test/MavenTestDevModeActions.ts b/src/test/MavenTestDevModeActions.ts
@@ -102,7 +102,7 @@ it('start maven with options from liberty dashboard', async () => {
   const alternateReportPath = path.join(utils.getMvnProjectPath(), "target", "reports", "failsafe.html"); // new path to scan for the reports 
   let deleteReport = await utils.deleteReports(reportPath);
   let deleteAlternateReport = await utils.deleteReports(alternateReportPath);
-  expect (deleteReport || deleteAlternateReport).to.be.true; // there should be a report available irrespective of the surefire versions we use , so either one needs to be true 
+  expect (deleteReport && deleteAlternateReport).to.be.true; // there should be a report available irrespective of the surefire versions we use , so either one needs to be true 
   await utils.launchDashboardAction(item, constants.START_DASHBOARD_ACTION_WITH_PARAM, constants.START_DASHBOARD_MAC_ACTION_WITH_PARAM);
   await utils.setCustomParameter("-DhotTests=true");  
   await utils.delay(30000);  
@@ -135,7 +135,7 @@ it('start maven with history from liberty dashboard', async () => {
   const alternateReportPath = path.join(utils.getMvnProjectPath(), "target", "reports", "failsafe.html");
   let deleteReport = await utils.deleteReports(reportPath);
   let deleteAlternateReport = await utils.deleteReports(alternateReportPath);
-  expect (deleteReport || deleteAlternateReport).to.be.true;  
+  expect (deleteReport && deleteAlternateReport).to.be.true;  
   await utils.launchDashboardAction(item, constants.START_DASHBOARD_ACTION_WITH_PARAM, constants.START_DASHBOARD_MAC_ACTION_WITH_PARAM);  
   const foundCommand = await utils.chooseCmdFromHistory("-DhotTests=true");
   expect (foundCommand).to.be.true;