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

Ignore empty lines at the end of the testdata, remove debug dump

Browse Source 
should fix source-section plugin tests on windows
This commit is contained in:
Ilya Chernikov
2017-04-18 17:30:35 +02:00
parent fd41e266fb
commit af4caeaf24
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/source-sections/source-sections-compiler/src/org/jetbrains/kotlin/sourceSections/FilteredSectionsVirtualFile.kt
+1 -8
View File
@@ -41,14 +41,7 @@ class FilteredSectionsVirtualFile(val delegate: VirtualFile, val sectionIds: Col
override fun getTimeStamp(): Long = delegate.timeStamp override fun getTimeStamp(): Long = delegate.timeStamp
override fun getName(): String = delegate.name override fun getName(): String = delegate.name
override fun contentsToByteArray(): ByteArray { override fun contentsToByteArray(): ByteArray = filterByteContents(sectionIds, delegate.contentsToByteArray(), delegate.charset)
val res = filterByteContents(sectionIds, delegate.contentsToByteArray(), delegate.charset)
val dbgDumpFile = delegate.canonicalPath?.let { java.io.File(it + ".${sectionIds.joinToString(".")}.dump") }
if (dbgDumpFile != null && !dbgDumpFile.exists()) {
dbgDumpFile.writeText(String(res))
}
return res
}
override fun getInputStream(): InputStream = ByteArrayInputStream(contentsToByteArray()) override fun getInputStream(): InputStream = ByteArrayInputStream(contentsToByteArray())
plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt
+3 -1
View File
@@ -98,6 +98,7 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
.lineSequence() .lineSequence()
.map(String::trimEnd) .map(String::trimEnd)
.toList() .toList()
.dropLastWhile { it.isBlank() }
} }
fun testSourceSectionsFilter() { fun testSourceSectionsFilter() {
@@ -110,7 +111,8 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
val filteredVF = fileCreator.createPreprocessedFile(StandardFileSystems.local().findFileByPath(source.canonicalPath)) val filteredVF = fileCreator.createPreprocessedFile(StandardFileSystems.local().findFileByPath(source.canonicalPath))
TestCase.assertNotNull("Cannot generate preprocessed file", filteredVF) TestCase.assertNotNull("Cannot generate preprocessed file", filteredVF)
val expected = expectedResult.inputStream().trimmedLines(Charset.defaultCharset()) val expected = expectedResult.inputStream().trimmedLines(Charset.defaultCharset())
val actual = ByteArrayInputStream(filteredVF!!.contentsToByteArray()).trimmedLines(filteredVF.charset) val filteredBytes = filteredVF!!.contentsToByteArray()
val actual = ByteArrayInputStream(filteredBytes).trimmedLines(filteredVF.charset)
TestCase.assertEquals("Unexpected result on preprocessing file '${source.name}'", expected, actual) TestCase.assertEquals("Unexpected result on preprocessing file '${source.name}'", expected, actual)
} }
} }