remove redundant logic and add more waituntil

Author: zuoyaofu

packages/amazonq/test/e2e/amazonq/review.test.ts

@@ -24,23 +24,7 @@ import { ScanAction, scanProgressMessage } from '../../../src/app/amazonqScan/mo
 import { CodeScanIssue } from 'aws-core-vscode/codewhisperer'
 import { SecurityIssueProvider } from 'aws-core-vscode/codewhisperer'
 
-async function pollForResult<T>(
-    conditionFn: () => T | undefined,
-    timeoutMs: number = 60000,
-    intervalMs: number = 500
-): Promise<T | undefined> {
-    const startTime = Date.now()
-
-    while (Date.now() - startTime < timeoutMs) {
-        const result = conditionFn()
-        if (result !== undefined) {
-            return result
-        }
-        await new Promise((resolve) => setTimeout(resolve, intervalMs))
-    }
-
-    return undefined
-}
+import { waitUntil } from 'aws-core-vscode/shared'
 
 function getWorkspaceFolder(): string {
     return vscode.workspace.workspaceFolders![0].uri.fsPath
@@ -259,8 +243,8 @@ describe('Amazon Q Code Review', function () {
                 }
 
                 // Wait for the webview panel to open with polling
-                const webviewPanel = await pollForResult<vscode.WebviewPanel>(
-                    () => {
+                const webviewPanel = await waitUntil(
+                    async () => {
                         const panels = vscode.window.tabGroups.all
                             .flatMap((group) => group.tabs)
                             .filter((tab) => tab.label === amazonqCodeIssueDetailsTabTitle)
@@ -269,19 +253,38 @@ describe('Amazon Q Code Review', function () {
 
                         return panels.length > 0 ? panels[0] : undefined
                     },
-                    20_000,
-                    1000
+                    {
+                        timeout: 20_000,
+                        interval: 1000,
+                        truthy: false,
+                    }
                 )
 
                 assert.ok(webviewPanel, 'Security issue webview panel did not open after waiting')
 
-                const issue = viewDetailsAction.command?.arguments?.[0] as CodeScanIssue
+                // Wait until viewDetailsAction.command is defined
+                const viewDetailsActionDefined = await waitUntil(
+                    async () => {
+                        return viewDetailsAction.command?.arguments !== undefined
+                            ? viewDetailsAction.command
+                            : undefined
+                    },
+                    {
+                        timeout: 10_000,
+                        interval: 500,
+                        truthy: false,
+                    }
+                )
+
+                assert.ok(viewDetailsActionDefined, 'viewDetailsAction.command was not defined after waiting')
+
+                const issue = viewDetailsActionDefined.arguments?.[0] as CodeScanIssue
                 console.log('command', viewDetailsAction.command)
                 console.log('arguments', viewDetailsAction.command?.arguments)
 
                 // Wait for the fix to be generated with polling
-                const updatedIssue = await pollForResult<CodeScanIssue>(
-                    () => {
+                const updatedIssue = await waitUntil(
+                    async () => {
                         const foundIssue = SecurityIssueProvider.instance.issues
                             .flatMap(({ issues }) => issues)
                             .find((i) => i.findingId === issue.findingId)
@@ -293,8 +296,11 @@ describe('Amazon Q Code Review', function () {
                             ? foundIssue
                             : undefined
                     },
-                    CodeWhispererConstants.codeFixJobTimeoutMs,
-                    CodeWhispererConstants.codeFixJobPollingIntervalMs
+                    {
+                        timeout: CodeWhispererConstants.codeFixJobTimeoutMs,
+                        interval: CodeWhispererConstants.codeFixJobPollingIntervalMs,
+                        truthy: false,
+                    }
                 )
 
                 // Verify the fix was generated by checking if the issue has suggestedFixes