jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ConstantValue-related testData for lightClasses tests

Browse Source 
TODO support custom language version settings for lightClasses tests
This commit is contained in:
Dmitry Petrov
2018-07-23 18:06:01 +03:00
parent 8f103dd8e5
commit 9dc2ad664d
22 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java vendored
View File

@@ -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 */ }

12
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt vendored
View File

@@ -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? = { "" }()
}

4
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java vendored
View File

@@ -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 */ }

4
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt vendored
View File

@@ -2,7 +2,7 @@
class ClassObjectField {
companion object {
val x: String? = ""
private val y: String? = ""
val x: String? = { "" }()
private val y: String? = { "" }()
}
}

8
compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java vendored
View File

@@ -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
compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt vendored
View File

@@ -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

2
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java vendored
View File

@@ -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 */ }

2
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt vendored
View File

@@ -7,5 +7,5 @@ interface Tr {
class C: Tr {
override fun foo() = 1
override val v = 1
override val v = { 1 }()
}