Update tests after switching to LV 1.9

This commit is contained in:
Dmitriy Novozhilov
2023-01-23 11:34:48 +02:00
committed by Space Team
parent 66544a4e00
commit 88efa6bfb6
279 changed files with 1520 additions and 1239 deletions
@@ -0,0 +1,46 @@
@AllOpen
@java.lang.annotation.Retention(value=RUNTIME)
@kotlin.Metadata
public annotation class AllOpen {
// source: 'allOpenOnNotClasses.kt'
}
@AllOpen
@kotlin.Metadata
public final enum class Enum {
// source: 'allOpenOnNotClasses.kt'
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: Enum[]
private synthetic final static method $entries(): Enum[]
private synthetic final static method $values(): Enum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): Enum
public static method values(): Enum[]
}
@AllOpen
@kotlin.Metadata
public interface Intf {
// source: 'allOpenOnNotClasses.kt'
}
@kotlin.Metadata
public final class MyClass {
// source: 'allOpenOnNotClasses.kt'
private @AllOpen @org.jetbrains.annotations.NotNull field prop: java.lang.String
public method <init>(): void
public final @AllOpen @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
public final @AllOpen method method(): void
public final @AllOpen method setProp(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
}
@AllOpen
@kotlin.Metadata
public final class Obj {
// source: 'allOpenOnNotClasses.kt'
public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj
static method <clinit>(): void
private method <init>(): void
}
@@ -9,7 +9,9 @@ public annotation class AllOpen {
@kotlin.Metadata
public final enum class Enum {
// source: 'allOpenOnNotClasses.kt'
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: Enum[]
private synthetic final static method $entries(): Enum[]
private synthetic final static method $values(): Enum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -1,12 +1,15 @@
@kotlin.Metadata
final enum class TraceTest$Status {
// source: 'TraceTest.kt'
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: TraceTest$Status[]
public final enum static field END: TraceTest$Status
public final enum static field START: TraceTest$Status
private synthetic final static method $entries(): TraceTest$Status[]
private synthetic final static method $values(): TraceTest$Status[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): TraceTest$Status
public static method values(): TraceTest$Status[]
private final inner class TraceTest$Status
@@ -5,10 +5,11 @@ public final enum class test/E {
public final enum static field B: test.E
public static method values(): test.E[]
public static method valueOf(p0: java.lang.String): test.E
public static method getEntries(): kotlin.enums.EnumEntries
}
@kotlin.Metadata
public final class test/Test {
// source: 'test.kt'
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method anonymousWhenMapping(@org.jetbrains.annotations.NotNull p0: test.E): java.lang.String
}
}
@@ -5,6 +5,7 @@ public final enum class test/E {
public final enum static field B: test.E
public static method values(): test.E[]
public static method valueOf(p0: java.lang.String): test.E
public static method getEntries(): kotlin.enums.EnumEntries
}
@kotlin.Metadata
public synthetic final class test/Test$WhenMappings {
@@ -19,4 +20,4 @@ public final class test/Test {
public synthetic inner class test/Test$WhenMappings
public method <init>(): void
public final @org.jetbrains.annotations.NotNull method visibleWhenMapping(@org.jetbrains.annotations.NotNull p0: test.E): java.lang.String
}
}
@@ -11,6 +11,10 @@ public enum E {
public final void b() {
}
public static kotlin.enums.EnumEntries<E> getEntries() {
return null;
}
@kotlin.Metadata()
public static final class NestedClass {
@@ -45,6 +49,10 @@ public enum E2 {
}
public abstract void a();
public static kotlin.enums.EnumEntries<E2> getEntries() {
return null;
}
}
////////////////////
@@ -64,6 +72,10 @@ public enum E3 {
public final java.lang.String getA() {
return null;
}
public static kotlin.enums.EnumEntries<E3> getEntries() {
return null;
}
}
////////////////////
@@ -97,4 +109,8 @@ public enum E4 {
public final boolean getD() {
return false;
}
public static kotlin.enums.EnumEntries<E4> getEntries() {
return null;
}
}
@@ -59,6 +59,10 @@ public enum Enum {
public final int getX() {
return 0;
}
public static kotlin.enums.EnumEntries<test.Enum> getEntries() {
return null;
}
}
////////////////////
@@ -49,6 +49,10 @@ public enum Colors {
Colors() {
}
public static kotlin.enums.EnumEntries<Colors> getEntries() {
return null;
}
}
////////////////////
@@ -62,6 +66,10 @@ public enum Enum1 {
Enum1() {
}
public static kotlin.enums.EnumEntries<Enum1> getEntries() {
return null;
}
}
////////////////////
@@ -18,6 +18,10 @@ public enum EnumError {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String doIt();
public static kotlin.enums.EnumEntries<EnumError> getEntries() {
return null;
}
}
////////////////////
@@ -18,6 +18,10 @@ public enum EnumError {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String doIt();
public static kotlin.enums.EnumEntries<EnumError> getEntries() {
return null;
}
}
////////////////////
@@ -5,6 +5,10 @@ public enum Em {
Em() {
}
public static kotlin.enums.EnumEntries<Em> getEntries() {
return null;
}
}
////////////////////
@@ -5,6 +5,10 @@ public enum Em {
Em() {
}
public static kotlin.enums.EnumEntries<Em> getEntries() {
return null;
}
}
////////////////////
@@ -0,0 +1,17 @@
package kapt;
import kotlin.annotation.Repeatable;
@kotlin.Metadata()
public enum Options {
/*public static final*/ A /* = new Options() */,
/*public static final*/ B /* = new Options() */,
/*public static final*/ C /* = new Options() */;
Options() {
}
public static kotlin.enums.EnumEntries<kapt.Options> getEntries() {
return null;
}
}
@@ -22,6 +22,10 @@ public final class Test {
Example() {
}
public static kotlin.enums.EnumEntries<Test.Companion.Example> getEntries() {
return null;
}
}
}
}
@@ -53,6 +57,10 @@ public final class Test2 {
Example() {
}
public static kotlin.enums.EnumEntries<Test2.Amigo.Example> getEntries() {
return null;
}
}
}
}
@@ -84,6 +92,10 @@ public final class Test3 {
Example() {
}
public static kotlin.enums.EnumEntries<Test3.Amigo.Example> getEntries() {
return null;
}
}
}
}
@@ -162,6 +174,10 @@ public final class Test5 {
Example() {
}
public static kotlin.enums.EnumEntries<Test5.Amigos.Companion.Goo.Example> getEntries() {
return null;
}
}
}
}
@@ -0,0 +1,97 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface Anno1 {
public abstract java.lang.String value();
}
////////////////////
@kotlin.Metadata()
public enum Enum1 {
/*public static final*/ BLACK /* = new Enum1() */,
/*public static final*/ WHITE /* = new Enum1() */;
Enum1() {
}
public static kotlin.enums.EnumEntries<Enum1> getEntries() {
return null;
}
}
////////////////////
@kotlin.Metadata()
public enum Enum2 {
/*public static final*/ RED /* = new Enum2() */,
/*public static final*/ WHITE /* = new Enum2() */;
@org.jetbrains.annotations.NotNull()
private final java.lang.String col = null;
private final int col2 = 0;
Enum2(@Anno1(value = "first")
java.lang.String col, @Anno1(value = "second")
int col2) {
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String getCol() {
return null;
}
public final int getCol2() {
return 0;
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String color() {
return null;
}
private final void privateEnumFun() {
}
public final void publicEnumFun() {
}
public static kotlin.enums.EnumEntries<Enum2> getEntries() {
return null;
}
}
////////////////////
@kotlin.Metadata()
public abstract interface I {
@kotlin.Metadata()
public static enum Nested {
/*public static final*/ WHITE /* = new Nested() */;
Nested() {
}
public static kotlin.enums.EnumEntries<I.Nested> getEntries() {
return null;
}
}
}
////////////////////
@kotlin.Metadata()
public enum Nested1 {
/*public static final*/ WHITE /* = new Nested1() */;
Nested1() {
}
public static kotlin.enums.EnumEntries<Nested1> getEntries() {
return null;
}
}
@@ -0,0 +1,52 @@
@kotlin.Metadata()
public abstract class BaseClass {
public BaseClass(@org.jetbrains.annotations.NotNull()
Context context, int num, boolean bool) {
super();
}
@org.jetbrains.annotations.NotNull()
public abstract Result doJob();
}
////////////////////
@kotlin.Metadata()
public abstract interface Context {
}
////////////////////
@kotlin.Metadata()
public final class Inheritor extends BaseClass {
public Inheritor(@org.jetbrains.annotations.NotNull()
Context context) {
super(null, 0, false);
}
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public Result doJob() {
return null;
}
}
////////////////////
@kotlin.Metadata()
public enum Result {
/*public static final*/ SUCCESS /* = new Result() */,
/*public static final*/ ERROR /* = new Result() */;
Result() {
}
public static kotlin.enums.EnumEntries<Result> getEntries() {
return null;
}
}
@@ -0,0 +1,22 @@
@Anno(color = Color.InvalidFieldName)
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface Anno {
public abstract Color color();
}
////////////////////
@kotlin.Metadata()
public enum Color {
/*public static final*/ BLACK /* = new Color() */;
Color() {
}
public static kotlin.enums.EnumEntries<Color> getEntries() {
return null;
}
}
@@ -148,6 +148,10 @@ public final class Test {
NestedEnum() {
}
public static kotlin.enums.EnumEntries<Test.NestedEnum> getEntries() {
return null;
}
}
@kotlin.Metadata()
@@ -0,0 +1,231 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoArray {
public abstract int x();
public abstract java.lang.String[] a();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoBoolean {
public abstract int x();
public abstract boolean bool();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoChar {
public abstract int x();
public abstract char chr();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoClass {
public abstract int x();
public abstract java.lang.Class<Color> c();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoDouble {
public abstract int x();
public abstract double dbl();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoEnum {
public abstract int x();
public abstract Color c();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoFloat {
public abstract int x();
public abstract float flt();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoInt {
public abstract int x();
public abstract int i();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoIntArray {
public abstract int x();
public abstract int[] b();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoLong {
public abstract int x();
public abstract long l();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoLongArray {
public abstract int x();
public abstract long[] b();
}
////////////////////
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public abstract @interface AnnoString {
public abstract int x();
public abstract java.lang.String s();
}
////////////////////
@kotlin.Metadata()
public enum Color {
/*public static final*/ BLACK /* = new Color() */;
Color() {
}
public static kotlin.enums.EnumEntries<Color> getEntries() {
return null;
}
}
////////////////////
@kotlin.Metadata()
public final class Test {
@org.jetbrains.annotations.NotNull()
private final java.lang.String value = "";
public Test() {
super();
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String getValue() {
return null;
}
@lib.Anno(value = "1")
@lib.Anno(value = "2", construct = {"A", "B"})
@lib.Anno(value = "3", construct = {"C"})
@java.lang.Deprecated()
public static void getValue$annotations() {
}
}
////////////////////
@AnnoChar(x = lib.R.id.textView, chr = 'c')
@AnnoBoolean(x = lib.R.id.textView, bool = false)
@AnnoInt(x = lib.R.id.textView, i = 5)
@AnnoFloat(x = lib.R.id.textView, flt = 1.0F)
@AnnoDouble(x = lib.R.id.textView, dbl = 4.0)
@AnnoString(x = lib.R.id.textView, s = "AAA")
@AnnoIntArray(x = lib.R.id.textView, b = {1, 2, 3})
@AnnoLongArray(x = lib.R.id.textView, b = {1L, 3L})
@AnnoArray(x = lib.R.id.textView, a = {"A", "B"})
@AnnoClass(x = lib.R.id.textView, c = Color.class)
@kotlin.Metadata()
public final class Test2 {
public Test2() {
super();
}
}
////////////////////
package lib;
public @interface Anno {
String[] construct() default {};
String value();
}
////////////////////
package lib;
public class R {
public R() {
super();
}
public static class id {
public id() {
super();
}
public static final int textView = 100;
}
}
@@ -23,6 +23,10 @@ public enum StrangeEnum {
public final java.lang.String getSize() {
return null;
}
public static kotlin.enums.EnumEntries<StrangeEnum> getEntries() {
return null;
}
}
////////////////////
@@ -0,0 +1,48 @@
public abstract class BaseClass {
public BaseClass(@org.jetbrains.annotations.NotNull()
Context context, int num, boolean bool) {
super();
}
@org.jetbrains.annotations.NotNull()
public abstract Result doJob();
}
////////////////////
public abstract interface Context {
}
////////////////////
public final class Inheritor extends BaseClass {
public Inheritor(@org.jetbrains.annotations.NotNull()
Context context) {
super(null, 0, false);
}
@java.lang.Override()
@org.jetbrains.annotations.NotNull()
public Result doJob() {
return null;
}
}
////////////////////
public enum Result {
/*public static final*/ SUCCESS /* = new Result() */,
/*public static final*/ ERROR /* = new Result() */;
Result() {
}
public static kotlin.enums.EnumEntries<Result> getEntries() {
return null;
}
}
@@ -221,4 +221,8 @@ public enum State {
State() {
}
public static kotlin.enums.EnumEntries<State> getEntries() {
return null;
}
}
@@ -0,0 +1,48 @@
@NoArg
@kotlin.Metadata
public final enum class Colors {
// source: 'annoOnNotClass.kt'
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: Colors[]
public final enum static field RED: Colors
public final enum static field WHITE: Colors
private synthetic final static method $entries(): Colors[]
private synthetic final static method $values(): Colors[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): Colors
public static method values(): Colors[]
}
@NoArg
@kotlin.Metadata
public interface Intf {
// source: 'annoOnNotClass.kt'
}
@kotlin.Metadata
public final class MyClass {
// source: 'annoOnNotClass.kt'
private @NoArg @org.jetbrains.annotations.NotNull field abc: java.lang.String
public method <init>(p0: int): void
public final @NoArg @org.jetbrains.annotations.NotNull method getAbc(): java.lang.String
public final @NoArg method setAbc(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public final @NoArg method someFun(): void
}
@NoArg
@java.lang.annotation.Retention(value=RUNTIME)
@kotlin.Metadata
public annotation class NoArg {
// source: 'annoOnNotClass.kt'
}
@NoArg
@kotlin.Metadata
public final class Obj {
// source: 'annoOnNotClass.kt'
public final static @org.jetbrains.annotations.NotNull field INSTANCE: Obj
static method <clinit>(): void
private method <init>(): void
}
@@ -2,9 +2,11 @@
@kotlin.Metadata
public final enum class Colors {
// source: 'annoOnNotClass.kt'
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: Colors[]
public final enum static field RED: Colors
public final enum static field WHITE: Colors
private synthetic final static method $entries(): Colors[]
private synthetic final static method $values(): Colors[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -207,7 +207,10 @@ class ScriptingCompilerPluginTest : TestCase() {
}
val cp = (runtimeClasspath + scriptingClasspath + defsOut).joinToString(File.pathSeparator)
val exitCode = K2JVMCompiler().exec(System.err, "-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath)
val exitCode = K2JVMCompiler().exec(
System.err,
"-cp", cp, *(scriptFiles.toTypedArray()), "-d", scriptsOut2.canonicalPath, "-Xallow-any-scripts-in-source-roots"
)
Assert.assertEquals(ExitCode.OK, exitCode)
}
@@ -258,7 +258,9 @@ class ScriptingWithCliCompilerTest {
K2JVMCompiler(),
arrayOf(
"-P", "plugin:kotlin.scripting:disable-script-definitions-autoloading=true",
"-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path, "-verbose", fileArg)
"-cp", getMainKtsClassPath().joinToString(File.pathSeparator), "-d", tmpdir.path,
"-Xallow-any-scripts-in-source-roots", "-verbose", fileArg
)
)
}
Assert.assertEquals(0, ret.code)
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.script.loadScriptingPlugin
import org.jetbrains.kotlin.scripting.compiler.plugin.TestDisposable
import org.jetbrains.kotlin.scripting.compiler.plugin.updateWithBaseCompilerArguments
@@ -70,6 +71,7 @@ class CollectScriptCompilationDependenciesTest : TestCase() {
)
addKotlinSourceRoot(File(testDataPath, scriptFile).path)
put(CommonConfigurationKeys.ALLOW_ANY_SCRIPTS_IN_SOURCE_ROOTS, true)
loadScriptingPlugin(this)
}