From fd57a436652393a6a5b7c6d943a4741394eaa4dd Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 25 Sep 2018 15:57:15 +0300 Subject: [PATCH] Update testData for ClassFileToSourceStubConverterTestGenerated --- .../kapt3-compiler/testData/converter/abstractEnum.txt | 9 +++------ .../kapt3/kapt3-compiler/testData/converter/comments.txt | 2 +- .../kapt3-compiler/testData/converter/defaultImpls.txt | 2 +- .../kapt3/kapt3-compiler/testData/converter/enums.txt | 3 +-- .../kapt3-compiler/testData/converter/ignoredMembers.txt | 2 +- .../kapt3-compiler/testData/converter/jvmStatic.txt | 2 +- .../testData/converter/jvmStaticFieldInParent.txt | 2 +- .../testData/converter/methodPropertySignatureClash.txt | 2 +- .../kapt3-compiler/testData/converter/modifiers.txt | 2 +- .../converter/nonExistentClassTypesConversion.txt | 2 +- .../testData/converter/propertyAnnotations.txt | 2 +- .../testData/converter/repeatableAnnotations.txt | 2 +- .../testData/converter/strangeIdentifiers.txt | 3 +-- .../kapt3/kapt3-compiler/testData/converter/topLevel.txt | 2 +- 14 files changed, 16 insertions(+), 21 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index 3424181a8cf..41ce56d7097 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt @@ -46,8 +46,7 @@ public enum E2 { E2(int n) { } - E2(@org.jetbrains.annotations.NotNull() - java.lang.String s) { + E2(java.lang.String s) { } } @@ -68,8 +67,7 @@ public enum E3 { return null; } - E3(@org.jetbrains.annotations.NotNull() - java.lang.String a) { + E3(java.lang.String a) { } } @@ -104,7 +102,6 @@ public enum E4 { return false; } - E4(@org.jetbrains.annotations.NotNull() - java.lang.String a, int b, long c, boolean d) { + E4(java.lang.String a, int b, long c, boolean d) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index 919c8c5ca17..5d135abd301 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt @@ -62,7 +62,7 @@ public final class Test { * prop2. */ @org.jetbrains.annotations.NotNull() - private final java.lang.String prop2 = null; + private final java.lang.String prop2 = ""; /** * method(). diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt index c1946ddb44e..7d77c0ee665 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt @@ -21,7 +21,7 @@ public abstract interface Intf { @kotlin.Metadata() public static final class Companion { - private static final int BLACK = 0; + private static final int BLACK = 1; public static final int WHITE = 2; public final int getBLACK() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index cfcca04c9bb..90bb77c418d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt @@ -54,8 +54,7 @@ public enum Enum2 { return 0; } - Enum2(@org.jetbrains.annotations.NotNull() - @Anno1(value = "first") + Enum2(@Anno1(value = "first") java.lang.String col, @Anno1(value = "second") int col2) { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index dc8a43e7bf2..5becde66c24 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt @@ -5,7 +5,7 @@ public final class Test { @org.jetbrains.annotations.NotNull() public final java.lang.String ignoredProperty = ""; @org.jetbrains.annotations.NotNull() - private final java.lang.String nonIgnoredProperty = null; + private final java.lang.String nonIgnoredProperty = ""; public final void nonIgnoredFun() { } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt index ef5ca87e84d..3990759e580 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt @@ -4,7 +4,7 @@ import java.lang.System; public final class JvmStaticTest { public final byte three = (byte)3; public final char d = 'D'; - private static final int one = 0; + private static final int one = 1; public static final int two = 2; public static final char c = 'C'; public static final JvmStaticTest.Companion Companion = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index 724afb5006f..07e90091af6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt @@ -3,7 +3,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() - private static final java.lang.String test = null; + private static final java.lang.String test = ""; public static final Test.A A = null; public Test() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt index e4bddbd527c..73e9d91ae0d 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt @@ -2,7 +2,7 @@ import java.lang.System; @kotlin.Metadata() public final class CrashMe { - private final int resources = 0; + private final int resources = 1; public final int getResources() { return 0; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index 06a3c57d1e1..3ba828dc35e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt @@ -29,7 +29,7 @@ import java.lang.System; @kotlin.Metadata() public final class Modifiers { @org.jetbrains.annotations.NotNull() - private final transient java.lang.String transientField = null; + private final transient java.lang.String transientField = ""; @org.jetbrains.annotations.NotNull() private volatile java.lang.String volatileField; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt index 8dbe0fef30e..47115b22c55 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt @@ -87,7 +87,7 @@ public final class Test { @org.jetbrains.annotations.NotNull() private final java.lang.Object m = null; @org.jetbrains.annotations.NotNull() - private final java.lang.String n = null; + private final java.lang.String n = ""; @org.jetbrains.annotations.NotNull() public java.util.List>>>>>>>>> o11; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index a29b48cfc4b..ea84001dfe8 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt @@ -25,7 +25,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() - private final java.lang.String prop = null; + private final java.lang.String prop = "A"; @Anno2() @Anno() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt index 4f5a6acadb1..2779b066bb0 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt @@ -184,7 +184,7 @@ import java.lang.System; @kotlin.Metadata() public final class Test { @org.jetbrains.annotations.NotNull() - private final java.lang.String value = null; + private final java.lang.String value = ""; @lib.Anno(value = "3", construct = {"C"}) @lib.Anno(value = "2", construct = {"A", "B"}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index ab926912259..d59d54435f9 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt @@ -25,8 +25,7 @@ public enum StrangeEnum { return null; } - StrangeEnum(@org.jetbrains.annotations.NotNull() - java.lang.String size) { + StrangeEnum(java.lang.String size) { } } diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt index bcd6097428f..d91d9bfa927 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt @@ -21,7 +21,7 @@ public final class TopLevelKt { public TopLevelKt() { super(); } - private static final int topLevelProperty = 0; + private static final int topLevelProperty = 2; public static final int topLevelConstProperty = 2; @org.jetbrains.annotations.Nullable()