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

Rename SinceKotlinInfo -> VersionRequirement

Browse Source
This commit is contained in:
Alexander Udalov
2017-09-28 18:35:21 +03:00
parent 8f9fc100a3
commit 8962911503
22 changed files with 1447 additions and 1449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/SinceKotlinInfoTest.kt → compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
+10 -12
View File
@@ -22,24 +22,22 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo
import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
import org.jetbrains.kotlin.test.TestJdkKind
import java.io.File
class SinceKotlinInfoTest : TestCaseWithTmpdir() {
class VersionRequirementTest : TestCaseWithTmpdir() {
fun doTest(
fileName: String,
expectedSinceKotlinInfoVersion: SinceKotlinInfo.Version,
expectedVersionRequirement: VersionRequirement.Version,
expectedLevel: DeprecationLevel,
expectedMessage: String?,
expectedErrorCode: Int?,
@@ -63,12 +61,12 @@ class SinceKotlinInfoTest : TestCaseWithTmpdir() {
throw AssertionError("Not a deserialized descriptor: $descriptor")
}
val sinceKotlinInfo = descriptor.sinceKotlinInfo ?: throw AssertionError("No SinceKotlinInfo for $descriptor")
val requirement = descriptor.versionRequirement ?: throw AssertionError("No VersionRequirement for $descriptor")
assertEquals(expectedSinceKotlinInfoVersion, sinceKotlinInfo.version)
assertEquals(expectedLevel, sinceKotlinInfo.level)
assertEquals(expectedMessage, sinceKotlinInfo.message)
assertEquals(expectedErrorCode, sinceKotlinInfo.errorCode)
assertEquals(expectedVersionRequirement, requirement.version)
assertEquals(expectedLevel, requirement.level)
assertEquals(expectedMessage, requirement.message)
assertEquals(expectedErrorCode, requirement.errorCode)
}
for (fqName in fqNames) {
@@ -98,8 +96,8 @@ class SinceKotlinInfoTest : TestCaseWithTmpdir() {
}
fun testSuspendFun() {
doTest("compiler/testData/sinceKotlinInfo/suspendFun.kt",
SinceKotlinInfo.Version(1, 1), DeprecationLevel.ERROR, null, null,
doTest("compiler/testData/versionRequirement/suspendFun.kt",
VersionRequirement.Version(1, 1), DeprecationLevel.ERROR, null, null,
"test.topLevel",
"test.Foo.member",
"test.Foo.<init>",