From 9dc2ad664da71f162b0b3a3fc8b4a0751a5cf3a9 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Mon, 23 Jul 2018 18:06:01 +0300
Subject: [PATCH] Fix ConstantValue-related testData for lightClasses tests

TODO support custom language version settings for lightClasses tests
---
 .../lightClasses/compilationErrors/SameName.java     |  8 ++++----
 .../lightClasses/compilationErrors/SameName.kt       |  8 ++++----
 .../compilationErrors/TopLevelDestructuring.java     |  2 +-
 .../compilationErrors/TopLevelDestructuring.kt       |  2 +-
 .../compilationErrors/TraitClassObjectField.java     |  2 +-
 .../compilationErrors/TraitClassObjectField.kt       |  2 +-
 .../lightClasses/nullabilityAnnotations/Class.java   |  8 ++++----
 .../lightClasses/nullabilityAnnotations/Class.kt     | 12 ++++++------
 .../nullabilityAnnotations/ClassObjectField.java     |  4 ++--
 .../nullabilityAnnotations/ClassObjectField.kt       |  4 ++--
 .../nullabilityAnnotations/FileFacade.java           |  8 ++++----
 .../nullabilityAnnotations/FileFacade.kt             | 12 ++++++------
 .../nullabilityAnnotations/IntOverridesAny.java      |  2 +-
 .../nullabilityAnnotations/IntOverridesAny.kt        |  2 +-
 .../asJava/lightClasses/object/SimpleObject.java     |  5 ++++-
 .../asJava/lightClasses/object/SimpleObject.kt       |  7 +++++--
 .../lightClasses/publicField/CompanionObject.java    |  2 +-
 .../lightClasses/publicField/CompanionObject.kt      |  2 +-
 .../asJava/lightClasses/publicField/Simple.java      |  2 +-
 .../asJava/lightClasses/publicField/Simple.kt        |  2 +-
 .../asJava/lightClasses/script/InnerClasses.java     |  2 +-
 .../asJava/lightClasses/script/InnerClasses.kts      |  2 +-
 22 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
