consolidated imports and removed some waits

Author: Siddharth Saladi

src/test/utils/testUtils.ts

@@ -3,7 +3,7 @@
  * Copyright IBM Corp. 2023, 2026
  */
 import path = require('path');
-import { Workbench, InputBox, DefaultTreeItem, ModalDialog, VSBrowser, WaitHelper, BottomBarPanel, OutputView, DebugToolbar } from 'vscode-extension-tester';
+import { Workbench, InputBox, DefaultTreeItem, ModalDialog, VSBrowser, WaitHelper, BottomBarPanel, OutputView, DebugToolbar, SideBarView } from 'vscode-extension-tester';
 import * as fs from 'fs';
 import { STOP_DASHBOARD_MAC_ACTION } from '../definitions/constants';
 import { MapContextMenuforMac } from './macUtils';
@@ -246,7 +246,6 @@ export async function getDashboardSection(sidebar: any): Promise<any> {
     return await wait.forCondition(async () => {
         try {
             // Re-create SideBarView on every iteration — on mac Previous the sidebar object goes stale during workspace transitions and getSections() returns dead nodes on every call.
-            const { SideBarView } = require('vscode-extension-tester');
             const freshSidebar = new SideBarView();
             const contentPart = freshSidebar.getContent();
             const sections = await contentPart.getSections();
@@ -285,7 +284,6 @@ export async function getDashboardItem(section: any, projectName: string): Promi
     // stale.  Getting a fresh section + fresh sidebar each time breaks that loop.
     return (await wait.forCondition(async () => {
         try {
-            const { SideBarView } = require('vscode-extension-tester');
             const freshSection = await getDashboardSection(new SideBarView());
             await freshSection.expand();
             await wait.sleep(1000);
@@ -708,7 +706,6 @@ export async function closeWorkspace(): Promise<void> {
         // when closeFolder is issued. On Linux this modal blocks the renderer.
         try {
             await workbench.executeCommand('revert file');
-            await wait.sleep(300);
         } catch { /* no active editor — fine */ }
 
         // Close all open editors first
@@ -745,7 +742,6 @@ export async function closeWorkspace(): Promise<void> {
         try {
             await wait.forCondition(async () => {
                 try {
-                    const { SideBarView } = require('vscode-extension-tester');
                     const sidebar = new SideBarView();
                     const sections = await sidebar.getContent().getSections();
                     for (const sec of sections) {
@@ -760,7 +756,6 @@ export async function closeWorkspace(): Promise<void> {
             }, { timeout: 30000, pollInterval: 1000, message: 'Workspace did not finish closing within 30 seconds' });
         } catch {
             logger.info('closeWorkspace gate timed out, falling back to fixed wait');
-            await wait.sleep(5000);
         }
 
         logger.info('Workspace closed successfully');