[KAPT] Migrate kapt tests to new test infrastructure

2022-07-06 17:53:11 +03:00
parent fdf1b8b1c0
commit 9c41e75802
61 changed files with 1474 additions and 1133 deletions
@@ -1,14 +1,14 @@
 // CORRECT_ERROR_TYPES
 // NO_VALIDATION

-//FILE: lib/Anno.java
+// FILE: lib/Anno.java
 package lib;

 public @interface Anno {
    Class<?>[] impls() default {};
 }

-//FILE: lib/impl/Impl.java
+// FILE: lib/impl/Impl.java
 package lib.impl;

 public class Impl {}
@@ -1,4 +1,9 @@
-//FILE: lib/R.java
+// EXPECTED_ERROR: class B is public, should be declared in a file named B.java
+// EXPECTED_ERROR: class R is public, should be declared in a file named R.java
+// EXPECTED_ERROR: class R is public, should be declared in a file named R.java
+// EXPECTED_ERROR: class R2 is public, should be declared in a file named R2.java
+
+// FILE: lib/R.java
 package lib;

 public class R {
@@ -7,7 +12,7 @@ public class R {
    }
 }

-//FILE: app/R.java
+// FILE: app/R.java
 package app;

 public class R {
@@ -16,7 +21,7 @@ public class R {
    }
 }

-//FILE: app/R2.java
+// FILE: app/R2.java
 package app;

 public class R2 { // For ButterKnife library project support
@@ -25,7 +30,7 @@ public class R2 { // For ButterKnife library project support
    }
 }