index 12436ad2667..649cbde844a 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
@@ -1,8 +1,8 @@
 public final class A {
-    private final int i = 0;
-    private final java.lang.String i$1 = "";
-    private final java.lang.String j = "a";
-    private final java.lang.String j$1 = "b";
+    private final int i;
+    private final java.lang.String i$1;
+    private final java.lang.String j;
+    private final java.lang.String j$1;
 
     public final void f(int i, double s) { /* compiled code */ }
 
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt
index 921a4ba8d51..95c0dbf1bfe 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt
@@ -7,9 +7,9 @@ class A {
     fun g(i: Int, s: Double): Int {}
     fun g(s: Int, i: Double): String {}
 
-    private val i: Int = 0
-    private val i: String = ""
+    private val i: Int = { 0 }()
+    private val i: String = { "" }()
 
-    private val j: String = "a"
-    private val j: String = "b"
+    private val j: String = { "a" }()
+    private val j: String = { "b" }()
 }
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
index a2fcbb64d4d..b902fcdc688 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java
@@ -1,5 +1,5 @@
 public final class TopLevelDestructuringKt {
-    private static final int z = 3;
+    private static final int z;
 
     public static final int getZ() { /* compiled code */ }
 }
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt
index 40522a5eaa1..ecb2cbe776a 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt
@@ -4,4 +4,4 @@ data class Pair(val x: Int, val y: Int)
 
 val (x, y) = Pair(1, 2)
 
-val z = 3
+val z = { 3 }()
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
index 7b0fc96ccc6..68f7a5412f6 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java
@@ -6,7 +6,7 @@ public interface TraitClassObjectField {
     static final class Companion {
         @org.jetbrains.annotations.Nullable
         public static final java.lang.String x = "";
-        private static final java.lang.String y = "";
+        private static final java.lang.String y;
 
         private Companion() { /* compiled code */ }
     }
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt
index e0077c4d43a..8f33d5deddc 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt
@@ -3,6 +3,6 @@
 interface TraitClassObjectField {
     companion object {
         const val x: String? = ""
-        private val y: String? = ""
+        private val y: String? = { "" }()
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
index 691e332d330..d72adcd47fb 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java
@@ -1,14 +1,14 @@
 public final class Class {
     @org.jetbrains.annotations.Nullable
-    private final java.lang.String nullableVal = "";
+    private final java.lang.String nullableVal;
     @org.jetbrains.annotations.Nullable
     private java.lang.String nullableVar;
     @org.jetbrains.annotations.NotNull
-    private final java.lang.String notNullVal = "";
+    private final java.lang.String notNullVal;
     @org.jetbrains.annotations.NotNull
     private java.lang.String notNullVar;
-    private final java.lang.String privateNN = "";
-    private final java.lang.String privateN = "";
+    private final java.lang.String privateNN;
+    private final java.lang.String privateN;
 
     @org.jetbrains.annotations.NotNull
     public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
index b647fc18210..472a21861cf 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt
@@ -13,10 +13,10 @@ class Class {
     @Nullable fun nullableWithN(): String? = ""
     @NotNull fun nullableWithNN(): String? = ""
 
-    val nullableVal: String? = ""
-    var nullableVar: String? = ""
-    val notNullVal: String = ""
-    var notNullVar: String = ""
+    val nullableVal: String? = { "" }()
+    var nullableVar: String? = { "" }()
+    val notNullVal: String = { "" }()
+    var notNullVar: String = { "" }()
 
     val notNullValWithGet: String
         @[Nullable] get() = ""
@@ -32,6 +32,6 @@ class Class {
         @[NotNull] get() = ""
         @[NotNull] set(v) {}
 
-    private val privateNN: String = ""
-    private val privateN: String? = ""
+    private val privateNN: String = { "" }()
+    private val privateN: String? = { "" }()
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
index 355bac10ef2..6839e7c6c0f 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
@@ -1,7 +1,7 @@
 public final class ClassObjectField {
     @org.jetbrains.annotations.Nullable
-    private static final java.lang.String x = "";
-    private static final java.lang.String y = "";
+    private static final java.lang.String x;
+    private static final java.lang.String y;
     public static final ClassObjectField.Companion Companion;
 
     public ClassObjectField() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt
index 7fc70fcf897..78608f57db0 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt
@@ -2,7 +2,7 @@
 
 class ClassObjectField {
     companion object {
-        val x: String? = ""
-        private val y: String? = ""
+        val x: String? = { "" }()
+        private val y: String? = { "" }()
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
index ceb8eadfb66..07a2a1ef988 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java
@@ -1,14 +1,14 @@
 public final class FileFacadeKt {
     @org.jetbrains.annotations.Nullable
-    private static final java.lang.String nullableVal = "";
+    private static final java.lang.String nullableVal;
     @org.jetbrains.annotations.Nullable
     private static java.lang.String nullableVar;
     @org.jetbrains.annotations.NotNull
-    private static final java.lang.String notNullVal = "";
+    private static final java.lang.String notNullVal;
     @org.jetbrains.annotations.NotNull
     private static java.lang.String notNullVar;
-    private static final java.lang.String privateNn = "";
-    private static final java.lang.String privateN = "";
+    private static final java.lang.String privateNn;
+    private static final java.lang.String privateN;
 
     @org.jetbrains.annotations.NotNull
     public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt
index 1d9310124fb..701c8a635bd 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt
@@ -12,10 +12,10 @@ fun nullable(a: String?): String? = ""
 @Nullable fun nullableWithN(): String? = ""
 @NotNull fun nullableWithNN(): String? = ""
 
-val nullableVal: String? = ""
-var nullableVar: String? = ""
-val notNullVal: String = ""
-var notNullVar: String = ""
+val nullableVal: String? = { "" }()
+var nullableVar: String? = { "" }()
+val notNullVal: String = { "" }()
+var notNullVar: String = { "" }()
 
 val notNullValWithGet: String
     @[Nullable] get() = ""
@@ -31,6 +31,6 @@ var nullableVarWithGetSet: String?
     @NotNull get() = ""
     @NotNull set(v) {}
 
-private val privateNn: String = ""
-private val privateN: String? = ""
+private val privateNn: String = { "" }()
+private val privateN: String? = { "" }()
 private fun privateFun(a: String, b: String?): String? = null
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
index c104fc53d36..dd63e82a630 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java
@@ -1,5 +1,5 @@
 public final class C implements Tr {
-    private final int v = 1;
+    private final int v;
 
     @org.jetbrains.annotations.NotNull
     public java.lang.Integer foo() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt
index a9ac9a5d7b3..7cecb8265b0 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt
@@ -7,5 +7,5 @@ interface Tr {
 
 class C: Tr {
     override fun foo() = 1
-    override val v = 1
+    override val v = { 1 }()
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/object/SimpleObject.java
index 3497e73ffc6..3f7685201fb 100644
--- a/compiler/testData/asJava/lightClasses/object/SimpleObject.java
+++ b/compiler/testData/asJava/lightClasses/object/SimpleObject.java
@@ -1,7 +1,10 @@
 public final class A {
-    private static final int c = 1;
+    private static final int c;
     @org.jetbrains.annotations.NotNull
     private static java.lang.String v;
+    public static final int cc = 1;
+    @org.jetbrains.annotations.NotNull
+    public static final java.lang.String cv = "A";
     public static final pack.A INSTANCE;
 
     public final int getC() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.kt b/compiler/testData/asJava/lightClasses/object/SimpleObject.kt
index 57db04a7f06..eb4b44310f8 100644
--- a/compiler/testData/asJava/lightClasses/object/SimpleObject.kt
+++ b/compiler/testData/asJava/lightClasses/object/SimpleObject.kt
@@ -3,7 +3,10 @@
 package pack
 
 object A {
-    val c = 1
-    var v = "A"
+    val c = { 1 }()
+    var v = { "A" }()
     fun f() = 3
+
+    const val cc = 1
+    const val cv = "A"
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
index 804b1dcef0a..64bf879e26f 100644
--- a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
+++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java
@@ -1,7 +1,7 @@
 public final class C {
     @kotlin.jvm.JvmField
     @org.jetbrains.annotations.NotNull
-    public static final java.lang.String foo = "A";
+    public static final java.lang.String foo;
     public static final C.Companion Companion;
 
     public C() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
index 727d11a62b0..a59dfe74971 100644
--- a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
+++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt
@@ -2,6 +2,6 @@
 
 class C {
     companion object {
-        @[kotlin.jvm.JvmField] public val foo: String = "A"
+        @[kotlin.jvm.JvmField] public val foo: String = { "A" }()
     }
 }
diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.java b/compiler/testData/asJava/lightClasses/publicField/Simple.java
index 0b8485d6dc6..706bf671576 100644
--- a/compiler/testData/asJava/lightClasses/publicField/Simple.java
+++ b/compiler/testData/asJava/lightClasses/publicField/Simple.java
@@ -1,7 +1,7 @@
 public final class C {
     @kotlin.jvm.JvmField
     @org.jetbrains.annotations.NotNull
-    public final java.lang.String foo = "A";
+    public final java.lang.String foo;
 
     public C() { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.kt b/compiler/testData/asJava/lightClasses/publicField/Simple.kt
index 726a40a0cf9..3ad806b15c0 100644
--- a/compiler/testData/asJava/lightClasses/publicField/Simple.kt
+++ b/compiler/testData/asJava/lightClasses/publicField/Simple.kt
@@ -1,5 +1,5 @@
 // C
 
 class C {
-    @[kotlin.jvm.JvmField] public val foo: String = "A"
+    @[kotlin.jvm.JvmField] public val foo: String = { "A" }()
 }
diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/script/InnerClasses.java
index 88edae1b5e0..a86dda367e1 100644
--- a/compiler/testData/asJava/lightClasses/script/InnerClasses.java
+++ b/compiler/testData/asJava/lightClasses/script/InnerClasses.java
@@ -2,7 +2,7 @@ public class InnerClasses extends kotlin.script.templates.standard.ScriptTemplat
     public InnerClasses(java.lang.String[] p) { /* compiled code */ }
 
     public static final class Bar {
-        private final int b = 0;
+        private final int b;
         private final int a;
 
         public final int getB() { /* compiled code */ }
diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.kts b/compiler/testData/asJava/lightClasses/script/InnerClasses.kts
index 032168916f5..7a944057b52 100644
--- a/compiler/testData/asJava/lightClasses/script/InnerClasses.kts
+++ b/compiler/testData/asJava/lightClasses/script/InnerClasses.kts
@@ -1,7 +1,7 @@
 // InnerClasses
 
 class Bar(val a: Int) {
-    val b: Int = 0
+    val b: Int = { 0 }()
 
     fun getAPlusB() = a + b