Skip to content

Commit db41e14

Browse files
author
David Hasani
committed
fix detekt and test
1 parent 644e5a2 commit db41e14

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@
44
package software.aws.toolkits.jetbrains.services.codemodernizer.controller
55

66
import com.intellij.ide.BrowserUtil
7+
import com.intellij.openapi.application.ApplicationManager
78
import com.intellij.openapi.application.runInEdt
89
import com.intellij.openapi.fileChooser.FileChooser
910
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
11+
import com.intellij.openapi.fileEditor.FileEditorManager
1012
import com.intellij.openapi.module.ModuleUtil
1113
import com.intellij.openapi.projectRoots.JavaSdkVersion
1214
import com.intellij.openapi.projectRoots.ProjectJdkTable
1315
import com.intellij.openapi.util.io.FileUtil.createTempDirectory
1416
import com.intellij.openapi.vfs.VirtualFile
17+
import com.intellij.testFramework.LightVirtualFile
1518
import kotlinx.coroutines.delay
1619
import kotlinx.coroutines.runBlocking
1720
import kotlinx.coroutines.withContext
21+
import org.jetbrains.yaml.YAMLFileType
1822
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
1923
import software.aws.toolkits.core.utils.debug
2024
import software.aws.toolkits.core.utils.error
@@ -122,10 +126,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSct
122126
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
123127
import software.aws.toolkits.resources.message
124128
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
125-
import com.intellij.openapi.application.ApplicationManager
126-
import com.intellij.openapi.fileEditor.FileEditorManager
127-
import com.intellij.testFramework.LightVirtualFile
128-
import org.jetbrains.yaml.YAMLFileType
129129

130130
class CodeTransformChatController(
131131
private val context: AmazonQAppInitContext,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private fun runMavenJar(
9696
val jarPath = AwsToolkit.PLUGINS_INFO[AwsPlugin.Q]?.path?.resolve("lib/QCT-Maven.jar")
9797

9898
val commandList = listOf(
99-
"-Dmaven.ext.class.path=${jarPath}",
99+
"-Dmaven.ext.class.path=$jarPath",
100100
"-Dcom.amazon.aws.developer.transform.jobDirectory=$destinationDir",
101101
"clean",
102102
"test-compile"

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,11 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
168168
assertThat(fileContent).contains("\"noInteractiveMode\":true")
169169
}
170170
Path("sources/src/tmp.txt") -> assertThat(fileContent).isEqualTo(fileText)
171-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
172171
else -> fail("Unexpected entry in zip file: $entry")
173172
}
174173
}
175174
zipFile.close()
176-
assert(numEntries == 3)
175+
assert(numEntries == 2)
177176
}
178177
}
179178

@@ -207,7 +206,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
207206
Path("manifest.json") -> assertThat(fileContent).isNotNull()
208207
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo(fileText)
209208
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo(fileText)
210-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
211209
else -> fail("Unexpected entry in zip file: $entry")
212210
}
213211
}
@@ -244,7 +242,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
244242
Path("manifest.json") -> assertThat(fileContent).isNotNull()
245243
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo(fileText)
246244
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo(fileText)
247-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
248245
else -> fail("Unexpected entry in zip file: $entry")
249246
}
250247
}
@@ -284,7 +281,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
284281
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
285282
Path("sources/someModule/src/helloworld.java") -> assertThat(fileContent).isEqualTo("someModule/src/helloworld.java")
286283
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule/pom.xml")
287-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
288284
else -> fail("Unexpected entry in zip file: $entry")
289285
}
290286
}
@@ -324,7 +320,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
324320
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
325321
Path("sources/someModule/src/helloworld.java") -> assertThat(fileContent).isEqualTo("someModule\\src\\helloworld.java")
326322
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule\\pom.xml")
327-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
328323
else -> fail("Unexpected entry in zip file: $entry")
329324
}
330325
}
@@ -362,7 +357,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
362357
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
363358
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo("src/tmp.java")
364359
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule/pom.xml")
365-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
366360
else -> throw AssertionError("Unexpected entry in zip file: $entry")
367361
}
368362
}

0 commit comments

Comments
 (0)