Skip to content

Commit aeeee4a

Browse files
tverneytverney
committed
fix(dev): update tests
1 parent eb8cc1d commit aeeee4a

File tree

5 files changed

+86
-63
lines changed

5 files changed

+86
-63
lines changed

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ open class FeatureDevTestBase(
6464
internal val currentCodeGenerationId = UUID.randomUUID()
6565
internal val testUploadId = "5678"
6666
internal val testRepositorySize = 20.0 // Picked a random size
67-
internal val testCodeGenerationId = "1234"
6867
internal val otherStatus = "Other"
6968
internal val testTabId = "test-tab-id"
7069
internal val testFilePaths = mapOf(Pair("test.ts", "This is a comment"))
@@ -92,7 +91,7 @@ open class FeatureDevTestBase(
9291

9392
internal val exampleStartTaskAssistConversationResponse = StartTaskAssistCodeGenerationResponse.builder()
9493
.conversationId(testConversationId)
95-
.codeGenerationId(testCodeGenerationId)
94+
.codeGenerationId(codeGenerationId.toString())
9695
.responseMetadata(DefaultAwsResponseMetadata.create(mapOf(AwsHeader.AWS_REQUEST_ID to testRequestId)))
9796
.build() as StartTaskAssistCodeGenerationResponse
9897

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
233233
testUploadId,
234234
0,
235235
messenger,
236+
0,
237+
0
236238
),
237239
)
238240
doNothing().`when`(spySession).insertChanges(any(), any(), any())

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
9898
coVerify(exactly = 1) { messenger.sendAnswerPart(testTabId, message("amazonqFeatureDev.code_generation.generating_code")) }
9999
verify(
100100
exactly = 1
101-
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
102-
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
101+
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, null) }
102+
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()) }
103103
coVerify(exactly = 1) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
104104
}
105105

@@ -112,8 +112,8 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
112112

113113
verify(
114114
exactly = 1
115-
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
116-
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
115+
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, null) }
116+
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()) }
117117
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(any()) }
118118
}
119119

@@ -130,8 +130,8 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
130130

131131
verify(
132132
exactly = 1
133-
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
134-
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
133+
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, null) }
134+
verify(exactly = 1) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()) }
135135
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(any()) }
136136
}
137137

@@ -149,8 +149,8 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
149149

150150
verify(
151151
exactly = 1
152-
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
153-
verify(exactly = 2) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
152+
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, null) }
153+
verify(exactly = 2) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()) }
154154
coVerify(exactly = 1) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
155155
}
156156

@@ -174,8 +174,8 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
174174

175175
verify(
176176
exactly = 1
177-
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, currentCodeGenerationId) }
178-
verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId) }
177+
) { featureDevService.startTaskAssistCodeGeneration(testConversationId, testUploadId, userMessage, codeGenerationId, null) }
178+
verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()) }
179179
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
180180
}
181181
}

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationStateTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import io.mockk.runs
1313
import io.mockk.unmockkAll
1414
import kotlinx.coroutines.test.runTest
1515
import org.assertj.core.api.Assertions.assertThat
16+
import org.gradle.tooling.GradleConnector
1617
import org.junit.After
1718
import org.junit.Before
1819
import org.junit.Rule
@@ -52,7 +53,7 @@ class PrepareCodeGenerationStateTest : FeatureDevTestBase() {
5253

5354
prepareCodeGenerationState = PrepareCodeGenerationState(
5455
"",
55-
null,
56+
GradleConnector.newCancellationTokenSource(),
5657
"test-approach",
5758
sessionStateConfig,
5859
emptyList(),

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevServiceTest.kt‎

Lines changed: 71 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,21 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
6666
@Test
6767
fun `test createUploadUrl`() {
6868
whenever(
69-
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString())
69+
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString()),
7070
).thenReturn(exampleCreateUploadUrlResponse)
7171

7272
val actual = featureDevService.createUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID())
7373
assertThat(actual).isInstanceOf(CreateUploadUrlResponse::class.java)
74-
assertThat(actual).usingRecursiveComparison().comparingOnlyFields("uploadUrl", "uploadId", "kmsKeyArn")
74+
assertThat(actual)
75+
.usingRecursiveComparison()
76+
.comparingOnlyFields("uploadUrl", "uploadId", "kmsKeyArn")
7577
.isEqualTo(exampleCreateUploadUrlResponse)
7678
}
7779

