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

Fix running gradle tests on windows

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-10-28 09:05:48 +03:00
parent 2c1699bc89
commit fa6ed71fbd
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+4 -18
View File
@@ -28,7 +28,7 @@ abstract class BaseGradleIT {
@After @After
fun tearDown() { fun tearDown() {
deleteRecursively(workingDir) workingDir.deleteRecursively()
} }
companion object { companion object {
@@ -227,13 +227,12 @@ abstract class BaseGradleIT {
} }
private fun Iterable<File>.projectRelativePaths(project: Project): Iterable<String> { private fun Iterable<File>.projectRelativePaths(project: Project): Iterable<String> {
// val projectDir = File(workingDir.canonicalFile, project.projectName)
return map { it.canonicalFile.toRelativeString(project.projectDir) } return map { it.canonicalFile.toRelativeString(project.projectDir) }
} }
fun CompiledProject.assertSameFiles(expected: Iterable<String>, actual: Iterable<String>, messagePrefix: String): CompiledProject { fun CompiledProject.assertSameFiles(expected: Iterable<String>, actual: Iterable<String>, messagePrefix: String): CompiledProject {
val expectedSet = expected.toSortedSet().joinToString("\n") val expectedSet = expected.map { it.normalizePath() }.toSortedSet().joinToString("\n")
val actualSet = actual.toSortedSet().joinToString("\n") val actualSet = actual.map { it.normalizePath() }.toSortedSet().joinToString("\n")
Assert.assertEquals(messagePrefix, expectedSet, actualSet) Assert.assertEquals(messagePrefix, expectedSet, actualSet)
return this return this
} }
@@ -301,18 +300,5 @@ abstract class BaseGradleIT {
source.listFiles()?.forEach { copyRecursively(it, target) } source.listFiles()?.forEach { copyRecursively(it, target) }
} }
fun deleteRecursively(f: File): Unit { private fun String.normalizePath() = replace("\\", "/")
if (f.isDirectory) {
f.listFiles()?.forEach { deleteRecursively(it) }
val fileList = f.listFiles()
if (fileList != null) {
if (!fileList.isEmpty()) {
fail("Expected $f to be empty but it has files: ${fileList.joinToString { it.name }}")
}
} else {
fail("Error listing directory content")
}
}
f.delete()
}
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildLogParserParametrizedIT.kt
+2 -2
View File
@@ -21,7 +21,7 @@ class BuildLogParserParametrizedIT : BaseGradleIT() {
val logFile = File(testDir, LOG_FILE_NAME) val logFile = File(testDir, LOG_FILE_NAME)
assert(logFile.isFile) { "Log file: $logFile does not exist" } assert(logFile.isFile) { "Log file: $logFile does not exist" }
val actualNormalized = dumpBuildLog(parseTestBuildLog(logFile)).trim() val actualNormalized = dumpBuildLog(parseTestBuildLog(logFile)).replace("\r\n", "\n").trim()
val expectedFile = File(testDir, EXPECTED_PARSED_LOG_FILE_NAME) val expectedFile = File(testDir, EXPECTED_PARSED_LOG_FILE_NAME)
if (!expectedFile.isFile) { if (!expectedFile.isFile) {
@@ -31,7 +31,7 @@ class BuildLogParserParametrizedIT : BaseGradleIT() {
throw AssertionError("Expected file log did not exist, created: $expectedFile") throw AssertionError("Expected file log did not exist, created: $expectedFile")
} }
val expectedNormalized = expectedFile.readText().trim() val expectedNormalized = expectedFile.readText().replace("\r\n", "\n").trim()
Assert.assertEquals("Parsed content was unexpected: ", expectedNormalized, actualNormalized) Assert.assertEquals("Parsed content was unexpected: ", expectedNormalized, actualNormalized)
// parse expected, dump again and compare (to check that dumped log can be parsed again) // parse expected, dump again and compare (to check that dumped log can be parsed again)