test(appcomposer): fix initMessageHandler flaky test.

packages/core/src/test/applicationcomposer/messageHandlers/generateResourceHandler.test.ts

@@ -8,13 +8,11 @@ import sinon from 'sinon'
 import { createTemplate, createWebviewContext } from '../utils'
 import { generateResourceHandler } from '../../../applicationcomposer/messageHandlers/generateResourceHandler'
 import { Command, MessageType } from '../../../applicationcomposer/types'
-import * as env from '../../../shared/vscode/env'
+import { skipIfVscodeBelow } from '../../testUtil'
 
 describe('generateResourceHandler', function () {
     it('amazon q is not installed', async function () {
-        if (env.isMinVscode('1.89.0')) {
-            this.skip()
-        }
+        skipIfVscodeBelow(this, '1.89.0')
         const panel = await createTemplate()
         const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
         const context = await createWebviewContext({

packages/core/src/test/applicationcomposer/messageHandlers/initMessageHandler.test.ts

@@ -7,13 +7,11 @@ import assert from 'assert'
 import sinon from 'sinon'
 import { initMessageHandler } from '../../../applicationcomposer/messageHandlers/initMessageHandler'
 import { createTemplate, createWebviewContext } from '../utils'
+import { skipIfVscodeBelow } from '../../testUtil'
 
 describe('initMessageHandler', function () {
-    afterEach(() => {
-        sinon.restore()
-    })
-
-    it('not connected to codewhisperer', async () => {
+    it('not connected to codewhisperer', async function () {
+        skipIfVscodeBelow(this, '1.89.0')
         const panel = await createTemplate()
         const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
         const context = await createWebviewContext({
@@ -22,5 +20,6 @@ describe('initMessageHandler', function () {
         await initMessageHandler(context)
         assert.ok(postMessageSpy.calledOnce)
         assert.deepStrictEqual(postMessageSpy.getCall(0).args[0].isConnectedToCodeWhisperer, false)
+        postMessageSpy.restore()
     })
 })

packages/core/src/test/testUtil.ts

@@ -6,6 +6,7 @@
 import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
+import * as semver from 'semver'
 import * as FakeTimers from '@sinonjs/fake-timers'
 import * as pathutil from '../shared/utilities/pathUtils'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../shared/filesystemUtilities'
@@ -634,3 +635,9 @@ export function getFetchStubWithResponse(response: Partial<Response>) {
 export function copyEnv(): NodeJS.ProcessEnv {
     return { ...process.env }
 }
+
+export function skipIfVscodeBelow(testContext: Mocha.Context, targetVersion: string) {
+    if (semver.lt(vscode.version, targetVersion)) {
+        testContext.skip()
+    }
+}