7880
@Test
7981
fun `test createUploadUrl with error`() {
8082
whenever(
81-
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString())
83+
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString()),
8284
).thenThrow(RuntimeException())
8385
assertThatThrownBy {
8486
featureDevService.createUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID())
@@ -88,13 +90,14 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
8890
@Test
8991
fun `test createUploadUrl with validation error`() {
9092
whenever(
91-
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString())
93+
featureDevClient.createTaskAssistUploadUrl(testConversationId, testChecksumSha, testContentLength, uploadId = UUID.randomUUID().toString()),
9294
).thenThrow(
93-
ValidationException.builder()
95+
ValidationException
96+
.builder()
9497
.requestId(testRequestId)
9598
.message("Invalid contentLength")
9699
.awsErrorDetails(AwsErrorDetails.builder().errorMessage("Invalid contentLength").build())
97-
.build()
100+
.build(),
98101
)
99102

100103
assertThatThrownBy {
@@ -104,32 +107,37 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
104107

105108
@Test
106109
fun `test getTaskAssistCodeGeneration success`() {
107-
whenever(featureDevClient.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)).thenReturn(exampleGetTaskAssistConversationResponse)
110+
whenever(
111+
featureDevClient.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString()),
112+
).thenReturn(exampleGetTaskAssistConversationResponse)
108113

109-
val actual = featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)
114+
val actual = featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString())
110115

111116
assertThat(actual).isEqualTo(exampleGetTaskAssistConversationResponse)
112117
}
113118

114119
@Test
115120
fun `test getTaskAssistCodeGeneration throws a CodeWhispererRuntimeException`() {
116-
val exampleCWException = CodeWhispererRuntimeException.builder().awsErrorDetails(
117-
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build()
118-
).build()
119-
whenever(featureDevClient.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)).thenThrow(exampleCWException)
121+
val exampleCWException =
122+
CodeWhispererRuntimeException
123+
.builder()
124+
.awsErrorDetails(
125+
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build(),
126+
).build()
127+
whenever(featureDevClient.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString())).thenThrow(exampleCWException)
120128

121129
assertThatThrownBy {
122-
featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)
130+
featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString())
123131
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(cwExceptionMsg)
124132
}
125133

126134
@Test
127135
fun `test getTaskAssistCodeGeneration throws another Exception`() {
128136
val exampleOtherException = RuntimeException(otherExceptionMsg)
129-
whenever(featureDevClient.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)).thenThrow(exampleOtherException)
137+
whenever(featureDevClient.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString())).thenThrow(exampleOtherException)
130138

131139
assertThatThrownBy {
132-
featureDevService.getTaskAssistCodeGeneration(testConversationId, testCodeGenerationId)
140+
featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId.toString())
133141
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(otherExceptionMsg)
134142
}
135143

@@ -141,34 +149,38 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
141149
testUploadId,
142150
userMessage,
143151
codeGenerationId = UUID.randomUUID(),
144-
currentCodeGenerationId = null
145-
)
152+
currentCodeGenerationId = null,
153+
),
146154
).thenReturn(exampleStartTaskAssistConversationResponse)
147155

148-
val actual = featureDevService.startTaskAssistCodeGeneration(
149-
testConversationId,
150-
testUploadId,
151-
userMessage,
152-
codeGenerationId = UUID.randomUUID(),
153-
currentCodeGenerationId = null
154-
)
156+
val actual =
157+
featureDevService.startTaskAssistCodeGeneration(
158+
testConversationId,
159+
testUploadId,
160+
userMessage,
161+
codeGenerationId = UUID.randomUUID(),
162+
currentCodeGenerationId = null,
163+
)
155164

156165
assertThat(actual).isEqualTo(exampleStartTaskAssistConversationResponse)
157166
}
158167

159168
@Test
160169
fun `test startTaskAssistConversation throws ThrottlingException`() {
161-
val exampleCWException = ThrottlingException.builder().awsErrorDetails(
162-
AwsErrorDetails.builder().errorMessage("limit for number of iterations on a code generation").build()
163-
).build()
170+
val exampleCWException =
171+
ThrottlingException
172+
.builder()
173+
.awsErrorDetails(
174+
AwsErrorDetails.builder().errorMessage("limit for number of iterations on a code generation").build(),
175+
).build()
164176
whenever(
165177
featureDevClient.startTaskAssistCodeGeneration(
166178
testConversationId,
167179
testUploadId,
168180
userMessage,
169181
codeGenerationId = UUID.randomUUID(),
170-
currentCodeGenerationId = null
171-
)
182+
currentCodeGenerationId = null,
183+
),
172184
).thenThrow(exampleCWException)
173185

