Fix ConstantValue-related testData for lightClasses tests

TODO support custom language version settings for lightClasses tests
2018-07-23 18:06:01 +03:00
parent 8f103dd8e5
commit 9dc2ad664d
22 changed files with 53 additions and 47 deletions
@@ -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 */ }

@@ -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" }()
 }
@@ -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 */ }
 }
@@ -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 }()
@@ -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 */ }
    }
@@ -3,6 +3,6 @@
 interface TraitClassObjectField {
    companion object {
        const val x: String? = ""
-        private val y: String? = ""
+        private val y: String? = { "" }()
    }
 }
@@ -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 */ }
@@ -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? = { "" }()
 }
@@ -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 */ }
@@ -2,7 +2,7 @@

 class ClassObjectField {
    companion object {
-        val x: String? = ""
-        private val y: String? = ""
+        val x: String? = { "" }()
+        private val y: String? = { "" }()
    }
 }
@@ -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 */ }
@@ -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
@@ -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 */ }
@@ -7,5 +7,5 @@ interface Tr {

 class C: Tr {
    override fun foo() = 1
-    override val v = 1
+    override val v = { 1 }()
 }
@@ -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 */ }
@@ -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"
 }
@@ -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 */ }
@@ -2,6 +2,6 @@

 class C {
    companion object {
-        @[kotlin.jvm.JvmField] public val foo: String = "A"
+        @[kotlin.jvm.JvmField] public val foo: String = { "A" }()
    }
 }
@@ -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 */ }
 }
@@ -1,5 +1,5 @@
 // C

 class C {
-    @[kotlin.jvm.JvmField] public val foo: String = "A"
+    @[kotlin.jvm.JvmField] public val foo: String = { "A" }()
 }
@@ -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 */ }
@@ -1,7 +1,7 @@
 // InnerClasses

 class Bar(val a: Int) {
-    val b: Int = 0
+    val b: Int = { 0 }()

    fun getAPlusB() = a + b