diff --git a/compiler/testData/codegen/bridges/simpleEnum.kt b/compiler/testData/codegen/bridges/simpleEnum.kt index e760837b352..b4f682850ac 100644 --- a/compiler/testData/codegen/bridges/simpleEnum.kt +++ b/compiler/testData/codegen/bridges/simpleEnum.kt @@ -1,8 +1,8 @@ -open enum class A { +trait A { open fun foo(t: T) = "A" } -enum class Z(val name: String) : A() { +enum class Z(val name: String) : A { Z1 : Z("Z1") Z2 : Z("Z2") override fun foo(t: String) = name diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt b/compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt index ce191b04c23..747ca7f6549 100644 --- a/compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt +++ b/compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt @@ -1,10 +1,10 @@ -open enum class A { +trait A { open fun foo(t: T) = "A" } -open enum class B : A() +trait B : A -enum class Z(val name: String) : B() { +enum class Z(val name: String) : B { Z1 : Z("Z1") Z2 : Z("Z2") override fun foo(t: String) = name diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt index 133c8b2edcc..407e442aa9f 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt @@ -37,21 +37,4 @@ fun bar(c: Color) = when (c) { fun bar1(c: Color) = when (c) { Color.RED -> 1 Color.GREEN -> 2 -} - -open enum class SomeEnum() {} - -enum class MyEnum : SomeEnum() { - A - B -} - -fun g(me: SomeEnum) = when (me) { - MyEnum.A -> 1 - MyEnum.B -> 2 -} - -fun t2(me: MyEnum) = when (me) { - MyEnum.A -> 1 - MyEnum.B -> 2 } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt index b82fe90b057..22c5a16dd49 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt @@ -5,8 +5,4 @@ package kt1193 open enum class MyEnum(val i: Int) { A : MyEnum(12) B //no error -} - -enum class MyChildEnum(i: Int, val s: String) : MyEnum(i) { - C : MyEnum(3) } \ No newline at end of file