174186
assertThatThrownBy {
@@ -177,26 +189,29 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
177189
testUploadId,
178190
userMessage,
179191
codeGenerationId = UUID.randomUUID(),
180-
currentCodeGenerationId = null
192+
currentCodeGenerationId = null,
181193
)
182194
}.isExactlyInstanceOf(CodeIterationLimitException::class.java).withFailMessage(
183-
message("amazonqFeatureDev.code_generation.iteration_limit.error_text")
195+
message("amazonqFeatureDev.code_generation.iteration_limit.error_text"),
184196
)
185197
}
186198

187199
@Test
188200
fun `test startTaskAssistConversation throws ServiceQuotaExceededException`() {
189-
val exampleCWException = ServiceQuotaExceededException.builder().awsErrorDetails(
190-
AwsErrorDetails.builder().errorMessage("service quota exceeded").build()
191-
).build()
201+
val exampleCWException =
202+
ServiceQuotaExceededException
203+
.builder()
204+
.awsErrorDetails(
205+
AwsErrorDetails.builder().errorMessage("service quota exceeded").build(),
206+
).build()
192207
whenever(
193208
featureDevClient.startTaskAssistCodeGeneration(
194209
testConversationId,
195210
testUploadId,
196211
userMessage,
197212
codeGenerationId = UUID.randomUUID(),
198-
currentCodeGenerationId = null
199-
)
213+
currentCodeGenerationId = null,
214+
),
200215
).thenThrow(exampleCWException)
201216

202217
assertThatThrownBy {
@@ -205,26 +220,29 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
205220
testUploadId,
206221
userMessage,
207222
codeGenerationId = UUID.randomUUID(),
208-
currentCodeGenerationId = null
223+
currentCodeGenerationId = null,
209224
)
210225
}.isExactlyInstanceOf(CodeIterationLimitException::class.java).withFailMessage(
211-
message("amazonqFeatureDev.code_generation.iteration_limit.error_text")
226+
message("amazonqFeatureDev.code_generation.iteration_limit.error_text"),
212227
)
213228
}
214229

215230
@Test
216231
fun `test startTaskAssistConversation throws another CodeWhispererRuntimeException`() {
217-
val exampleCWException = CodeWhispererRuntimeException.builder().awsErrorDetails(
218-
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build()
219-
).build()
232+
val exampleCWException =
233+
CodeWhispererRuntimeException
234+
.builder()
235+
.awsErrorDetails(
236+
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build(),
237+
).build()
220238
whenever(
221239
featureDevClient.startTaskAssistCodeGeneration(
222240
testConversationId,
223241
testUploadId,
224242
userMessage,
225243
codeGenerationId = UUID.randomUUID(),
226-
currentCodeGenerationId = null
227-
)
244+
currentCodeGenerationId = null,
245+
),
228246
).thenThrow(exampleCWException)
229247

230248
assertThatThrownBy {
@@ -233,7 +251,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
233251
testUploadId,
234252
userMessage,
235253
codeGenerationId = UUID.randomUUID(),
236-
currentCodeGenerationId = null
254+
currentCodeGenerationId = null,
237255
)
238256
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(cwExceptionMsg)
239257
}
@@ -247,8 +265,8 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
247265
testUploadId,
248266
userMessage,
249267
codeGenerationId = UUID.randomUUID(),
250-
currentCodeGenerationId = null
251-
)
268+
currentCodeGenerationId = null,
269+
),
252270
).thenThrow(exampleOtherException)
253271

254272
assertThatThrownBy {
@@ -257,16 +275,19 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
257275
testUploadId,
258276
userMessage,
259277
codeGenerationId = UUID.randomUUID(),
260-
currentCodeGenerationId = null
278+
currentCodeGenerationId = null,
261279
)
262280
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(otherExceptionMsg)
263281
}
264282

265283
@Test
266284
fun `test exportTaskAssistArchiveResult throws CodeWhispererStreamingException`() {
267-
val exampleCWException = CodeWhispererRuntimeException.builder().awsErrorDetails(
268-
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build()
269-
).build()
285+
val exampleCWException =
286+
CodeWhispererRuntimeException
287+
.builder()
288+
.awsErrorDetails(
289+
AwsErrorDetails.builder().errorMessage(cwExceptionMsg).build(),
290+
).build()
270291

271292
assertThatThrownBy {
272293
runTest {

0 commit comments

Comments
 (0)