azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unstable IncrementalFileToPathConverterTest tests

Browse Source
This commit is contained in:
nataliya.valtman
2020-10-28 11:30:28 +03:00
parent 2589de6c49
commit e9669bf5cb
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverter.kt
+1
View File
@@ -27,6 +27,7 @@ open class IncrementalFileToPathConverter(val rootProjectDir: File?) : FileToPat
private companion object { private companion object {
private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$" private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$"
//use only for prefix length because it OS dependent
private const val PATH_PREFIX = "$PROJECT_DIR_PLACEHOLDER/" private const val PATH_PREFIX = "$PROJECT_DIR_PLACEHOLDER/"
} }
build-common/test/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverterTest.kt
+10 -9
View File
@@ -10,45 +10,46 @@ import org.junit.Test
import java.io.File import java.io.File
internal class IncrementalFileToPathConverterTest : TestWithWorkingDir() { internal class IncrementalFileToPathConverterTest : TestWithWorkingDir() {
val separator: String = File.separator
@Test @Test
fun testPathTransform() { fun testPathTransform() {
val relativeFilePath = "testFile.txt" val relativeFilePath = "testFile.txt"
val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath) val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
assertEquals("${'$'}PROJECT_DIR${'$'}/$relativeFilePath", transformedPath) assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
} }
@Test @Test
fun testComplicatedProjectRootPath() { fun testComplicatedProjectRootPath() {
val relativeFilePath = "testFile.txt" val relativeFilePath = "testFile.txt"
val transformedPath = testPathTransformation(workingDir.resolve("first/../testDir"), relativeFilePath) val transformedPath = testPathTransformation(workingDir.resolve("first$separator..${separator}testDir"), relativeFilePath)
assertEquals("${'$'}PROJECT_DIR${'$'}/$relativeFilePath", transformedPath) assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
} }
@Test @Test
fun testInccorectProjectRootPath() { fun testInccorectProjectRootPath() {
val relativeFilePath = "testFile.txt" val relativeFilePath = "testFile.txt"
val transformedPath = testPathTransformation(workingDir.resolve("testDir/"), relativeFilePath) val transformedPath = testPathTransformation(workingDir.resolve("testDir$separator"), relativeFilePath)
assertEquals("${'$'}PROJECT_DIR${'$'}/$relativeFilePath", transformedPath) assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
} }
@Test @Test
fun testFileOutOfProject() { fun testFileOutOfProject() {
val relativeFilePath = "../testFile.txt" val relativeFilePath = "..${separator}testFile.txt"
val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath) val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
assertEquals("${workingDir.absolutePath}/testFile.txt", transformedPath) assertEquals("${workingDir.absolutePath}${separator}testFile.txt", transformedPath)
} }
@Test @Test
fun testFileWithExtraSlash() { fun testFileWithExtraSlash() {
val relativeFilePath = "testFile.txt/" val relativeFilePath = "testFile.txt$separator"
val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath) val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
assertEquals("${'$'}PROJECT_DIR${'$'}/testFile.txt", transformedPath) assertEquals("${'$'}PROJECT_DIR${'$'}${separator}testFile.txt", transformedPath)
} }
private fun testPathTransformation(projectRoot: File, relativeFilePath: String): String { private fun testPathTransformation(projectRoot: File, relativeFilePath: String): String {