Fix ConstantValue-related testData for loadJava tests

compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt

@@ -2,5 +2,5 @@
 package test
 
 class ClassVal() {
-    val aa = 1
+    val aa = { 1 }()
 }

compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt

@@ -2,6 +2,6 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val aa: kotlin.Int = 1
+    public final val aa: kotlin.Int
         public final fun <get-aa>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/prop/Constants.kt

@@ -1,19 +1,18 @@
 //ALLOW_AST_ACCESS
 package test
 
-val b: Byte = 100
-val b1: Byte = 1
-val s: Short = 20000
-val s1: Short = 1
-val i: Int = 2000000
-val i1: Short = 1
-val l: Long = 2000000000000L
-val l1: Long = 1
-val f: Float = 3.14f
-val d: Double = 3.14
-val bb: Boolean = true
-val c: Char = '\u03c0' // pi symbol
-val MAX_HIGH_SURROGATE: Char = '\uDBFF'
-val nl = '\n'
-
-val str: String = ":)"
+const val b: Byte = 100
+const val b1: Byte = 1
+const val s: Short = 20000
+const val s1: Short = 1
+const val i: Int = 2000000
+const val i1: Short = 1
+const val l: Long = 2000000000000L
+const val l1: Long = 1
+const val f: Float = 3.14f
+const val d: Double = 3.14
+const val bb: Boolean = true
+const val c: Char = '\u03c0' // pi symbol
+const val MAX_HIGH_SURROGATE: Char = '\uDBFF'
+const val nl = '\n'
+const val str: String = ":)"

compiler/testData/loadJava/compiledKotlin/prop/Constants.txt

@@ -1,32 +1,32 @@
 package test
 
-public val MAX_HIGH_SURROGATE: kotlin.Char = \uDBFF ('?')
+public const val MAX_HIGH_SURROGATE: kotlin.Char = \uDBFF ('?')
     public fun <get-MAX_HIGH_SURROGATE>(): kotlin.Char
-public val b: kotlin.Byte = 100.toByte()
+public const val b: kotlin.Byte = 100.toByte()
     public fun <get-b>(): kotlin.Byte
-public val b1: kotlin.Byte = 1.toByte()
+public const val b1: kotlin.Byte = 1.toByte()
     public fun <get-b1>(): kotlin.Byte
-public val bb: kotlin.Boolean = true
+public const val bb: kotlin.Boolean = true
     public fun <get-bb>(): kotlin.Boolean
-public val c: kotlin.Char = \u03C0 ('π')
+public const val c: kotlin.Char = \u03C0 ('π')
     public fun <get-c>(): kotlin.Char
-public val d: kotlin.Double = 3.14.toDouble()
+public const val d: kotlin.Double = 3.14.toDouble()
     public fun <get-d>(): kotlin.Double
-public val f: kotlin.Float = 3.14.toFloat()
+public const val f: kotlin.Float = 3.14.toFloat()
     public fun <get-f>(): kotlin.Float
-public val i: kotlin.Int = 2000000
+public const val i: kotlin.Int = 2000000
     public fun <get-i>(): kotlin.Int
-public val i1: kotlin.Short = 1.toShort()
+public const val i1: kotlin.Short = 1.toShort()
     public fun <get-i1>(): kotlin.Short
-public val l: kotlin.Long = 2000000000000.toLong()
+public const val l: kotlin.Long = 2000000000000.toLong()
     public fun <get-l>(): kotlin.Long
-public val l1: kotlin.Long = 1.toLong()
+public const val l1: kotlin.Long = 1.toLong()
     public fun <get-l1>(): kotlin.Long
-public val nl: kotlin.Char = \u000A ('\n')
+public const val nl: kotlin.Char = \u000A ('\n')
     public fun <get-nl>(): kotlin.Char
-public val s: kotlin.Short = 20000.toShort()
+public const val s: kotlin.Short = 20000.toShort()
     public fun <get-s>(): kotlin.Short
-public val s1: kotlin.Short = 1.toShort()
+public const val s1: kotlin.Short = 1.toShort()
     public fun <get-s1>(): kotlin.Short
-public val str: kotlin.String = ":)"
+public const val str: kotlin.String = ":)"
     public fun <get-str>(): kotlin.String

compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt

@@ -1,4 +1,4 @@
 //ALLOW_AST_ACCESS
 package test
 
-val nsVal = 1
+val nsVal = { 1 }()

compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt

@@ -1,4 +1,4 @@
 package test
 
-public val nsVal: kotlin.Int = 1
+public val nsVal: kotlin.Int
     public fun <get-nsVal>(): kotlin.Int

compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt

@@ -2,9 +2,9 @@
 package test
 
 open class BaseClass() {
-    open val shape = "square"
+    open val shape = { "square" }()
 }
 
 open class Subclass() : BaseClass() {
-    override open val shape = "circle"
+    override open val shape = { "circle" }()
 }

compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.txt

