Skip to content

Commit 1a48ed1

Browse files
author
Hamed Soleimani
committed
use platform specific separators in tests
1 parent 083fb66 commit 1a48ed1

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
1919
import software.aws.toolkits.jetbrains.utils.rules.addModule
2020
import software.aws.toolkits.telemetry.CodewhispererLanguage
2121
import java.io.BufferedInputStream
22+
import java.io.File
2223
import java.util.zip.ZipInputStream
2324
import kotlin.io.path.relativeTo
2425
import kotlin.test.assertNotNull
@@ -109,11 +110,12 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
109110
}
110111

111112
private fun setupCsharpProject() {
113+
val fileSeparator = File.separator
112114
val testModule = projectRule.fixture.addModule("testModule")
113115
val testModule2 = projectRule.fixture.addModule("testModule2")
114116
testCs = projectRule.fixture.addFileToModule(
115117
testModule,
116-
"/Test.cs",
118+
"${fileSeparator}Test.cs",
117119
"""
118120
using Utils;
119121
using Helpers.Helper;
@@ -131,7 +133,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
131133

132134
utilsCs = projectRule.fixture.addFileToModule(
133135
testModule,
134-
"/Utils.cs",
136+
"${fileSeparator}Utils.cs",
135137
"""
136138
public static class Utils
137139
{
@@ -157,7 +159,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
157159

158160
helperCs = projectRule.fixture.addFileToModule(
159161
testModule,
160-
"/Helpers/Helper.cs",
162+
"${fileSeparator}Helpers${fileSeparator}Helper.cs",
161163
"""
162164
public static class Helper
163165
{
@@ -201,7 +203,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
201203

202204
helpGo = projectRule.fixture.addFileToModule(
203205
testModule,
204-
"/help.go",
206+
"${fileSeparator}help.go",
205207
"""
206208
package main
207209
@@ -217,7 +219,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
217219

218220
utilsJs = projectRule.fixture.addFileToModule(
219221
testModule,
220-
"/utils.js",
222+
"${fileSeparator}utils.js",
221223
"""
222224
function add(num1, num2) {
223225
return num1 + num2;
@@ -247,7 +249,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
247249

248250
testJson = projectRule.fixture.addFileToModule(
249251
testModule,
250-
"/helpers/test3Json.json",
252+
"${fileSeparator}helpers${fileSeparator}test3Json.json",
251253
"""
252254
{
253255
"AWSTemplateFormatVersion": "2010-09-09",
@@ -303,7 +305,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
303305

304306
helperPy = projectRule.fixture.addFileToModule(
305307
testModule,
306-
"/helpers/helper.py",
308+
"${fileSeparator}helpers${fileSeparator}helper.py",
307309
"""
308310
from helpers import helper as h
309311
def subtract(num1, num2)
@@ -319,13 +321,13 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
319321
totalSize += helperPy.length
320322
totalLines += helperPy.toNioPath().toFile().readLines().size
321323

322-
readMeMd = projectRule.fixture.addFileToModule(testModule, "/ReadMe.md", "### Now included").virtualFile
324+
readMeMd = projectRule.fixture.addFileToModule(testModule, "${fileSeparator}ReadMe.md", "### Now included").virtualFile
323325
totalSize += readMeMd.length
324326
totalLines += readMeMd.toNioPath().toFile().readLines().size
325327

326328
testTf = projectRule.fixture.addFileToModule(
327329
testModule2,
328-
"/testTf.tf",
330+
"${fileSeparator}testTf.tf",
329331
"""
330332
# Create example resource for three S3 buckets using for_each, where the bucket prefix are in variable with list containing [prod, staging, dev]
331333
@@ -345,7 +347,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
345347

346348
testYaml = projectRule.fixture.addFileToModule(
347349
testModule2,
348-
"/testYaml.yaml",
350+
"${fileSeparator}testYaml.yaml",
349351
"""
350352
AWSTemplateFormatVersion: "2010-09-09"
351353
@@ -371,7 +373,7 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
371373

372374
// Adding gitignore file and gitignore file member for testing.
373375
// The tests include the markdown file but not these two files.
374-
projectRule.fixture.addFileToProject("/.gitignore", "node_modules\n.idea\n.vscode\n.DS_Store").virtualFile
375-
projectRule.fixture.addFileToProject("/.idea/ref", "ref: refs/heads/main")
376+
projectRule.fixture.addFileToProject("${fileSeparator}.gitignore", "node_modules\n.idea\n.vscode\n.DS_Store").virtualFile
377+
projectRule.fixture.addFileToProject("${fileSeparator}.idea${fileSeparator}ref", "ref: refs/heads/main")
376378
}
377379
}

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
202202
}
203203

204204
val zipFilePath = createTemporaryZipFileAsync { zipfs ->
205-
val isPosix = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
205+
val isPosix = FileSystems.getDefault().supportedFileAttributeViews().contains("posix")
206206
filesToIncludeFlow.collect { file ->
207207
if (!file.isDirectory) {
208208
val externalFilePath = Path(file.path)

0 commit comments

Comments
 (0)