Skip to content

test(amazonq): fix flaky crossfileContextUtil.test #6032

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 3 commits into from
Nov 15, 2024
Merged

test(amazonq): fix flaky crossfileContextUtil.test #6032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27e1880
fix flaky crossfileContextUtil.test
Will-ShaoHua Nov 15, 2024
6dd448e
a
Will-ShaoHua Nov 15, 2024
d281665
patch
Will-ShaoHua Nov 15, 2024
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
16 changes: 12 additions & 4 deletions packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ describe('crossFileContextUtil', function () {
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
preview: false,
})

await assertTabCount(2)

const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
assert.ok(actual)
assert.ok(actual.supplementalContextItems.length === 3)

assert.strictEqual(actual.supplementalContextItems.length, 3)
assert.strictEqual(actual.supplementalContextItems[0].content.split('\n').length, 50)
assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50)
assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
Expand All @@ -64,6 +66,9 @@ describe('crossFileContextUtil', function () {
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
preview: false,
})

await assertTabCount(2)

sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t1')
sinon
.stub(LspController.instance, 'queryInlineProjectContext')
Expand All @@ -78,7 +83,7 @@ describe('crossFileContextUtil', function () {

const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
assert.ok(actual)
assert.ok(actual.supplementalContextItems.length === 4)
assert.strictEqual(actual.supplementalContextItems.length, 4)
assert.strictEqual(actual?.strategy, 'codemap')
assert.deepEqual(actual?.supplementalContextItems[0], {
content: 'foo',
Expand All @@ -96,6 +101,9 @@ describe('crossFileContextUtil', function () {
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
preview: false,
})

await assertTabCount(2)

sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t2')
sinon
.stub(LspController.instance, 'queryInlineProjectContext')
Expand Down Expand Up @@ -130,7 +138,7 @@ describe('crossFileContextUtil', function () {

const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
assert.ok(actual)
assert.ok(actual.supplementalContextItems.length === 5)
assert.strictEqual(actual.supplementalContextItems.length, 5)
assert.strictEqual(actual?.strategy, 'bm25')

assert.deepEqual(actual?.supplementalContextItems[0], {
Expand Down
6 changes: 5 additions & 1 deletion packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import assert from 'assert'
import * as vscode from 'vscode'
import * as sinon from 'sinon'
import * as crossFile from 'aws-core-vscode/codewhisperer'
import { TestFolder } from 'aws-core-vscode/test'
import { TestFolder, assertTabCount } from 'aws-core-vscode/test'
import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer'
import { toTextEditor } from 'aws-core-vscode/test'

Expand Down Expand Up @@ -39,6 +39,8 @@ describe('supplementalContextUtil', function () {
preview: false,
})

await assertTabCount(4)

const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
assert.ok(actual?.supplementalContextItems.length === 3)
})
Expand All @@ -53,6 +55,8 @@ describe('supplementalContextUtil', function () {
preview: false,
})

await assertTabCount(4)

const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
assert.ok(actual?.supplementalContextItems.length === 0)
})
Expand Down
Loading