From c59160127486b2f5625f55d7475fc8ffd6f9e2c7 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sat, 30 Oct 2021 04:04:53 +0200 Subject: [PATCH] [LC] IDE LightClasses testdata update Unfortunately, the same testdata is used in IDE, so we should change testdata in compiler repo and this will affect IDE repo. This commit is the cherry-pick of commits from IDE repo: - 4310d730795a53a Fix UltraLightClassLoadingTestGenerated.testEnums(): check by Java file as ULC produces a different but better result Yan Zhulanow 3/17/21, 8:57 AM - fbe3c8ba0841f2d4 Disable comparison test for UltraLightClassSanityTestGenerated. testAnnotatedPropertyWithSites() Yan Zhulanow 3/18/21, 1:33 PM - 8fc53027343b5b53 Ignore known (for ages) broken behaviour of LC Vladimir Dolzhenko 3/19/21, 11:17 PM --- .../AnnotatedPropertyWithSites.kt | 4 +- .../ActualTypeAliasCustomJvmPackageName.kt | 3 +- .../compilationErrors/JvmPackageName.kt | 3 +- .../facades/SingleJvmClassName.kt | 3 +- .../ideRegression/AllOpenAnnotatedClasses.kt | 3 +- .../asJava/ultraLightClasses/enums.java | 45 ++++++++++--------- .../asJava/ultraLightClasses/enums.kt | 1 + 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt index f49c1845ab8..ffe3619f4d9 100644 --- a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt +++ b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt @@ -16,4 +16,6 @@ class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @propert set(value) {} } -// FIR_COMPARISON \ No newline at end of file +// FIR_COMPARISON +// SKIP_SANITY_TEST +// SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt index ef4652912a2..ac74e47e16c 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt @@ -5,4 +5,5 @@ package p actual typealias B = List -// FIR_COMPARISON \ No newline at end of file +// FIR_COMPARISON +// SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt index d537c6c4132..8bcd092656d 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt @@ -7,4 +7,5 @@ fun f() { } -// FIR_COMPARISON \ No newline at end of file +// FIR_COMPARISON +// SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt index 63e44d1f030..6ae5ab7680f 100644 --- a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt +++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt @@ -6,4 +6,5 @@ fun foo() { } -// FIR_COMPARISON \ No newline at end of file +// FIR_COMPARISON +// SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt b/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt index c7217cf8456..b37d790fa47 100644 --- a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt +++ b/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt @@ -23,4 +23,5 @@ class C { } } -// LAZINESS:NoLaziness \ No newline at end of file +// LAZINESS:NoLaziness +// SKIP_SANITY_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/ultraLightClasses/enums.java b/compiler/testData/asJava/ultraLightClasses/enums.java index bfd24153096..a9ae6e76277 100644 --- a/compiler/testData/asJava/ultraLightClasses/enums.java +++ b/compiler/testData/asJava/ultraLightClasses/enums.java @@ -26,17 +26,17 @@ public enum Color /* Color*/ { public enum ProtocolState /* ProtocolState*/ { WAITING { WAITING();// .ctor() - + @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() - + }, TALKING { TALKING();// .ctor() - + @org.jetbrains.annotations.NotNull() public ProtocolState signal();// signal() - + }; @org.jetbrains.annotations.NotNull() @@ -47,9 +47,9 @@ public enum ProtocolState /* ProtocolState*/ { class TALKING ... - + class WAITING ... - + } public static final class WAITING /* ProtocolState.WAITING*/ extends ProtocolState { @@ -68,44 +68,47 @@ public static final class TALKING /* ProtocolState.TALKING*/ extends ProtocolSta } -public enum IntArithmetics /* IntArithmetics*/ { +public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.BinaryOperator, java.util.function.IntBinaryOperator { PLUS { PLUS();// .ctor() - - public int apply(int, int);// apply(int, int) - + + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) + }, TIMES { TIMES();// .ctor() - - public int apply(int, int);// apply(int, int) - + + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) + }; - @org.jetbrains.annotations.NotNull() - public IntArithmetics applyAsInt(int, int);// applyAsInt(int, int) - private IntArithmetics();// .ctor() + public int applyAsInt(int, int);// applyAsInt(int, int) + class PLUS ... - + class TIMES ... - + } public static final class PLUS /* IntArithmetics.PLUS*/ extends IntArithmetics { PLUS();// .ctor() - public int apply(int, int);// apply(int, int) + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) } public static final class TIMES /* IntArithmetics.TIMES*/ extends IntArithmetics { TIMES();// .ctor() - public int apply(int, int);// apply(int, int) + @org.jetbrains.annotations.NotNull() + public java.lang.Integer apply(int, int);// apply(int, int) } @@ -118,4 +121,4 @@ public final class C /* C*/ { public C();// .ctor() -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/ultraLightClasses/enums.kt b/compiler/testData/asJava/ultraLightClasses/enums.kt index 8373de7f476..a4011b101f0 100644 --- a/compiler/testData/asJava/ultraLightClasses/enums.kt +++ b/compiler/testData/asJava/ultraLightClasses/enums.kt @@ -1,3 +1,4 @@ +// CHECK_BY_JAVA_FILE import java.util.function.*