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

Allow disable strict mode in ranking tests

Browse Source
This commit is contained in:
Nikolay Krasko
2018-10-24 15:45:25 +03:00
parent 1c7cab61c9
commit 651d76f4ef
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractFileRankingTest.kt
+2 -1
View File
@@ -18,8 +18,9 @@ abstract class AbstractFileRankingTest : LowLevelDebuggerTestBase() {
fun getKtFiles(name: String) = allKtFiles.filter { it.name == name } fun getKtFiles(name: String) = allKtFiles.filter { it.name == name }
val doNotCheckClassFqName = "DO_NOT_CHECK_CLASS_FQNAME" in options val doNotCheckClassFqName = "DO_NOT_CHECK_CLASS_FQNAME" in options
val strictMode = "DISABLE_STRICT_MODE" !in options
val calculator = object : FileRankingCalculator(checkClassFqName = !doNotCheckClassFqName, strictMode = true) { val calculator = object : FileRankingCalculator(checkClassFqName = !doNotCheckClassFqName, strictMode = strictMode) {
override fun analyze(element: KtElement) = state.bindingContext override fun analyze(element: KtElement) = state.bindingContext
} }
idea/tests/org/jetbrains/kotlin/idea/debugger/LowLevelDebuggerTestBase.kt
+2 -2
View File
@@ -15,12 +15,12 @@ import org.jetbrains.kotlin.codegen.*
import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.org.objectweb.asm.tree.ClassNode import org.jetbrains.org.objectweb.asm.tree.ClassNode
import org.jetbrains.org.objectweb.asm.Type as AsmType
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.net.Socket import java.net.Socket
import java.nio.file.Files import java.nio.file.Files
import kotlin.properties.Delegates import kotlin.properties.Delegates
import org.jetbrains.org.objectweb.asm.Type as AsmType
abstract class LowLevelDebuggerTestBase : CodegenTestCase() { abstract class LowLevelDebuggerTestBase : CodegenTestCase() {
private companion object { private companion object {
@@ -34,7 +34,7 @@ abstract class LowLevelDebuggerTestBase : CodegenTestCase() {
val options = wholeFile.readLines() val options = wholeFile.readLines()
.asSequence() .asSequence()
.filter { it.matches("^// ?[\\w_]+(:.*)$".toRegex()) } .filter { it.matches("^// ?[\\w_]+(:.*)?$".toRegex()) }
.map { it.drop(2).trim() } .map { it.drop(2).trim() }
.filter { !it.startsWith("FILE:") } .filter { !it.startsWith("FILE:") }
.toSet() .toSet()