Skip to content

Commit 81617eb

Browse files
singhAwssinghAws
committed
fix: fix unit tests
1 parent 076fbfd commit 81617eb

File tree

4 files changed

+20
-135
lines changed

4 files changed

+20
-135
lines changed

‎packages/amazonq/test/unit/codewhisperer/service/securityIssueHoverProvider.test.ts‎

Lines changed: 18 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -46,62 +46,29 @@ describe('securityIssueHoverProvider', () => {
4646
(actual.contents[0] as vscode.MarkdownString).value,
4747
'## title ![High](severity-high.svg)\n' +
4848
'fix\n\n' +
49-
`[$(eye) View Details](command:aws.amazonq.openSecurityIssuePanel?${encodeURIComponent(
49+
`[$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
5050
JSON.stringify([issues[0], mockDocument.fileName])
51-
)} 'Open "Code Issue Details"')\n` +
52-
` | [$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
53-
JSON.stringify([issues[0]])
5451
)} 'Explain with Amazon Q')\n` +
52+
` | [$(comment) Fix](command:aws.amazonq.generateFix?${encodeURIComponent(
53+
JSON.stringify([issues[0], mockDocument.fileName])
54+
)} 'Fix with Amazon Q')\n` +
5555
` | [$(error) Ignore](command:aws.amazonq.security.ignore?${encodeURIComponent(
5656
JSON.stringify([issues[0], mockDocument.fileName, 'hover'])
5757
)} 'Ignore Issue')\n` +
5858
` | [$(error) Ignore All](command:aws.amazonq.security.ignoreAll?${encodeURIComponent(
5959
JSON.stringify([issues[0], 'hover'])
60-
)} 'Ignore Similar Issues')\n` +
61-
` | [$(wrench) Fix](command:aws.amazonq.applySecurityFix?${encodeURIComponent(
62-
JSON.stringify([issues[0], mockDocument.fileName, 'hover'])
63-
)} 'Fix with Amazon Q')\n` +
64-
'### Suggested Fix Preview\n\n' +
65-
'<span class="codicon codicon-none" style="background-color:var(--vscode-editorMarkerNavigationInfo-headerBackground);">\n\n' +
66-
'```undefined\n' +
67-
'@@ -1,1 +1,1 @@ \n' +
68-
'```\n\n' +
69-
'</span>\n' +
70-
'<br />\n' +
71-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-unchangedCodeBackground);">\n\n' +
72-
'```language\n' +
73-
'first line \n' +
74-
'```\n\n' +
75-
'</span>\n' +
76-
'<br />\n' +
77-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-removedTextBackground);">\n\n' +
78-
'```diff\n' +
79-
'-second line \n' +
80-
'```\n\n' +
81-
'</span>\n' +
82-
'<br />\n' +
83-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-insertedTextBackground);">\n\n' +
84-
'```diff\n' +
85-
'+third line \n' +
86-
'```\n\n' +
87-
'</span>\n' +
88-
'<br />\n' +
89-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-unchangedCodeBackground);">\n\n' +
90-
'```language\n' +
91-
'fourth line \n' +
92-
'```\n\n' +
93-
'</span>\n\n'
60+
)} 'Ignore Similar Issues')\n`
9461
)
9562
assert.strictEqual(
9663
(actual.contents[1] as vscode.MarkdownString).value,
9764
'## title ![High](severity-high.svg)\n' +
9865
'recommendationText\n\n' +
99-
`[$(eye) View Details](command:aws.amazonq.openSecurityIssuePanel?${encodeURIComponent(
66+
`[$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
10067
JSON.stringify([issues[1], mockDocument.fileName])
101-
)} 'Open "Code Issue Details"')\n` +
102-
` | [$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
103-
JSON.stringify([issues[1]])
10468
)} 'Explain with Amazon Q')\n` +
69+
` | [$(comment) Fix](command:aws.amazonq.generateFix?${encodeURIComponent(
70+
JSON.stringify([issues[1], mockDocument.fileName])
71+
)} 'Fix with Amazon Q')\n` +
10572
` | [$(error) Ignore](command:aws.amazonq.security.ignore?${encodeURIComponent(
10673
JSON.stringify([issues[1], mockDocument.fileName, 'hover'])
10774
)} 'Ignore Issue')\n` +
@@ -156,12 +123,12 @@ describe('securityIssueHoverProvider', () => {
156123
(actual.contents[0] as vscode.MarkdownString).value,
157124
'## title \n' +
158125
'recommendationText\n\n' +
159-
`[$(eye) View Details](command:aws.amazonq.openSecurityIssuePanel?${encodeURIComponent(
126+
`[$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
160127
JSON.stringify([issues[0], mockDocument.fileName])
161-
)} 'Open "Code Issue Details"')\n` +
162-
` | [$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
163-
JSON.stringify([issues[0]])
164128
)} 'Explain with Amazon Q')\n` +
129+
` | [$(comment) Fix](command:aws.amazonq.generateFix?${encodeURIComponent(
130+
JSON.stringify([issues[0], mockDocument.fileName])
131+
)} 'Fix with Amazon Q')\n` +
165132
` | [$(error) Ignore](command:aws.amazonq.security.ignore?${encodeURIComponent(
166133
JSON.stringify([issues[0], mockDocument.fileName, 'hover'])
167134
)} 'Ignore Issue')\n` +
@@ -194,52 +161,18 @@ describe('securityIssueHoverProvider', () => {
194161
(actual.contents[0] as vscode.MarkdownString).value,
195162
'## title ![High](severity-high.svg)\n' +
196163
'fix\n\n' +
197-
`[$(eye) View Details](command:aws.amazonq.openSecurityIssuePanel?${encodeURIComponent(
164+
`[$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
198165
JSON.stringify([issues[0], mockDocument.fileName])
199-
)} 'Open "Code Issue Details"')\n` +
200-
` | [$(comment) Explain](command:aws.amazonq.explainIssue?${encodeURIComponent(
201-
JSON.stringify([issues[0]])
202166
)} 'Explain with Amazon Q')\n` +
167+
` | [$(comment) Fix](command:aws.amazonq.generateFix?${encodeURIComponent(
168+
JSON.stringify([issues[0], mockDocument.fileName])
169+
)} 'Fix with Amazon Q')\n` +
203170
` | [$(error) Ignore](command:aws.amazonq.security.ignore?${encodeURIComponent(
204171
JSON.stringify([issues[0], mockDocument.fileName, 'hover'])
205172
)} 'Ignore Issue')\n` +
206173
` | [$(error) Ignore All](command:aws.amazonq.security.ignoreAll?${encodeURIComponent(
207174
JSON.stringify([issues[0], 'hover'])
208-
)} 'Ignore Similar Issues')\n` +
209-
` | [$(wrench) Fix](command:aws.amazonq.applySecurityFix?${encodeURIComponent(
210-
JSON.stringify([issues[0], mockDocument.fileName, 'hover'])
211-
)} 'Fix with Amazon Q')\n` +
212-
'### Suggested Fix Preview\n\n' +
213-
'<span class="codicon codicon-none" style="background-color:var(--vscode-editorMarkerNavigationInfo-headerBackground);">\n\n' +
214-
'```undefined\n' +
215-
'@@ -1,1 +1,1 @@ \n' +
216-
'```\n\n' +
217-
'</span>\n' +
218-
'<br />\n' +
219-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-unchangedCodeBackground);">\n\n' +
220-
'```language\n' +
221-
'first line \n' +
222-
'```\n\n' +
223-
'</span>\n' +
224-
'<br />\n' +
225-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-removedTextBackground);">\n\n' +
226-
'```diff\n' +
227-
'-second line \n' +
228-
'-third line \n' +
229-
'```\n\n' +
230-
'</span>\n' +
231-
'<br />\n' +
232-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-insertedTextBackground);">\n\n' +
233-
'```diff\n' +
234-
'+fourth line \n' +
235-
'```\n\n' +
236-
'</span>\n' +
237-
'<br />\n' +
238-
'<span class="codicon codicon-none" style="background-color:var(--vscode-diffEditor-unchangedCodeBackground);">\n\n' +
239-
'```language\n' +
240-
'fifth line \n' +
241-
'```\n\n' +
242-
'</span>\n\n'
175+
)} 'Ignore Similar Issues')\n`
243176
)
244177
})
245178

‎packages/amazonq/test/unit/codewhisperer/service/securityIssueTreeViewProvider.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ describe('SecurityIssueTreeViewProvider', function () {
150150
item.iconPath?.toString().includes(`${item.issue.severity.toLowerCase()}.svg`)
151151
)
152152
)
153-
assert.ok(issueItems.every((item) => item.description?.toString().startsWith('[Ln ')))
153+
assert.ok(issueItems.every((item) => !item.description?.toString().startsWith('[Ln ')))
154154
}
155155
})
156156
})

‎packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class SecurityIssueHoverProvider implements vscode.HoverProvider {
9292
[issue, filePath],
9393
'comment',
9494
'Fix',
95-
'Generate Fix for Issue'
95+
'Fix with Amazon Q'
9696
)
9797
markdownString.appendMarkdown(' | ' + generateFixCommand)
9898

‎packages/core/src/test/codewhisperer/commands/basicCommands.test.ts‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
generateFix,
2323
rejectFix,
2424
ignoreIssue,
25-
regenerateFix,
2625
ignoreAllIssues,
2726
} from '../../../codewhisperer/commands/basicCommands'
2827
import { FakeExtensionContext } from '../../fakeExtensionContext'
@@ -1150,51 +1149,4 @@ def execute_input_compliant():
11501149
})
11511150
})
11521151
})
1153-
1154-
describe('regenerateFix', function () {
1155-
let sandbox: sinon.SinonSandbox
1156-
let filePath: string
1157-
let codeScanIssue: CodeScanIssue
1158-
let issueItem: IssueItem
1159-
let rejectFixMock: sinon.SinonStub
1160-
let generateFixMock: sinon.SinonStub
1161-
1162-
beforeEach(function () {
1163-
sandbox = sinon.createSandbox()
1164-
filePath = 'dummy/file.py'
1165-
codeScanIssue = createCodeScanIssue({
1166-
findingId: randomUUID(),
1167-
suggestedFixes: [{ code: 'diff', description: 'description' }],
1168-
})
1169-
issueItem = new IssueItem(filePath, codeScanIssue)
1170-
rejectFixMock = sinon.stub()
1171-
generateFixMock = sinon.stub()
1172-
})
1173-
1174-
afterEach(function () {
1175-
sandbox.restore()
1176-
})
1177-
1178-
it('should call regenerateFix command successfully', async function () {
1179-
const updatedIssue = createCodeScanIssue({ findingId: 'updatedIssue' })
1180-
sinon.stub(rejectFix, 'execute').value(rejectFixMock.resolves(updatedIssue))
1181-
sinon.stub(generateFix, 'execute').value(generateFixMock)
1182-
targetCommand = testCommand(regenerateFix)
1183-
await targetCommand.execute(codeScanIssue, filePath)
1184-
1185-
assert.ok(rejectFixMock.calledWith(codeScanIssue, filePath))
1186-
assert.ok(generateFixMock.calledWith(updatedIssue, filePath))
1187-
})
1188-
1189-
it('should call regenerateFix from tree view item', async function () {
1190-
const updatedIssue = createCodeScanIssue({ findingId: 'updatedIssue' })
1191-
sinon.stub(rejectFix, 'execute').value(rejectFixMock.resolves(updatedIssue))
1192-
sinon.stub(generateFix, 'execute').value(generateFixMock)
1193-
targetCommand = testCommand(regenerateFix)
1194-
await targetCommand.execute(issueItem, filePath)
1195-
1196-
assert.ok(rejectFixMock.calledWith(codeScanIssue, filePath))
1197-
assert.ok(generateFixMock.calledWith(updatedIssue, filePath))
1198-
})
1199-
})
12001152
})

0 commit comments

Comments
 (0)