@@ -2,12 +2,12 @@ package test
 
 public open class BaseClass {
     /*primary*/ public constructor BaseClass()
-    public open val shape: kotlin.String = "square"
+    public open val shape: kotlin.String
         public open fun <get-shape>(): kotlin.String
 }
 
 public open class Subclass : test.BaseClass {
     /*primary*/ public constructor Subclass()
-    public open override /*1*/ val shape: kotlin.String = "circle"
+    public open override /*1*/ val shape: kotlin.String
         public open override /*1*/ fun <get-shape>(): kotlin.String
 }

compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt

@@ -6,5 +6,5 @@ interface Trait {
 }
 
 open class Subclass() : Trait {
-    override open val shape = "circle"
+    override open val shape = { "circle" }()
 }

compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.txt

@@ -2,7 +2,7 @@ package test
 
 public open class Subclass : test.Trait {
     /*primary*/ public constructor Subclass()
-    public open override /*1*/ val shape: kotlin.String = "circle"
+    public open override /*1*/ val shape: kotlin.String
         public open override /*1*/ fun <get-shape>(): kotlin.String
 }
 

compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt

@@ -2,7 +2,7 @@
 package test
 
 open class BaseClass() {
-    val exactly = 17
+    val exactly = { 17 }()
 }
 
 class Subclass() : BaseClass() {

compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt

@@ -2,7 +2,7 @@ package test
 
 public open class BaseClass {
     /*primary*/ public constructor BaseClass()
-    public final val exactly: kotlin.Int = 17
+    public final val exactly: kotlin.Int
         public final fun <get-exactly>(): kotlin.Int
 }
 

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt

@@ -2,13 +2,13 @@
 package test
 
 class ClassVal() {
-    val property1 = 1
+    val property1 = { 1 }()
 
-    internal val property2 = 1
+    internal val property2 = { 1 }()
 
     private val property3 = Object()
 
-    protected val property4: String = ""
+    protected val property4: String = { "" }()
 
-    public val property5: Int = 1
+    public val property5: Int = { 1 }()
 }

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt

@@ -2,14 +2,14 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val property1: kotlin.Int = 1
+    public final val property1: kotlin.Int
         public final fun <get-property1>(): kotlin.Int
-    internal final val property2: kotlin.Int = 1
+    internal final val property2: kotlin.Int
         internal final fun <get-property2>(): kotlin.Int
     private final val property3: java.lang.Object
         private final fun <get-property3>(): java.lang.Object
-    protected final val property4: kotlin.String = ""
+    protected final val property4: kotlin.String
         protected final fun <get-property4>(): kotlin.String
-    public final val property5: kotlin.Int = 1
+    public final val property5: kotlin.Int
         public final fun <get-property5>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt

@@ -2,19 +2,19 @@
 package test
 
 class ClassVal() {
-    val property1 = 1
+    val property1 = { 1 }()
       get
 
-    internal val property2 = 1
+    internal val property2 = { 1 }()
       get
 
     private val property3 = Object()
       get
 
-    protected val property4: String = ""
+    protected val property4: String = { "" }()
       get
 
-    public val property5: Int = 1
+    public val property5: Int = { 1 }()
       get
 }
 

compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt

@@ -2,14 +2,14 @@ package test
 
 public final class ClassVal {
     /*primary*/ public constructor ClassVal()
-    public final val property1: kotlin.Int = 1
+    public final val property1: kotlin.Int
         public final fun <get-property1>(): kotlin.Int
-    internal final val property2: kotlin.Int = 1
+    internal final val property2: kotlin.Int
         internal final fun <get-property2>(): kotlin.Int
     private final val property3: java.lang.Object
         private final fun <get-property3>(): java.lang.Object
-    protected final val property4: kotlin.String = ""
+    protected final val property4: kotlin.String
         protected final fun <get-property4>(): kotlin.String
-    public final val property5: kotlin.Int = 1
+    public final val property5: kotlin.Int
         public final fun <get-property5>(): kotlin.Int
 }

compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.kt

@@ -0,0 +1,19 @@
+// !LANGUAGE: -NoConstantValueAttributeForNonConstVals
+//ALLOW_AST_ACCESS
+
+package test
+val nonConstVal1 = 1
+
+class C {
+    val nonConstVal2 = 2
+
+    companion object {
+        val nonConstVal3 = 3
+    }
+}
+
+interface I {
+    companion object {
+        val nonConstVal4 = 4
+    }
+}

compiler/testData/loadJava/compiledKotlin/prop/nonConstValWithConstantValueAttribute.txt

@@ -0,0 +1,25 @@
+package test
+
+public val nonConstVal1: kotlin.Int = 1
+    public fun <get-nonConstVal1>(): kotlin.Int
+
+public final class C {
+    /*primary*/ public constructor C()
+    public final val nonConstVal2: kotlin.Int = 2
+        public final fun <get-nonConstVal2>(): kotlin.Int
+
+    public companion object Companion {
+        /*primary*/ private constructor Companion()
+        public final val nonConstVal3: kotlin.Int = 3
+            public final fun <get-nonConstVal3>(): kotlin.Int
+    }
+}
+
+public interface I {
+
+    public companion object Companion {
+        /*primary*/ private constructor Companion()
+        public final val nonConstVal4: kotlin.Int = 4
+            public final fun <get-nonConstVal4>(): kotlin.Int
+    }
+}