From 22be002ef4fb3b25e012b0584fc947d45b92432d Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Wed, 29 Aug 2012 15:27:34 +0400
Subject: [PATCH] Remove enums inheriting from enums from test data.

---
 compiler/testData/codegen/bridges/simpleEnum.kt |  4 ++--
 .../bridges/substitutionInSuperClassEnum.kt     |  6 +++---
 .../tests/controlFlowAnalysis/kt1185enums.kt    | 17 -----------------
 .../tests/declarationChecks/kt1193.kt           |  4 ----
 4 files changed, 5 insertions(+), 26 deletions(-)

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<T> {
+trait A<T> {
     open fun foo(t: T) = "A"
 }
 
-enum class Z(val name: String) : A<String>() {
+enum class Z(val name: String) : A<String> {
     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<T> {
+trait A<T> {
     open fun foo(t: T) = "A"
 }
 
-open enum class B : A<String>()
+trait B : A<String>
 
-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) = <!NO_ELSE_IN_WHEN!>when<!> (c) {
     Color.RED -> 1
     Color.GREEN -> 2
-}
-
-open enum class SomeEnum() {}
-
-enum class MyEnum : SomeEnum() {
-    A
-    B
-}
-
-fun g(me: SomeEnum) = <!NO_ELSE_IN_WHEN!>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)
     <!ENUM_ENTRY_SHOULD_BE_INITIALIZED!>B<!>  //no error
-}
-
-enum class MyChildEnum(i: Int, val s: String) : MyEnum(i) {
-    C : <!ENUM_ENTRY_ILLEGAL_TYPE!>MyEnum<!>(3)
 }
\ No newline at end of file