From 9f786c00a7d63d9106c22f83720652cc855656ac Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sun, 7 Feb 2016 09:57:04 +0530
Subject: [PATCH] Fix test data after removing old annotation classes

---
 .../boxWithStdlib/annotations/annotatedObjectLiteral.kt  | 9 ++++-----
 .../codegen/bytecodeListing/InlineOnlyMultifile.txt      | 2 --
 .../codegen/bytecodeListing/annotations/kt9320.txt       | 7 -------
 .../codegen/bytecodeListing/emptyMultifileFacade.txt     | 2 --
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedObjectLiteral.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedObjectLiteral.kt
index 474b9aab1e8..8716d50d5f9 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedObjectLiteral.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedObjectLiteral.kt
@@ -4,12 +4,11 @@ fun box(): String {
     val v = @Ann("OK") object: My() {}
     val klass = v.javaClass
 
-    val annotations = klass.annotations
-    // Ann, kotlin.Metadata, kotlin.jvm.internal.KotlinClass
-    if (annotations.size != 3) return "Fail annotations size is ${annotations.size}: ${annotations.toList()}"
+    val annotations = klass.annotations.toList()
+    // Ann, kotlin.Metadata
+    if (annotations.size != 2) return "Fail annotations size is ${annotations.size}: $annotations"
     val annotation = annotations.filterIsInstance<Ann>().firstOrNull()
-                     ?: return "Fail no @Ann: ${annotations.toList()}"
+                     ?: return "Fail no @Ann: $annotations"
 
     return annotation.v
 }
-
diff --git a/compiler/testData/codegen/bytecodeListing/InlineOnlyMultifile.txt b/compiler/testData/codegen/bytecodeListing/InlineOnlyMultifile.txt
index d4ab545a2a1..9eed46549fb 100644
--- a/compiler/testData/codegen/bytecodeListing/InlineOnlyMultifile.txt
+++ b/compiler/testData/codegen/bytecodeListing/InlineOnlyMultifile.txt
@@ -1,11 +1,9 @@
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinMultifileClass
 public final class test/Foo {
     public final static method foo(): void
 }
 
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinMultifileClassPart
 synthetic final class test/Foo__InlineOnlyMultifileKt {
     public final static method foo(): void
     private final static method inlineOnly(): void
diff --git a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt b/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt
index e2d8574830f..8e530aca402 100644
--- a/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt
+++ b/compiler/testData/codegen/bytecodeListing/annotations/kt9320.txt
@@ -1,26 +1,21 @@
 @java.lang.annotation.Retention
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinClass
 public abstract class Ann
 
 @kotlin.annotation.Target
 @java.lang.annotation.Retention
 @java.lang.annotation.Target
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinClass
 public abstract class AnnExpr
 
 @Ann
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinClass
 public final class Kt9320Kt$foo$v$1 {
     inner class Kt9320Kt$foo$v$1
     method <init>(): void
 }
 
-@kotlin.jvm.internal.KotlinSyntheticClass
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinFunction
 final class Kt9320Kt$foo$w$1 {
     public final static field INSTANCE: Kt9320Kt$foo$w$1
     inner class Kt9320Kt$foo$w$1
@@ -31,7 +26,6 @@ final class Kt9320Kt$foo$w$1 {
 }
 
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinFileFacade
 public final class Kt9320Kt {
     inner class Kt9320Kt$foo$v$1
     inner class Kt9320Kt$foo$w$1
@@ -40,7 +34,6 @@ public final class Kt9320Kt {
 
 @Ann
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinClass
 public class My {
     public method <init>(): void
 }
diff --git a/compiler/testData/codegen/bytecodeListing/emptyMultifileFacade.txt b/compiler/testData/codegen/bytecodeListing/emptyMultifileFacade.txt
index 5d93f6222f6..1c3cb978a8c 100644
--- a/compiler/testData/codegen/bytecodeListing/emptyMultifileFacade.txt
+++ b/compiler/testData/codegen/bytecodeListing/emptyMultifileFacade.txt
@@ -1,9 +1,7 @@
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinMultifileClass
 public final class test/Foo
 
 @kotlin.Metadata
-@kotlin.jvm.internal.KotlinMultifileClassPart
 synthetic final class test/Foo__EmptyMultifileFacadeKt {
     private final static method privateOnly(): void
 }