Skip to content

Commit d464830

Browse files
author
David Hasani
committed
fix tests
1 parent 91e0ddd commit d464830

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
6969
when (val result = downloadArtifact(job, TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS)) {
7070
is DownloadArtifactResult.Success -> {
7171
if (result.artifact !is CodeModernizerArtifact) return notifyUnableToApplyPatch("")
72-
notifyStickyInfo("patch path", result.artifact.patch.path)
7372
displayDiffUsingPatch(result.artifact.patch, job, source)
7473
}
7574
is DownloadArtifactResult.ParseZipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage)

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
5757
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
5858
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerStartJobResult
5959
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
60+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
6061
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_BUILD_SKIP_UNIT_TESTS
6162
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
6263
import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
@@ -502,7 +503,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
502503
doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
503504

504505
doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
505-
val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
506+
val result = testSessionSpy.pollUntilJobCompletion(CodeTransformType.LANGUAGE_UPGRADE, jobId) { _, _ -> }
506507
assertEquals(CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId), result)
507508

508509
// two polls to check status as we 1. check for plan existing and 2. check if job completed
@@ -523,7 +524,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
523524
doReturn(exampleStartCodeMigrationResponse).whenever(clientAdaptorSpy).startCodeModernization(any(), any(), any())
524525

525526
doNothing().whenever(testSessionStateSpy).updateJobHistory(any(), any(), any())
526-
val result = testSessionSpy.pollUntilJobCompletion(jobId) { _, _ -> }
527+
val result = testSessionSpy.pollUntilJobCompletion(CodeTransformType.LANGUAGE_UPGRADE, jobId) { _, _ -> }
527528
assertEquals(CodeModernizerJobCompletedResult.JobPartiallySucceeded(jobId, testSessionContextSpy.targetJavaVersion), result)
528529
verify(clientAdaptorSpy, times(4)).getCodeModernizationJob(any())
529530
verify(clientAdaptorSpy, atLeastOnce()).getCodeModernizationPlan(any())

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerUtilsTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedEx
1919
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationProgressUpdate
2020
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
2121
import software.amazon.awssdk.services.ssooidc.model.InvalidGrantException
22+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformType
2223
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getBillingText
2324
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getTableMapping
2425
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.parseBuildFile
@@ -49,6 +50,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
4950
val mutableList = mutableListOf<TransformationStatus>()
5051
runBlocking {
5152
jobId.pollTransformationStatusAndPlan(
53+
CodeTransformType.LANGUAGE_UPGRADE,
5254
setOf(TransformationStatus.STARTED),
5355
setOf(TransformationStatus.FAILED),
5456
clientAdaptorSpy,
@@ -90,6 +92,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
9092
val mutableList = mutableListOf<TransformationStatus>()
9193
runBlocking {
9294
jobId.pollTransformationStatusAndPlan(
95+
CodeTransformType.LANGUAGE_UPGRADE,
9396
setOf(TransformationStatus.STARTED),
9497
setOf(TransformationStatus.FAILED),
9598
clientAdaptorSpy,
@@ -131,6 +134,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
131134
val mutableList = mutableListOf<TransformationStatus>()
132135
runBlocking {
133136
jobId.pollTransformationStatusAndPlan(
137+
CodeTransformType.LANGUAGE_UPGRADE,
134138
setOf(TransformationStatus.STARTED),
135139
setOf(TransformationStatus.FAILED),
136140
clientAdaptorSpy,
@@ -163,6 +167,7 @@ class CodeWhispererCodeModernizerUtilsTest : CodeWhispererCodeModernizerTestBase
163167

164168
val result = runBlocking {
165169
jobId.pollTransformationStatusAndPlan(
170+
CodeTransformType.LANGUAGE_UPGRADE,
166171
setOf(TransformationStatus.COMPLETED),
167172
setOf(TransformationStatus.FAILED),
168173
clientAdaptorSpy,

0 commit comments

Comments
 (0)