Fix test data after removing old annotation classes

This commit is contained in:
Alexander Udalov
2016-02-07 09:57:04 +05:30
parent 938a435346
commit 9f786c00a7
4 changed files with 4 additions and 16 deletions
@@ -4,12 +4,11 @@ fun box(): String {
val v = @Ann("OK") object: My() {} val v = @Ann("OK") object: My() {}
val klass = v.javaClass val klass = v.javaClass
val annotations = klass.annotations val annotations = klass.annotations.toList()
// Ann, kotlin.Metadata, kotlin.jvm.internal.KotlinClass // Ann, kotlin.Metadata
if (annotations.size != 3) return "Fail annotations size is ${annotations.size}: ${annotations.toList()}" if (annotations.size != 2) return "Fail annotations size is ${annotations.size}: $annotations"
val annotation = annotations.filterIsInstance<Ann>().firstOrNull() val annotation = annotations.filterIsInstance<Ann>().firstOrNull()
?: return "Fail no @Ann: ${annotations.toList()}" ?: return "Fail no @Ann: $annotations"
return annotation.v return annotation.v
} }
@@ -1,11 +1,9 @@
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinMultifileClass
public final class test/Foo { public final class test/Foo {
public final static method foo(): void public final static method foo(): void
} }
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinMultifileClassPart
synthetic final class test/Foo__InlineOnlyMultifileKt { synthetic final class test/Foo__InlineOnlyMultifileKt {
public final static method foo(): void public final static method foo(): void
private final static method inlineOnly(): void private final static method inlineOnly(): void
@@ -1,26 +1,21 @@
@java.lang.annotation.Retention @java.lang.annotation.Retention
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class Ann public abstract class Ann
@kotlin.annotation.Target @kotlin.annotation.Target
@java.lang.annotation.Retention @java.lang.annotation.Retention
@java.lang.annotation.Target @java.lang.annotation.Target
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public abstract class AnnExpr public abstract class AnnExpr
@Ann @Ann
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public final class Kt9320Kt$foo$v$1 { public final class Kt9320Kt$foo$v$1 {
inner class Kt9320Kt$foo$v$1 inner class Kt9320Kt$foo$v$1
method <init>(): void method <init>(): void
} }
@kotlin.jvm.internal.KotlinSyntheticClass
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinFunction
final class Kt9320Kt$foo$w$1 { final class Kt9320Kt$foo$w$1 {
public final static field INSTANCE: Kt9320Kt$foo$w$1 public final static field INSTANCE: Kt9320Kt$foo$w$1
inner class Kt9320Kt$foo$w$1 inner class Kt9320Kt$foo$w$1
@@ -31,7 +26,6 @@ final class Kt9320Kt$foo$w$1 {
} }
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinFileFacade
public final class Kt9320Kt { public final class Kt9320Kt {
inner class Kt9320Kt$foo$v$1 inner class Kt9320Kt$foo$v$1
inner class Kt9320Kt$foo$w$1 inner class Kt9320Kt$foo$w$1
@@ -40,7 +34,6 @@ public final class Kt9320Kt {
@Ann @Ann
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinClass
public class My { public class My {
public method <init>(): void public method <init>(): void
} }
@@ -1,9 +1,7 @@
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinMultifileClass
public final class test/Foo public final class test/Foo
@kotlin.Metadata @kotlin.Metadata
@kotlin.jvm.internal.KotlinMultifileClassPart
synthetic final class test/Foo__EmptyMultifileFacadeKt { synthetic final class test/Foo__EmptyMultifileFacadeKt {
private final static method privateOnly(): void private final static method privateOnly(): void
} }