Final in interfaces: deprecation ---> error + relevant test fixes

This commit is contained in:
Mikhail Glukhikh
2015-11-17 19:08:07 +03:00
parent 56af3a0af4
commit cd1b58f2eb
16 changed files with 13 additions and 79 deletions
@@ -1,13 +0,0 @@
// "class org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix" "false"
// ERROR: This type is final, so it cannot be inherited from
// ERROR: Cannot access '<init>': it is 'private' in 'E'
// ERROR: 'ordinal' in 'E' is final and cannot be overridden
enum class E {}
interface X {
final val ordinal : Int
get() = 42
}
class A : E(), X {
override<caret> val ordinal : Int = 24;
}
@@ -5229,12 +5229,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("overridingWritableAndNotWritableFinalMembers.kt")
public void testOverridingWritableAndNotWritableFinalMembers() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt");
doTest(fileName);
}
@TestMetadata("parameterNameChangedAmbiguousRename.kt")
public void testParameterNameChangedAmbiguousRename() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt");
@@ -799,12 +799,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest {
doTest(fileName);
}
@TestMetadata("TraitFinalFun.kt")
public void testTraitFinalFun() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
doTest(fileName);
}
@TestMetadata("TraitOpenFun.kt")
public void testTraitOpenFun() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");