Remove javaFilesDir parameter of CodegenTestCase.doMultiFileTest

Create TestFile instances for .java sources similarly to .kt sources,
and write them to a temporary directory via writeJavaFiles in each test
where this is needed
This commit is contained in:
Alexander Udalov
2019-04-03 16:34:25 +02:00
parent 7fdb9c990e
commit b602c08773
23 changed files with 89 additions and 115 deletions
@@ -26,9 +26,8 @@ abstract class LowLevelDebuggerTestBase : CodegenTestCase() {
private const val DEBUG_PORT = 5115
}
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>, javaFilesDir: File?) {
val javaSources = javaFilesDir?.let { arrayOf(it) } ?: emptyArray()
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, *javaSources)
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL, *listOfNotNull(writeJavaFiles(files)).toTypedArray())
val options = wholeFile.readLines()
.asSequence()
@@ -186,4 +185,4 @@ private object DebuggerMain {
(lock as java.lang.Object).wait()
}
}
}
}