Skip to content

Commit c218d8f

Browse files
author
David Hasani
committed
remove unused imports and modify test
1 parent 1c410d5 commit c218d8f

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.messages.Incoming
2626
import software.aws.toolkits.jetbrains.services.codemodernizer.session.ChatSessionStorage
2727
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getQTokenProvider
2828
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
29-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
3029
import java.util.concurrent.atomic.AtomicBoolean
3130

3231
private enum class CodeTransformMessageTypes(val type: String) {

‎plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.constants
55

66
import com.intellij.openapi.project.Project
77
import com.intellij.openapi.vfs.VirtualFile
8-
import kotlinx.coroutines.selects.select
98
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
109
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_PREREQUISITES
1110
import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_ALLOW_S3_ACCESS

‎plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTrans
8080
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toVirtualFile
8181
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
8282
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
83-
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
8483
import software.aws.toolkits.resources.message
8584
import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents
8685

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
102102
// get project.projectFile because project.projectFile can not be null
103103
val roots = ModuleRootManager.getInstance(module).contentRoots
104104
val root = roots[0]
105-
val context = spy(CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11))
105+
val context = spy(CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, ""))
106106
val result = spy(MavenCopyCommandsResult.Success(File("")))
107107
doReturn(null).`when`(result).dependencyDirectory
108108
doReturn(result).`when`(context).executeMavenCopyCommands(any(), any())
@@ -122,7 +122,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
122122
// get project.projectFile because project.projectFile can not be null
123123
val roots = ModuleRootManager.getInstance(module).contentRoots
124124
val root = roots[0]
125-
val context = spy(CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11))
125+
val context = spy(CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, ""))
126126
val result = MavenCopyCommandsResult.Failure
127127
doReturn(result).`when`(context).executeMavenCopyCommands(any(), any())
128128
runInEdtAndWait {
@@ -143,7 +143,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
143143
assertFalse(roots.isEmpty() || roots.size > 1)
144144
assert(rootManager.dependencies.isEmpty())
145145
val root = roots[0]
146-
val context = CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
146+
val context = CodeModernizerSessionContext(project, root.children[0], JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "-DskipTests")
147147
val mockFile = mock(File::class.java)
148148
val mockStringBuilder = mock(StringBuilder::class.java)
149149
val file = runInEdtAndGet {
@@ -156,7 +156,10 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
156156
numEntries += 1
157157
val fileContent = zipFile.getInputStream(entry).bufferedReader().readLine()
158158
when (Path(entry.name)) {
159-
Path("manifest.json") -> assertNotNull(fileContent)
159+
Path("manifest.json") -> {
160+
assertNotNull(fileContent)
161+
assertTrue(fileContent.contains("-DskipTests"))
162+
}
160163
Path("sources/src/tmp.txt") -> assertEquals(fileText, fileContent)
161164
Path("build-logs.txt") -> assertNotNull(fileContent)
162165
else -> fail("Unexpected entry in zip file: $entry")
@@ -182,7 +185,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
182185
assertFalse(roots.isEmpty() || roots.size > 1)
183186
assert(rootManager.dependencies.isEmpty())
184187
val pom = roots[0].children.first { it.name == "pom.xml" }
185-
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
188+
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
186189
val mockFile = mock(File::class.java)
187190
val mockStringBuilder = mock(StringBuilder::class.java)
188191
val file = runInEdtAndGet {
@@ -219,7 +222,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
219222
assertFalse(roots.isEmpty() || roots.size > 1)
220223

221224
val pom = roots[0].children.first { it.name == "pom.xml" }
222-
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
225+
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
223226
val mockFile = mock(File::class.java)
224227
val mockStringBuilder = mock(StringBuilder::class.java)
225228
val file = runInEdtAndGet {
@@ -257,7 +260,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
257260
assertFalse(roots.isEmpty() || roots.size > 1)
258261

259262
val pom = roots[0].children.first { it.name == "pom.xml" }
260-
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
263+
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
261264
val mockFile = mock(File::class.java)
262265
val mockStringBuilder = mock(StringBuilder::class.java)
263266
val file = runInEdtAndGet {
@@ -297,7 +300,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
297300
assertFalse(roots.isEmpty() || roots.size > 1)
298301

299302
val pom = roots[0].children.first { it.name == "pom.xml" }
300-
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
303+
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
301304
val mockFile = mock(File::class.java)
302305
val mockStringBuilder = mock(StringBuilder::class.java)
303306
val file = runInEdtAndGet {
@@ -336,7 +339,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
336339
assertFalse(roots.isEmpty() || roots.size > 1)
337340

338341
val pom = roots[0].children.first { it.name == "pom.xml" }
339-
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
342+
val context = CodeModernizerSessionContext(project, pom, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
340343
val mockFile = mock(File::class.java)
341344
val mockStringBuilder = mock(StringBuilder::class.java)
342345
val file = runInEdtAndGet {
@@ -362,7 +365,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
362365
@Test
363366
fun `CodeModernizerSession can create zip and excludes maven metadata from dependencies folder`() {
364367
// get project.projectFile because project.projectFile can not be null
365-
val context = CodeModernizerSessionContext(project, emptyPomFile, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11)
368+
val context = CodeModernizerSessionContext(project, emptyPomFile, JavaSdkVersion.JDK_1_8, JavaSdkVersion.JDK_11, "")
366369
val m2Folders = listOf(
367370
"com/groupid1/artifactid1/version1",
368371
"com/groupid1/artifactid1/version2",

0 commit comments

Comments
 (0)