From 97946feb9a7a7f78b0a984d491be9f21f221d068 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 15 Oct 2015 00:51:37 +0300
Subject: [PATCH] Minor, rename and adapt test

---
 .../callableReference/function/enumNameMethod.kt     |  9 ---------
 .../callableReference/property/enumNameOrdinal.kt    | 11 +++++++++++
 .../BlackBoxWithStdlibCodegenTestGenerated.java      | 12 ++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt
 create mode 100644 compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt

diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt
deleted file mode 100644
index 0723c45fcbc..00000000000
--- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-enum class E {
-    I
-}
-
-fun box(): String {
-    val i = (E::name.getter)(E.I)
-    if (i != "I") return "Fail $i"
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt
new file mode 100644
index 00000000000..10ccfbdee1e
--- /dev/null
+++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt
@@ -0,0 +1,11 @@
+enum class E {
+    I
+}
+
+fun box(): String {
+    val i = (E::name).get(E.I)
+    if (i != "I") return "Fail $i"
+    val n = (E::ordinal).get(E.I)
+    if (n != 0) return "Fail $n"
+    return "OK"
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index 2b489f283ec..b29f8546464 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -462,12 +462,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
-            @TestMetadata("enumNameMethod.kt")
-            public void testEnumNameMethod() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt");
-                doTestWithStdlib(fileName);
-            }
-
             @TestMetadata("enumValueOfMethod.kt")
             public void testEnumValueOfMethod() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt");
@@ -804,6 +798,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 doTestWithStdlib(fileName);
             }
 
+            @TestMetadata("enumNameOrdinal.kt")
+            public void testEnumNameOrdinal() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt");
+                doTestWithStdlib(fileName);
+            }
+
             @TestMetadata("extensionToArray.kt")
             public void testExtensionToArray() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt");