@@ -37,7 +37,7 @@ fun disableJava6FileManager() {
|
||||
}
|
||||
|
||||
private fun setFinalStaticToNull(field: Field) {
|
||||
field.isAccessible = true;
|
||||
field.isAccessible = true
|
||||
|
||||
val modifiersField = (Field::class.java).getDeclaredField("modifiers")
|
||||
modifiersField.isAccessible = true
|
||||
|
||||
+1
-1
@@ -96,7 +96,7 @@ abstract class AbstractIncrementalJpsTest(
|
||||
TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org")
|
||||
|
||||
val console = ConsoleAppender()
|
||||
console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n");
|
||||
console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n")
|
||||
console.threshold = Level.ALL
|
||||
console.activateOptions()
|
||||
Logger.getRootLogger().addAppender(console)
|
||||
|
||||
@@ -650,16 +650,16 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
||||
|
||||
val buildResult = BuildResult()
|
||||
val canceledStatus = object: CanceledStatus {
|
||||
var checkFromIndex = 0;
|
||||
var checkFromIndex = 0
|
||||
|
||||
override fun isCanceled(): Boolean {
|
||||
val messages = buildResult.getMessages(BuildMessage.Kind.INFO)
|
||||
for (i in checkFromIndex..messages.size - 1) {
|
||||
if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true;
|
||||
if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true
|
||||
}
|
||||
|
||||
checkFromIndex = messages.size;
|
||||
return false;
|
||||
checkFromIndex = messages.size
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
|
||||
System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "")
|
||||
System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")
|
||||
// spaces in the name to test proper file name handling
|
||||
val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running");
|
||||
val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running")
|
||||
val logFile = File.createTempFile("kotlin-daemon", ".log")
|
||||
System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
|
||||
System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.loggerCompatiblePath)
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() {
|
||||
p.printDifference(oldClassMap[name]!!, newClassMap[name]!!)
|
||||
}
|
||||
|
||||
KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString());
|
||||
KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString())
|
||||
}
|
||||
|
||||
private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List<File> {
|
||||
|
||||
Reference in New Issue
Block a user