From 3bcdee2a202b04db63f7e330cde733bcd2ee7c08 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 3 Jul 2015 22:15:47 +0300
Subject: [PATCH] publicField & field in companion object

---
 .../publicField/CompanionObject.java          | 13 +++++++++
 .../publicField/CompanionObject.kt            |  7 +++++
 .../Simple.java}                              |  0
 .../PublicField.kt => publicField/Simple.kt}  |  0
 .../asJava/KotlinLightClassTestGenerated.java | 27 ++++++++++++++-----
 5 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
 create mode 100644 compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
 rename compiler/testData/asJava/lightClasses/{nullabilityAnnotations/PublicField.java => publicField/Simple.java} (100%)
 rename compiler/testData/asJava/lightClasses/{nullabilityAnnotations/PublicField.kt => publicField/Simple.kt} (100%)

diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
new file mode 100644
index 00000000000..dcd3d456f9c
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
@@ -0,0 +1,13 @@
+public final class C {
+    @kotlin.jvm.publicField
+    public static final java.lang.String foo = "A";
+    public static final C.Companion Companion;
+
+    public C() { /* compiled code */ }
+
+    public static final class Companion {
+        private final java.lang.String getFoo() { /* compiled code */ }
+
+        private Companion() { /* compiled code */ }
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
new file mode 100644
index 00000000000..d51b5963d95
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
@@ -0,0 +1,7 @@
+// C
+
+class C {
+    companion object {
+        @[publicField] private val foo: String = "A"
+    }
+}
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PublicField.java b/compiler/testData/asJava/lightClasses/publicField/Simple.java
similarity index 100%
rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PublicField.java
rename to compiler/testData/asJava/lightClasses/publicField/Simple.java
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PublicField.kt b/compiler/testData/asJava/lightClasses/publicField/Simple.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PublicField.kt
rename to compiler/testData/asJava/lightClasses/publicField/Simple.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
index 802450251db..01d5419a21c 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
@@ -148,12 +148,6 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
             doTest(fileName);
         }
 
-        @TestMetadata("PublicField.kt")
-        public void testPublicField() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PublicField.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
@@ -196,4 +190,25 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
             doTest(fileName);
         }
     }
+
+    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PublicField extends AbstractKotlinLightClassTest {
+        public void testAllFilesPresentInPublicField() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("CompanionObject.kt")
+        public void testCompanionObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("Simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            doTest(fileName);
+        }
+    }
 }