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

Fix AbstractWriteSignatureTest

Browse Source 
It didn't check anything in tests with class signatures
This commit is contained in:
Denis Zharkov
2015-11-10 15:11:12 +03:00
parent 7ee50e043c
commit 9c8ad9e442
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ interface Derived<A>: List<A>
// class: Derived // class: Derived
// jvm signature: Derived // jvm signature: Derived
// generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TA;>; // generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TA;>;Lkotlin/jvm/internal/markers/KMappedMarker;
compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt
+2 -4
View File
@@ -90,6 +90,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
classSuitesByClassName.getOrPut(className) { ClassExpectationsSuite(className) } classSuitesByClassName.getOrPut(className) { ClassExpectationsSuite(className) }
fun check() { fun check() {
Assert.assertTrue(classSuitesByClassName.isNotEmpty())
classSuitesByClassName.values().forEach { it.check() } classSuitesByClassName.values().forEach { it.check() }
} }
@@ -196,9 +197,6 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
if (kind == "class" && memberName != null) { if (kind == "class" && memberName != null) {
throw AssertionError("$ktFile:${lineNo+1}: use $className\$$memberName to denote inner class") throw AssertionError("$ktFile:${lineNo+1}: use $className\$$memberName to denote inner class")
} }
else if (memberName == null) {
throw AssertionError("$ktFile:${lineNo+1}: '$kind' requires member name (after $className::)")
}
val jvmSignatureMatch = jvmSignatureRegex.matchExact(lines[lineNo+1]) val jvmSignatureMatch = jvmSignatureRegex.matchExact(lines[lineNo+1])
val genericSignatureMatch = genericSignatureRegex.matchExact(lines[lineNo+2]) val genericSignatureMatch = genericSignatureRegex.matchExact(lines[lineNo+2])
@@ -237,7 +235,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
// jvm signature: $jvmSignature // jvm signature: $jvmSignature
// generic signature: $genericSignature""" // generic signature: $genericSignature"""
val expectationRegex = Regex("^// (class|method|field): *([^:]+)(::(.+)) *(//.*)?") val expectationRegex = Regex("^// (class|method|field): *([^:]+)(::(.+))? *(//.*)?")
val jvmSignatureRegex = Regex("^// jvm signature: *(.+) *(//.*)?") val jvmSignatureRegex = Regex("^// jvm signature: *(.+) *(//.*)?")
val genericSignatureRegex = Regex("^// generic signature: *(.+) *(//.*)?") val genericSignatureRegex = Regex("^// generic signature: *(.+) *(//.*)?")