Skip to content

Commit 041e30d

Browse files
authored
test(amazonq): flaky crossfileContextUtil test #6032
## Problem flaky crossfileContextUtil test. ## Solution call `assertTabCount()` to wait until text editors are opened correctly
1 parent 9eb37d2 commit 041e30d

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ describe('crossFileContextUtil', function () {
5050
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
5151
preview: false,
5252
})
53+
54+
await assertTabCount(2)
55+
5356
const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
5457
assert.ok(actual)
55-
assert.ok(actual.supplementalContextItems.length === 3)
56-
58+
assert.strictEqual(actual.supplementalContextItems.length, 3)
5759
assert.strictEqual(actual.supplementalContextItems[0].content.split('\n').length, 50)
5860
assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50)
5961
assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
@@ -64,6 +66,9 @@ describe('crossFileContextUtil', function () {
6466
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
6567
preview: false,
6668
})
69+
70+
await assertTabCount(2)
71+
6772
sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t1')
6873
sinon
6974
.stub(LspController.instance, 'queryInlineProjectContext')
@@ -78,7 +83,7 @@ describe('crossFileContextUtil', function () {
7883

7984
const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
8085
assert.ok(actual)
81-
assert.ok(actual.supplementalContextItems.length === 4)
86+
assert.strictEqual(actual.supplementalContextItems.length, 4)
8287
assert.strictEqual(actual?.strategy, 'codemap')
8388
assert.deepEqual(actual?.supplementalContextItems[0], {
8489
content: 'foo',
@@ -96,6 +101,9 @@ describe('crossFileContextUtil', function () {
96101
const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
97102
preview: false,
98103
})
104+
105+
await assertTabCount(2)
106+
99107
sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t2')
100108
sinon
101109
.stub(LspController.instance, 'queryInlineProjectContext')
@@ -130,7 +138,7 @@ describe('crossFileContextUtil', function () {
130138

131139
const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
132140
assert.ok(actual)
133-
assert.ok(actual.supplementalContextItems.length === 5)
141+
assert.strictEqual(actual.supplementalContextItems.length, 5)
134142
assert.strictEqual(actual?.strategy, 'bm25')
135143

136144
assert.deepEqual(actual?.supplementalContextItems[0], {

packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import assert from 'assert'
77
import * as vscode from 'vscode'
88
import * as sinon from 'sinon'
99
import * as crossFile from 'aws-core-vscode/codewhisperer'
10-
import { TestFolder } from 'aws-core-vscode/test'
10+
import { TestFolder, assertTabCount } from 'aws-core-vscode/test'
1111
import { FeatureConfigProvider } from 'aws-core-vscode/codewhisperer'
1212
import { toTextEditor } from 'aws-core-vscode/test'
1313

@@ -39,6 +39,8 @@ describe('supplementalContextUtil', function () {
3939
preview: false,
4040
})
4141

42+
await assertTabCount(4)
43+
4244
const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
4345
assert.ok(actual?.supplementalContextItems.length === 3)
4446
})
@@ -53,6 +55,8 @@ describe('supplementalContextUtil', function () {
5355
preview: false,
5456
})
5557

58+
await assertTabCount(4)
59+
5660
const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
5761
assert.ok(actual?.supplementalContextItems.length === 0)
5862
})

0 commit comments

Comments
 (0)