Skip to content

Commit bd52d1e

Browse files
Will-ShaoHuaWill-ShaoHua
committed
tst
1 parent 5a43b30 commit bd52d1e

File tree

4 files changed

+64
-64
lines changed

4 files changed

+64
-64
lines changed

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeFileScanTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
118118
mockClient.stub {
119119
// setupResponse dynamically modifies these fake responses so this is very hard to follow and makes me question if we even need this
120120
onGeneric { createUploadUrl(any()) }.thenAnswer { fakeCreateUploadUrlResponse }
121-
onGeneric { createCodeScan(any(), any()) }.thenAnswer { fakeCreateCodeScanResponse }
122-
onGeneric { getCodeScan(any(), any()) }.thenAnswer { fakeGetCodeScanResponse }
123-
onGeneric { listCodeScanFindings(any(), any()) }.thenAnswer { fakeListCodeScanFindingsResponse }
121+
onGeneric { createCodeScan(any()) }.thenAnswer { fakeCreateCodeScanResponse }
122+
onGeneric { getCodeScan(any()) }.thenAnswer { fakeGetCodeScanResponse }
123+
onGeneric { listCodeScanFindings(any()) }.thenAnswer { fakeListCodeScanFindingsResponse }
124124
}
125125
}
126126

@@ -282,7 +282,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
282282
@Test
283283
fun `test mapToCodeScanIssues`() {
284284
val recommendations = listOf(
285-
fakeListCodeScanFindingsResponse.codeScanFindings(),
285+
fakeListCodeScanFindingsResponse.codeAnalysisFindings(),
286286
getFakeRecommendationsOnNonExistentFile()
287287
)
288288
val res = codeScanSessionSpy.mapToCodeScanIssues(recommendations, project, "jobId")
@@ -393,7 +393,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
393393
@Test
394394
fun `test run() - createCodeScan failed`() = runTest {
395395
mockClient.stub {
396-
onGeneric { createCodeScan(any(), any()) }.thenReturn(fakeCreateCodeScanResponseFailed)
396+
onGeneric { createCodeScan(any()) }.thenReturn(fakeCreateCodeScanResponseFailed)
397397
}
398398

399399
val codeScanResponse = codeScanSessionSpy.run()
@@ -405,7 +405,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
405405
@Test
406406
fun `test run() - createCodeScan error`() = runTest {
407407
mockClient.stub {
408-
onGeneric { createCodeScan(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
408+
onGeneric { createCodeScan(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
409409
}
410410

411411
val codeScanResponse = codeScanSessionSpy.run()
@@ -417,7 +417,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
417417
@Test
418418
fun `test run() - getCodeScan failed`() = runTest {
419419
mockClient.stub {
420-
onGeneric { getCodeScan(any(), any()) }.thenReturn(fakeGetCodeScanResponseFailed)
420+
onGeneric { getCodeScan(any()) }.thenReturn(fakeGetCodeScanResponseFailed)
421421
}
422422

423423
val codeScanResponse = codeScanSessionSpy.run()
@@ -432,7 +432,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
432432
onGeneric { overallJobTimeoutInSeconds() }.thenReturn(5)
433433
}
434434
mockClient.stub {
435-
onGeneric { getCodeScan(any(), any()) }.thenAnswer {
435+
onGeneric { getCodeScan(any()) }.thenAnswer {
436436
Thread.sleep(TIMEOUT)
437437
fakeGetCodeScanResponsePending
438438
}
@@ -447,7 +447,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
447447
@Test
448448
fun `test run() - getCodeScan error`() = runTest {
449449
mockClient.stub {
450-
onGeneric { getCodeScan(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
450+
onGeneric { getCodeScan(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
451451
}
452452

453453
val codeScanResponse = codeScanSessionSpy.run()
@@ -459,7 +459,7 @@ class CodeWhispererCodeFileScanTest : CodeWhispererCodeScanTestBase(PythonCodeIn
459459
@Test
460460
fun `test run() - listCodeScanFindings error`() = runTest {
461461
mockClient.stub {
462-
onGeneric { listCodeScanFindings(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
462+
onGeneric { listCodeScanFindings(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
463463
}
464464

465465
val codeScanResponse = codeScanSessionSpy.run()

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTest.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
8585

8686
mockClient.stub {
8787
onGeneric { createUploadUrl(any()) }.thenReturn(fakeCreateUploadUrlResponse)
88-
onGeneric { createCodeScan(any(), any()) }.thenReturn(fakeCreateCodeScanResponse)
89-
onGeneric { getCodeScan(any(), any()) }.thenReturn(fakeGetCodeScanResponse)
90-
onGeneric { listCodeScanFindings(any(), any()) }.thenReturn(fakeListCodeScanFindingsResponse)
88+
onGeneric { createCodeScan(any()) }.thenReturn(fakeCreateCodeScanResponse)
89+
onGeneric { getCodeScan(any()) }.thenReturn(fakeGetCodeScanResponse)
90+
onGeneric { listCodeScanFindings(any()) }.thenReturn(fakeListCodeScanFindingsResponse)
9191
}
9292
}
9393

@@ -157,7 +157,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
157157
@Test
158158
fun `test mapToCodeScanIssues`() {
159159
val recommendations = listOf(
160-
fakeListCodeScanFindingsResponse.codeScanFindings(),
160+
fakeListCodeScanFindingsResponse.codeAnalysisFindings(),
161161
getFakeRecommendationsOnNonExistentFile()
162162
)
163163
val res = codeScanSessionSpy.mapToCodeScanIssues(recommendations, project, "jobId")
@@ -167,7 +167,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
167167
@Test
168168
fun `test mapToCodeScanIssues - handles index out of bounds`() {
169169
val recommendations = listOf(
170-
fakeListCodeScanFindingsOutOfBoundsIndexResponse.codeScanFindings(),
170+
fakeListCodeScanFindingsOutOfBoundsIndexResponse.codeAnalysisFindings(),
171171
)
172172
val res = codeScanSessionSpy.mapToCodeScanIssues(recommendations, project, "jobId")
173173
assertThat(res).hasSize(1)
@@ -255,7 +255,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
255255
@Test
256256
fun `test run() - createCodeScan failed`() = runTest {
257257
mockClient.stub {
258-
onGeneric { createCodeScan(any(), any()) }.thenReturn(fakeCreateCodeScanResponseFailed)
258+
onGeneric { createCodeScan(any()) }.thenReturn(fakeCreateCodeScanResponseFailed)
259259
}
260260

261261
val codeScanResponse = codeScanSessionSpy.run()
@@ -267,7 +267,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
267267
@Test
268268
fun `test run() - createCodeScan error`() = runTest {
269269
mockClient.stub {
270-
onGeneric { createCodeScan(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
270+
onGeneric { createCodeScan(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
271271
}
272272

273273
val codeScanResponse = codeScanSessionSpy.run()
@@ -279,7 +279,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
279279
@Test
280280
fun `test run() - getCodeScan failed`() = runTest {
281281
mockClient.stub {
282-
onGeneric { getCodeScan(any(), any()) }.thenReturn(fakeGetCodeScanResponseFailed)
282+
onGeneric { getCodeScan(any()) }.thenReturn(fakeGetCodeScanResponseFailed)
283283
}
284284

285285
val codeScanResponse = codeScanSessionSpy.run()
@@ -294,7 +294,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
294294
onGeneric { overallJobTimeoutInSeconds() }.thenReturn(5)
295295
}
296296
mockClient.stub {
297-
onGeneric { getCodeScan(any(), any()) }.thenAnswer {
297+
onGeneric { getCodeScan(any()) }.thenAnswer {
298298
Thread.sleep(TIMEOUT)
299299
fakeGetCodeScanResponsePending
300300
}
@@ -309,7 +309,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
309309
@Test
310310
fun `test run() - getCodeScan error`() = runTest {
311311
mockClient.stub {
312-
onGeneric { getCodeScan(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
312+
onGeneric { getCodeScan(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
313313
}
314314

315315
val codeScanResponse = codeScanSessionSpy.run()
@@ -321,7 +321,7 @@ class CodeWhispererCodeScanTest : CodeWhispererCodeScanTestBase(PythonCodeInsigh
321321
@Test
322322
fun `test run() - listCodeScanFindings error`() = runTest {
323323
mockClient.stub {
324-
onGeneric { listCodeScanFindings(any(), any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
324+
onGeneric { listCodeScanFindings(any()) }.thenThrow(CodeWhispererCodeScanServerException::class.java)
325325
}
326326

327327
val codeScanResponse = codeScanSessionSpy.run()

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ import org.mockito.kotlin.stub
3030
import org.mockito.kotlin.whenever
3131
import software.amazon.awssdk.awscore.DefaultAwsResponseMetadata
3232
import software.amazon.awssdk.awscore.util.AwsHeader
33-
import software.amazon.awssdk.services.codewhisperer.model.CodeScanStatus
34-
import software.amazon.awssdk.services.codewhisperer.model.CreateCodeScanResponse
35-
import software.amazon.awssdk.services.codewhisperer.model.GetCodeScanResponse
36-
import software.amazon.awssdk.services.codewhisperer.model.ListCodeScanFindingsResponse
33+
import software.amazon.awssdk.services.codewhispererruntime.model.CodeAnalysisStatus
3734
import software.amazon.awssdk.services.codewhispererruntime.model.CodeFixJobStatus
3835
import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse
36+
import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeAnalysisResponse
3937
import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobResponse
38+
import software.amazon.awssdk.services.codewhispererruntime.model.ListCodeAnalysisFindingsResponse
4039
import software.amazon.awssdk.services.codewhispererruntime.model.Reference
4140
import software.amazon.awssdk.services.codewhispererruntime.model.Span
41+
import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeAnalysisResponse
4242
import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeFixJobResponse
4343
import software.aws.toolkits.jetbrains.core.MockClientManagerRule
4444
import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil
@@ -79,15 +79,15 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule
7979
internal lateinit var s3endpoint: String
8080

8181
internal lateinit var fakeCreateUploadUrlResponse: CreateUploadUrlResponse
82-
internal lateinit var fakeCreateCodeScanResponse: CreateCodeScanResponse
83-
internal lateinit var fakeCreateCodeScanResponseFailed: CreateCodeScanResponse
84-
internal lateinit var fakeCreateCodeScanResponsePending: CreateCodeScanResponse
85-
internal lateinit var fakeListCodeScanFindingsResponse: ListCodeScanFindingsResponse
86-
internal lateinit var fakeListCodeScanFindingsResponseE2E: ListCodeScanFindingsResponse
87-
internal lateinit var fakeListCodeScanFindingsOutOfBoundsIndexResponse: ListCodeScanFindingsResponse
88-
internal lateinit var fakeGetCodeScanResponse: GetCodeScanResponse
89-
internal lateinit var fakeGetCodeScanResponsePending: GetCodeScanResponse
90-
internal lateinit var fakeGetCodeScanResponseFailed: GetCodeScanResponse
82+
internal lateinit var fakeCreateCodeScanResponse: StartCodeAnalysisResponse
83+
internal lateinit var fakeCreateCodeScanResponseFailed: StartCodeAnalysisResponse
84+
internal lateinit var fakeCreateCodeScanResponsePending: StartCodeAnalysisResponse
85+
internal lateinit var fakeListCodeScanFindingsResponse: ListCodeAnalysisFindingsResponse
86+
internal lateinit var fakeListCodeScanFindingsResponseE2E: ListCodeAnalysisFindingsResponse
87+
internal lateinit var fakeListCodeScanFindingsOutOfBoundsIndexResponse: ListCodeAnalysisFindingsResponse
88+
internal lateinit var fakeGetCodeScanResponse: GetCodeAnalysisResponse
89+
internal lateinit var fakeGetCodeScanResponsePending: GetCodeAnalysisResponse
90+
internal lateinit var fakeGetCodeScanResponseFailed: GetCodeAnalysisResponse
9191
internal lateinit var fakeGetCodeFixJobResponse: GetCodeFixJobResponse
9292
internal lateinit var fakeStartCodeFixJobResponse: StartCodeFixJobResponse
9393

@@ -257,53 +257,53 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule
257257
.responseMetadata(metadata)
258258
.build() as StartCodeFixJobResponse
259259

260-
fakeCreateCodeScanResponse = CreateCodeScanResponse.builder()
261-
.status(CodeScanStatus.COMPLETED)
260+
fakeCreateCodeScanResponse = StartCodeAnalysisResponse.builder()
261+
.status(CodeAnalysisStatus.COMPLETED)
262262
.jobId(JOB_ID)
263263
.responseMetadata(metadata)
264-
.build() as CreateCodeScanResponse
264+
.build() as StartCodeAnalysisResponse
265265

266-
fakeCreateCodeScanResponseFailed = CreateCodeScanResponse.builder()
267-
.status(CodeScanStatus.FAILED)
266+
fakeCreateCodeScanResponseFailed = StartCodeAnalysisResponse.builder()
267+
.status(CodeAnalysisStatus.FAILED)
268268
.jobId(JOB_ID)
269269
.responseMetadata(metadata)
270-
.build() as CreateCodeScanResponse
270+
.build() as StartCodeAnalysisResponse
271271

272-
fakeCreateCodeScanResponsePending = CreateCodeScanResponse.builder()
273-
.status(CodeScanStatus.PENDING)
272+
fakeCreateCodeScanResponsePending = StartCodeAnalysisResponse.builder()
273+
.status(CodeAnalysisStatus.PENDING)
274274
.jobId(JOB_ID)
275275
.responseMetadata(metadata)
276-
.build() as CreateCodeScanResponse
276+
.build() as StartCodeAnalysisResponse
277277

278-
fakeListCodeScanFindingsResponse = ListCodeScanFindingsResponse.builder()
279-
.codeScanFindings(setupCodeScanFindings(filePath))
278+
fakeListCodeScanFindingsResponse = ListCodeAnalysisFindingsResponse.builder()
279+
.codeAnalysisFindings(setupCodeScanFindings(filePath))
280280
.responseMetadata(metadata)
281-
.build() as ListCodeScanFindingsResponse
281+
.build() as ListCodeAnalysisFindingsResponse
282282

283-
fakeListCodeScanFindingsResponseE2E = ListCodeScanFindingsResponse.builder()
284-
.codeScanFindings(setupCodeScanFindingsE2E(filePath))
283+
fakeListCodeScanFindingsResponseE2E = ListCodeAnalysisFindingsResponse.builder()
284+
.codeAnalysisFindings(setupCodeScanFindingsE2E(filePath))
285285
.responseMetadata(metadata)
286-
.build() as ListCodeScanFindingsResponse
286+
.build() as ListCodeAnalysisFindingsResponse
287287

288-
fakeListCodeScanFindingsOutOfBoundsIndexResponse = ListCodeScanFindingsResponse.builder()
289-
.codeScanFindings(setupCodeScanFindingsOutOfBounds(filePath))
288+
fakeListCodeScanFindingsOutOfBoundsIndexResponse = ListCodeAnalysisFindingsResponse.builder()
289+
.codeAnalysisFindings(setupCodeScanFindingsOutOfBounds(filePath))
290290
.responseMetadata(metadata)
291-
.build() as ListCodeScanFindingsResponse
291+
.build() as ListCodeAnalysisFindingsResponse
292292

293-
fakeGetCodeScanResponse = GetCodeScanResponse.builder()
294-
.status(CodeScanStatus.COMPLETED)
293+
fakeGetCodeScanResponse = GetCodeAnalysisResponse.builder()
294+
.status(CodeAnalysisStatus.COMPLETED)
295295
.responseMetadata(metadata)
296-
.build() as GetCodeScanResponse
296+
.build() as GetCodeAnalysisResponse
297297

298-
fakeGetCodeScanResponsePending = GetCodeScanResponse.builder()
299-
.status(CodeScanStatus.PENDING)
298+
fakeGetCodeScanResponsePending = GetCodeAnalysisResponse.builder()
299+
.status(CodeAnalysisStatus.PENDING)
300300
.responseMetadata(metadata)
301-
.build() as GetCodeScanResponse
301+
.build() as GetCodeAnalysisResponse
302302

303-
fakeGetCodeScanResponseFailed = GetCodeScanResponse.builder()
304-
.status(CodeScanStatus.FAILED)
303+
fakeGetCodeScanResponseFailed = GetCodeAnalysisResponse.builder()
304+
.status(CodeAnalysisStatus.FAILED)
305305
.responseMetadata(metadata)
306-
.build() as GetCodeScanResponse
306+
.build() as GetCodeAnalysisResponse
307307
}
308308

309309
protected fun getFakeRecommendationsOnNonExistentFile() = """

‎plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
5353

5454
mockClient.stub {
5555
onGeneric { createUploadUrl(any()) }.thenReturn(fakeCreateUploadUrlResponse)
56-
onGeneric { createCodeScan(any(), any()) }.thenReturn(fakeCreateCodeScanResponse)
57-
onGeneric { getCodeScan(any(), any()) }.thenReturn(fakeGetCodeScanResponse)
58-
onGeneric { listCodeScanFindings(any(), any()) }.thenReturn(fakeListCodeScanFindingsResponseE2E)
56+
onGeneric { createCodeScan(any()) }.thenReturn(fakeCreateCodeScanResponse)
57+
onGeneric { getCodeScan(any()) }.thenReturn(fakeGetCodeScanResponse)
58+
onGeneric { listCodeScanFindings(any()) }.thenReturn(fakeListCodeScanFindingsResponseE2E)
5959
}
6060
}
6161

0 commit comments

Comments
 (0)