-//FILE: app/B.java
+// FILE: app/B.java
 package app;

 public class B {
@@ -44,7 +49,7 @@ public class B {
    public final static String a9 = "A";
 }

-//FILE: lib/OnClick.java
+// FILE: lib/OnClick.java
 package lib;

 import java.lang.annotation.ElementType;
@@ -58,7 +63,7 @@ public @interface OnClick {
    int[] value() default {};
 }

-//FILE: test.kt
+// FILE: test.kt
 package app

 import lib.R as LibR
@@ -168,8 +173,3 @@ object JJ {
    val b = c()
    fun c() = "42"
 }
-
-// EXPECTED_ERROR class B is public, should be declared in a file named B.java
-// EXPECTED_ERROR class R is public, should be declared in a file named R.java
-// EXPECTED_ERROR class R is public, should be declared in a file named R.java
-// EXPECTED_ERROR class R2 is public, should be declared in a file named R2.java
@@ -1,4 +1,4 @@
-// !KEEP_KDOC_COMMENTS_IN_STUBS
+// DISABLED_FLAGS: KEEP_KDOC_COMMENTS_IN_STUBS
 /** Test. */
 class Test {
    /** method(). */
@@ -1,6 +1,11 @@
 // STRICT

-//FILE: test/ClassRefAnnotation.java
+// EXPECTED_ERROR: (kotlin:42:1) cannot find symbol
+// EXPECTED_ERROR: (other:-1:-1) test.PackedClass: Can't reference type 'RootClass' from default package in Java stub.
+// EXPECTED_ERROR: (other:-1:-1) test.PackedClass: Can't reference type 'AnotherRootClass' from default package in Java stub.
+// EXPECTED_ERROR: (other:-1:-1) test.PackedWithAnnotation: Can't reference type 'RootClass' from default package in Java stub.
+
+// FILE: test/ClassRefAnnotation.java

 package test;

@@ -15,13 +20,13 @@ public @interface ClassRefAnnotation {
    Class<?>[] value();
 }

-//FILE: a.kt
+// FILE: a.kt

 class RootClass

 class AnotherRootClass

-//FILE: b.kt
+// FILE: b.kt
 package test

 import java.lang.Number as JavaNumber
@@ -36,8 +41,3 @@ interface PackedClass {

@ClassRefAnnotation(RootClass::class)
 class PackedWithAnnotation
-
-// EXPECTED_ERROR(kotlin:14:1) cannot find symbol
-// EXPECTED_ERROR(other:-1:-1) test.PackedClass: Can't reference type 'RootClass' from default package in Java stub.
-// EXPECTED_ERROR(other:-1:-1) test.PackedClass: Can't reference type 'AnotherRootClass' from default package in Java stub.
-// EXPECTED_ERROR(other:-1:-1) test.PackedWithAnnotation: Can't reference type 'RootClass' from default package in Java stub.
@@ -1,7 +1,12 @@
 // CORRECT_ERROR_TYPES
 // STRICT

-//FILE: test/ClassRefAnnotation.java
+// EXPECTED_ERROR: (kotlin:43:1) cannot find symbol
+// EXPECTED_ERROR: (other:-1:-1) test.PackedClass: Can't reference type 'RootClass' from default package in Java stub.
+// EXPECTED_ERROR: (other:-1:-1) test.PackedClass: Can't reference type 'AnotherRootClass' from default package in Java stub.
+// EXPECTED_ERROR: (other:-1:-1) test.PackedWithAnnotation: Can't reference type 'RootClass' from default package in Java stub.
+
+// FILE: test/ClassRefAnnotation.java

 package test;

@@ -16,13 +21,13 @@ public @interface ClassRefAnnotation {
    Class<?>[] value();
 }

-//FILE: a.kt
+// FILE: a.kt

 class RootClass

 class AnotherRootClass

-//FILE: b.kt
+// FILE: b.kt
 package test

 import java.lang.Number as JavaNumber
@@ -37,8 +42,3 @@ interface PackedClass {

@ClassRefAnnotation(RootClass::class)
 class PackedWithAnnotation
-
-// EXPECTED_ERROR(kotlin:14:1) cannot find symbol
-// EXPECTED_ERROR(other:-1:-1) test.PackedClass: Can't reference type 'RootClass' from default package in Java stub.
-// EXPECTED_ERROR(other:-1:-1) test.PackedClass: Can't reference type 'AnotherRootClass' from default package in Java stub.
-// EXPECTED_ERROR(other:-1:-1) test.PackedWithAnnotation: Can't reference type 'RootClass' from default package in Java stub.
@@ -27,6 +27,6 @@ class ErrorInDeclarations {

 annotation class Anno(val a: KClass<Any>)

-// EXPECTED_ERROR(kotlin:11:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:6:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:12:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:11:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:6:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:12:1) cannot find symbol
@@ -1,5 +1,7 @@
 // CORRECT_ERROR_TYPES

+// EXPECTED_ERROR: (kotlin:16:5) cannot find symbol
+
 // FILE: a.kt
 package test

@@ -51,5 +53,3 @@ interface TestC {

    fun e(): LibFooBar
 }
-
-// EXPECTED_ERROR(kotlin:16:5) cannot find symbol
@@ -5,5 +5,5 @@ enum class Color {
@Anno(Color.`WHI-TE`)
 annotation class Anno(val color: Color)

-// EXPECTED_ERROR(kotlin:5:1) an enum annotation value must be an enum constant
-// EXPECTED_ERROR(other:-1:-1) 'WHI-TE' is an invalid Java enum value name
+// EXPECTED_ERROR: (kotlin:5:1) an enum annotation value must be an enum constant
+// EXPECTED_ERROR: (other:-1:-1) 'WHI-TE' is an invalid Java enum value name
@@ -10,4 +10,4 @@ class Foo(private val string: String) {
    }
 }

-// EXPECTED_ERROR(other:-1:-1) Can't generate a stub for 'Foo$Bar$Bar'.
+// EXPECTED_ERROR: (other:-1:-1) Can't generate a stub for 'Foo$Bar$Bar'.
@@ -15,6 +15,6 @@ class ErrorSomeMissingAnnotations

 annotation class Anno(val klass: KClass<*>)

-// EXPECTED_ERROR(kotlin:10:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:13:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:7:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:10:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:13:1) cannot find symbol
+// EXPECTED_ERROR: (kotlin:7:1) cannot find symbol
@@ -1,6 +1,6 @@
 // CORRECT_ERROR_TYPES

-// FILE: te/st/a/JavaClass
+// FILE: te/st/a/JavaClass.java
 package te.st.a;

 public class JavaClass {}
@@ -1,5 +1,16 @@
 package te.st.a;

+public class JavaClass {
+
+    public JavaClass() {
+        super();
+    }
+}
+
+////////////////////
+
+package te.st.a;
+
 import te.st.a.$Test.Inner;
 import te.st.a.Test$.Inner$;

@@ -11,4 +11,4 @@ class Test {
 // There are two errors (unresolved identifier ABC, BCD) actually.
 // But we specified the max error count, so the error output is limited.

-// EXPECTED_ERROR(kotlin:7:5) cannot find symbol
+// EXPECTED_ERROR: (kotlin:7:5) cannot find symbol
@@ -1,3 +1,6 @@
+// EXPECTED_ERROR: class J$B is public, should be declared in a file named J$B.java
+// EXPECTED_ERROR: class JavaClass is public, should be declared in a file named JavaClass.java
+
 // FILE: JavaClass.java
 public class JavaClass {
    public class Foo {
@@ -5,7 +8,7 @@ public class JavaClass {
    }
 }

-//FILE: J$B.java
+// FILE: J$B.java
 public class J$B {
    public class C {}

@@ -76,6 +79,3 @@ class Test1(val zoo: Foo.Bar.Zoo) : Foo.Bar(), IFoo.IBar, IFoo.IBar.IZoo {
    fun a(): Thread.State = Thread.State.NEW
    fun b(foo: JavaClass.Foo, bar: JavaClass.Foo.Bar) {}
 }
-
-// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
-// EXPECTED_ERROR class JavaClass is public, should be declared in a file named JavaClass.java
@@ -1,3 +1,5 @@
+// EXPECTED_ERROR: class J$B is public, should be declared in a file named J$B.java
+
 // FILE: test/JavaClass.java
 package test;

@@ -7,7 +9,7 @@ class JavaClass {
    }
 }

-//FILE: test/J$B.java
+// FILE: test/J$B.java
 package test;

 public class J$B {
@@ -82,5 +84,3 @@ class Test1(val zoo: Foo.Bar.Zoo) : Foo.Bar(), IFoo.IBar, IFoo.IBar.IZoo {
    fun a(): Thread.State = Thread.State.NEW
    fun b(foo: JavaClass.Foo, bar: JavaClass.Foo.Bar) {}
 }
-
-// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
@@ -5,7 +5,7 @@ public @interface Anno {
    String value();
 }

-//FILE: lib/R.java
+// FILE: lib/R.java
 package lib;

 public class R {
@@ -15,7 +15,6 @@ public class R {
 }

 // FILE: test.kt
-// WITH_STDLIB
 import lib.Anno
 import kotlin.reflect.KClass

@@ -37,4 +37,4 @@ class `A B` {
    class C
 }

-// EXPECTED_ERROR(other:-1:-1) '60x60' is an invalid Java enum value name
+// EXPECTED_ERROR: (other:-1:-1) '60x60' is an invalid Java enum value name
@@ -1,3 +1,5 @@
+// WITH_STDLIB
+
 package test

 internal annotation class MyAnnotation
@@ -36,12 +36,8 @@ package test;
 import java.lang.System;

@kotlin.Metadata()
-public enum EnumClass {
-    /*public static final*/ BLACK /* = new BLACK() */,
-    /*public static final*/ WHITE /* = new WHITE() */;
-
-    EnumClass() {
-    }
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface MyAnnotation {
 }

 ////////////////////
@@ -51,8 +47,12 @@ package test;
 import java.lang.System;

@kotlin.Metadata()
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public abstract @interface MyAnnotation {
+public enum EnumClass {
+    /*public static final*/ BLACK /* = new BLACK() */,
+    /*public static final*/ WHITE /* = new WHITE() */;
+
+    EnumClass() {
+    }
 }

 ////////////////////