Fix unit tests

Author: opieter-aws

packages/amazonq/src/extensionNode.ts

@@ -7,29 +7,19 @@ import * as vscode from 'vscode'
 import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
 import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 import { activate as activateQGumby } from 'aws-core-vscode/amazonqGumby'
-import {
-    ExtContext,
-    globals,
-    CrashMonitoring,
-    getLogger,
-    isNetworkError,
-    isSageMaker,
-    Experiments,
-} from 'aws-core-vscode/shared'
+import { ExtContext, globals, CrashMonitoring, Experiments } from 'aws-core-vscode/shared'
 import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
 import { updateDevMode } from 'aws-core-vscode/dev'
 import { CommonAuthViewProvider } from 'aws-core-vscode/login'
 import { isExtensionActive, VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
 import { registerSubmitFeedback } from 'aws-core-vscode/feedback'
 import { DevOptions } from 'aws-core-vscode/dev'
-import { Auth, AuthUtils, getTelemetryMetadataForConn, isAnySsoConnection } from 'aws-core-vscode/auth'
+import { Auth } from 'aws-core-vscode/auth'
 import api from './api'
 import { activate as activateCWChat } from './app/chat/activation'
 import { activate as activateInlineChat } from './inlineChat/activation'
 import { beta } from 'aws-core-vscode/dev'
-import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
-import { AuthState, AuthUtil } from 'aws-core-vscode/codewhisperer'
-import { telemetry, AuthUserState } from 'aws-core-vscode/telemetry'
+import { NotificationsController } from 'aws-core-vscode/notifications'
 
 export async function activate(context: vscode.ExtensionContext) {
     // IMPORTANT: No other code should be added to this function. Place it in one of the following 2 functions where appropriate.

packages/amazonq/test/unit/codewhisperer/service/inlineCompletionService.test.ts

@@ -203,7 +203,7 @@ describe('codewhisperer status bar', function () {
     })
 
     it('shows correct status bar when auth is not connected', async function () {
-        sandbox.stub(AuthUtil.instance, 'isConnectionValid').returns(false)
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(false)
         sandbox.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
 
         await service.refreshStatusBar()
@@ -215,7 +215,7 @@ describe('codewhisperer status bar', function () {
     })
 
     it('shows correct status bar when auth is connected', async function () {
-        sandbox.stub(AuthUtil.instance, 'isConnectionValid').returns(true)
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(true)
         sandbox.stub(CodeSuggestionsState.instance, 'isSuggestionsEnabled').returns(true)
 
         await service.refreshStatusBar()
@@ -227,7 +227,7 @@ describe('codewhisperer status bar', function () {
     })
 
     it('shows correct status bar when auth is connected but paused', async function () {
-        sandbox.stub(AuthUtil.instance, 'isConnectionValid').returns(true)
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(true)
         sandbox.stub(CodeSuggestionsState.instance, 'isSuggestionsEnabled').returns(false)
 
         await service.refreshStatusBar()
@@ -239,7 +239,7 @@ describe('codewhisperer status bar', function () {
     })
 
     it('shows correct status bar when auth is expired', async function () {
-        sandbox.stub(AuthUtil.instance, 'isConnectionValid').returns(false)
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(false)
         sandbox.stub(AuthUtil.instance, 'isConnectionExpired').returns(true)
 
         await service.refreshStatusBar()

packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts

@@ -83,7 +83,7 @@ describe('codewhispererTracker', function () {
     describe('emitTelemetryOnSuggestion', function () {
         it('Should call recordCodewhispererUserModification with suggestion event', async function () {
             const testStartUrl = 'testStartUrl'
-            sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
+            sinon.stub(AuthUtil.instance.connection, 'startUrl').value(testStartUrl)
             const suggestion = createAcceptedSuggestionEntry()
             const assertTelemetry = assertTelemetryCurried('codewhisperer_userModification')
             await CodeWhispererTracker.getTracker().emitTelemetryOnSuggestion(suggestion)