Skip to content

Commit 64cbf48

Browse files
author
David Hasani
committed
fix detekt and test
1 parent 1af30ce commit 64cbf48

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
@@ -127,10 +131,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcas
127131
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
128132
import software.aws.toolkits.resources.message
129133
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
130-
import com.intellij.openapi.application.ApplicationManager
131-
import com.intellij.openapi.fileEditor.FileEditorManager
132-
import com.intellij.testFramework.LightVirtualFile
133-
import org.jetbrains.yaml.YAMLFileType
134134

135135
class CodeTransformChatController(
136136
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
@@ -166,12 +166,11 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
166166
assertThat(fileContent).contains(MAVEN_BUILD_SKIP_UNIT_TESTS)
167167
}
168168
Path("sources/src/tmp.txt") -> assertThat(fileContent).isEqualTo(fileText)
169-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
170169
else -> fail("Unexpected entry in zip file: $entry")
171170
}
172171
}
173172
zipFile.close()
174-
assert(numEntries == 3)
173+
assert(numEntries == 2)
175174
}
176175
}
177176

@@ -205,7 +204,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
205204
Path("manifest.json") -> assertThat(fileContent).isNotNull()
206205
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo(fileText)
207206
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo(fileText)
208-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
209207
else -> fail("Unexpected entry in zip file: $entry")
210208
}
211209
}
@@ -242,7 +240,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
242240
Path("manifest.json") -> assertThat(fileContent).isNotNull()
243241
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo(fileText)
244242
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo(fileText)
245-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
246243
else -> fail("Unexpected entry in zip file: $entry")
247244
}
248245
}
@@ -282,7 +279,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
282279
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
283280
Path("sources/someModule/src/helloworld.java") -> assertThat(fileContent).isEqualTo("someModule/src/helloworld.java")
284281
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule/pom.xml")
285-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
286282
else -> fail("Unexpected entry in zip file: $entry")
287283
}
288284
}
@@ -322,7 +318,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
322318
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
323319
Path("sources/someModule/src/helloworld.java") -> assertThat(fileContent).isEqualTo("someModule\\src\\helloworld.java")
324320
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule\\pom.xml")
325-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
326321
else -> fail("Unexpected entry in zip file: $entry")
327322
}
328323
}
@@ -360,7 +355,6 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
360355
Path("sources/pom.xml") -> assertThat(fileContent).isEqualTo("pom.xml")
361356
Path("sources/src/tmp.java") -> assertThat(fileContent).isEqualTo("src/tmp.java")
362357
Path("sources/someModule/pom.xml") -> assertThat(fileContent).isEqualTo("someModule/pom.xml")
363-
Path("build-logs.txt") -> assertThat(fileContent).isNotNull()
364358
else -> throw AssertionError("Unexpected entry in zip file: $entry")
365359
}
366360
}

0 commit comments

Comments
 (0)