Skip to content

test(amazonq): add unit tests for authUtil #7263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 8, 2025
Merged

test(amazonq): add unit tests for authUtil #7263

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f75138
test(amazonq): add unit tests for authUtil
opieter-aws May 8, 2025
4191f65
Use the testAuthUtil in all unit tests
opieter-aws May 8, 2025
d962683
Use testAuthUtil in all core tests
opieter-aws May 8, 2025
47e126f
Re-enable test
opieter-aws May 8, 2025
e9c2d40
Fix failing unit test
opieter-aws May 8, 2025
dc83405
Linter
opieter-aws May 8, 2025
86206f2
Address comment
opieter-aws May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/amazonq/test/unit/amazonq/backend_amazonq.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ describe('Amazon Q Login', async function () {
let sandbox: sinon.SinonSandbox
let backend: backendAmazonQ.AmazonQLoginWebview

await createTestAuthUtil()

beforeEach(function () {
beforeEach(async function () {
await createTestAuthUtil()
sandbox = sinon.createSandbox()
backend = new backendAmazonQ.AmazonQLoginWebview()
})
Expand Down Expand Up @@ -101,6 +100,8 @@ describe('Amazon Q Login', async function () {
})

it('signs out of reauth and emits telemetry', async function () {
await getStartUrl.connectToEnterpriseSso(startUrl, region)

await backend.signout()

assert.ok(!AuthUtil.instance.isConnected())
Expand Down
3 changes: 2 additions & 1 deletion packages/amazonq/test/unit/codewhisperer/commands/invokeRecommendation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import assert from 'assert'
import * as sinon from 'sinon'
import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
import { resetCodeWhispererGlobalVariables, createMockTextEditor, createTestAuthUtil } from 'aws-core-vscode/test'
import {
ConfigurationEntry,
invokeRecommendation,
Expand All @@ -20,6 +20,7 @@ describe('invokeRecommendation', function () {
let mockClient: DefaultCodeWhispererClient

beforeEach(async function () {
await createTestAuthUtil()
await resetCodeWhispererGlobalVariables()
getRecommendationStub = sinon.stub(InlineCompletionService.instance, 'getPaginatedRecommendation')
})
Expand Down
5 changes: 2 additions & 3 deletions packages/amazonq/test/unit/codewhisperer/region/regionProfileManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ describe('RegionProfileManager', async function () {
description: 'foo description',
}

await createTestAuthUtil()

async function setupConnection(type: 'builderId' | 'idc') {
if (type === 'builderId') {
await AuthUtil.instance.login(constants.builderIdStartUrl, region)
Expand All @@ -37,7 +35,8 @@ describe('RegionProfileManager', async function () {
}
}

beforeEach(function () {
beforeEach(async function () {
await createTestAuthUtil()
regionProfileManager = new RegionProfileManager(AuthUtil.instance)
})

Expand Down
8 changes: 7 additions & 1 deletion packages/amazonq/test/unit/codewhisperer/service/inlineCompletionService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ import {
listCodeWhispererCommandsId,
DefaultCodeWhispererClient,
} from 'aws-core-vscode/codewhisperer'
import { createMockTextEditor, resetCodeWhispererGlobalVariables, createMockDocument } from 'aws-core-vscode/test'
import {
createMockTextEditor,
resetCodeWhispererGlobalVariables,
createMockDocument,
createTestAuthUtil,
} from 'aws-core-vscode/test'

describe('inlineCompletionService', function () {
beforeEach(async function () {
Expand Down Expand Up @@ -192,6 +197,7 @@ describe('codewhisperer status bar', function () {
}

beforeEach(async function () {
await createTestAuthUtil()
await resetCodeWhispererGlobalVariables()
sandbox = sinon.createSandbox()
statusBar = new TestStatusBar()
Expand Down
4 changes: 4 additions & 0 deletions packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as sinon from 'sinon'
import * as codewhispererSdkClient from 'aws-core-vscode/codewhisperer'
import {
createMockTextEditor,
createTestAuthUtil,
createTextDocumentChangeEvent,
resetCodeWhispererGlobalVariables,
} from 'aws-core-vscode/test'
Expand Down Expand Up @@ -160,13 +161,16 @@ describe('keyStrokeHandler', function () {

describe('invokeAutomatedTrigger', function () {
let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient

beforeEach(async function () {
await createTestAuthUtil()
sinon.restore()
mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
await resetCodeWhispererGlobalVariables()
sinon.stub(mockClient, 'listRecommendations')
sinon.stub(mockClient, 'generateRecommendations')
})

afterEach(function () {
sinon.restore()
})
Expand Down
Loading
Loading