From 1a5aedd27ab13cc974cad116061572bb97bc21e1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 27 Dec 2022 23:58:36 +0100 Subject: [PATCH] Kapt+JVM_IR: unignore some tests --- .../testData/converter/comments.kt | 2 - .../testData/converter/comments_ir.txt | 12 +-- .../testData/converter/javadoc.kt | 2 - .../testData/converter/javadoc_ir.txt | 97 +++++++++++++++++++ .../testData/converter/modifiers.kt | 2 - .../testData/converter/modifiers_ir.txt | 28 +++--- 6 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt index fb20102e45e..390a0feda5c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM_IR - /** Test. */ class Test { /** method(). */ diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt index 78cd47d494e..a89fe1c42a6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/comments_ir.txt @@ -1,7 +1,7 @@ -@kotlin.Metadata() -@java.lang.annotation.Target(value = {}) -@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) @kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.PROPERTY}) +@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +@java.lang.annotation.Target(value = {}) +@kotlin.Metadata() public abstract @interface Anno { } @@ -80,6 +80,9 @@ public final class Test { java.lang.String a) { } + /** + * prop2. + */ @org.jetbrains.annotations.NotNull() public final java.lang.String getProp2() { return null; @@ -100,9 +103,6 @@ public final class Test { java.lang.String v) { } - /** - * prop2. - */ @Anno() @java.lang.Deprecated() public static void getProp2$annotations() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.kt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.kt index c5bf0c52eb9..1b751d8fbcc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM_IR - package javadoc /** Simple */ diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt new file mode 100644 index 00000000000..64e2d65bec4 --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc_ir.txt @@ -0,0 +1,97 @@ +package javadoc; + +/** + * Simple + */ +@kotlin.Metadata() +public final class A { + + public A() { + super(); + } +} + +//////////////////// + +package javadoc; + +/** + * Multi + * line + * comment. + */ +@kotlin.Metadata() +public final class B { + + /** + * Nested + * member + * comment. + */ + @org.jetbrains.annotations.NotNull() + private final java.lang.String a = ""; + + /** + * Mixed + * tabs/spaces + */ + @org.jetbrains.annotations.NotNull() + private final java.lang.String b = ""; + + /** + * List: + * * first item + * * second item + */ + @org.jetbrains.annotations.NotNull() + private final java.lang.String c = ""; + + /** + * Without + * stars + */ + @org.jetbrains.annotations.NotNull() + private final java.lang.String d = ""; + + public B() { + super(); + } + + /** + * Nested + * member + * comment. + */ + @org.jetbrains.annotations.NotNull() + public final java.lang.String getA() { + return null; + } + + /** + * Mixed + * tabs/spaces + */ + @org.jetbrains.annotations.NotNull() + public final java.lang.String getB() { + return null; + } + + /** + * List: + * * first item + * * second item + */ + @org.jetbrains.annotations.NotNull() + public final java.lang.String getC() { + return null; + } + + /** + * Without + * stars + */ + @org.jetbrains.annotations.NotNull() + public final java.lang.String getD() { + return null; + } +} diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt index c886e8c099d..f4674580820 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND: JVM_IR - package modifiers public class PublicClass public constructor() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt index 234ab6779a4..77e03cc329c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers_ir.txt @@ -22,11 +22,11 @@ package modifiers; @kotlin.Metadata() public final class Modifiers { - @org.jetbrains.annotations.NotNull() @kotlin.jvm.Transient() - private final transient java.lang.String transientField = ""; @org.jetbrains.annotations.NotNull() + private final transient java.lang.String transientField = ""; @kotlin.jvm.Volatile() + @org.jetbrains.annotations.NotNull() private volatile java.lang.String volatileField = ""; public Modifiers() { @@ -51,21 +51,21 @@ public final class Modifiers { public final strictfp void strictFp() { } - @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmOverloads() + @org.jetbrains.annotations.NotNull() public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() java.lang.String a, int n) { return null; } - @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmOverloads() + @org.jetbrains.annotations.NotNull() public final java.lang.String overloads() { return null; } - @org.jetbrains.annotations.NotNull() @kotlin.jvm.JvmOverloads() + @org.jetbrains.annotations.NotNull() public final java.lang.String overloads(@org.jetbrains.annotations.NotNull() java.lang.String a) { return null; @@ -128,11 +128,11 @@ public class PublicClassProtectedConstructor { } @kotlin.Metadata() - public static abstract interface ProtectedInterface { + static abstract interface PrivateInterface { } @kotlin.Metadata() - static abstract interface PrivateInterface { + public static abstract interface ProtectedInterface { } } @@ -156,18 +156,17 @@ public abstract class SealedClass { } @kotlin.Metadata() - public static final class One extends modifiers.SealedClass { + public static final class Four extends modifiers.SealedClass.Three { - public One() { + public Four() { super(); } } @kotlin.Metadata() - public static class Two extends modifiers.SealedClass { + public static final class One extends modifiers.SealedClass { - public Two() { - super(); + public One() { } } @@ -180,10 +179,9 @@ public abstract class SealedClass { } @kotlin.Metadata() - public static final class Four extends modifiers.SealedClass.Three { + public static class Two extends modifiers.SealedClass { - public Four() { - super(); + public Two() { } } }