Fix annotation collector tests (now using mock JDK)

plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt

@@ -1,14 +1,12 @@
 package org.test
 
-import javax.inject.*
-
-public class SomeClass {
+public data class SomeClass {
 
     public val immutableProperty: Int = 5
-        [Inject] get
+        [Deprecated] get
 
     public var mutableProperty: String = "String"
-        [Inject] get
-        [Inject] set
+        [Deprecated] get
+        [Deprecated] set
 
 }

plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt

@@ -1,8 +1,11 @@
-a javax.inject.Inject 0
+a kotlin.data 0
 p org.test 0
-m 0 0/SomeClass getImmutableProperty
-a org.jetbrains.annotations.NotNull 1
-f 1 0/SomeClass mutableProperty
-m 0 0/SomeClass getMutableProperty
+c 0 0/SomeClass
+a java.lang.Deprecated 1
+m 1 0/SomeClass getImmutableProperty
+a org.jetbrains.annotations.NotNull 2
+f 2 0/SomeClass mutableProperty
 m 1 0/SomeClass getMutableProperty
-m 0 0/SomeClass setMutableProperty
+m 2 0/SomeClass getMutableProperty
+m 1 0/SomeClass setMutableProperty
+m 2 0/SomeClass copy

plugins/annotation-collector/testData/collectToFile/annotationInSameFile/annotationInSameFile.kt

@@ -2,11 +2,9 @@ package org.test
 
 public annotation class SomeAnnotation
 
-SomeAnnotation
-public class SomeClass {
+SomeAnnotation public class SomeClass {
 
-    SomeAnnotation
-    public fun annotatedFunction() {
+    SomeAnnotation public fun annotatedFunction() {
 
     }
 

plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt

@@ -1,3 +1,3 @@
-a javax.inject.Inject 0
+a java.lang.Deprecated 0
 p org.test 0
 f 0 0/SomeClass$a$1 property

plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt

@@ -1,12 +1,10 @@
 package org.test
 
-import javax.inject.*
-
 public class SomeClass {
 
     private fun a() {
         object : Any() {
-            [Inject]
+            [Deprecated]
             val property: Int = 5
         }
 

plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt

@@ -1,4 +1,4 @@
-a javax.inject.Named 0
+a java.lang.Deprecated 0
 p org.test 0
 c 0 0/SomeClass
 c 0 0/SomeObject

plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt

@@ -1,9 +1,5 @@
 package org.test
 
-import javax.inject.*
+Deprecated public class SomeClass
 
-Named("KotlinClass")
-public class SomeClass
-
-Named("KotlinObject")
-public object SomeObject
+Deprecated public object SomeObject

plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt

@@ -1,8 +1,12 @@
-a javax.inject.Named 0
+a kotlin.data 0
 c 0 SomeClass
-a javax.inject.Inject 1
+a java.lang.Deprecated 1
 f 1 SomeClass annotatedProperty
 a org.jetbrains.annotations.Nullable 2
 f 2 SomeClass annotatedProperty
 m 2 SomeClass getAnnotatedProperty
 m 1 SomeClass annotatedFunction
+a kotlin.inline 3
+m 3 SomeClass annotatedFunction
+a org.jetbrains.annotations.NotNull 4
+m 4 SomeClass copy

plugins/annotation-collector/testData/collectToFile/defaultPackage/defaultPackage.kt

@@ -1,13 +1,8 @@
-import javax.inject.*
+data public class SomeClass {
 
-Named("KotlinClass")
-public class SomeClass {
+    [Deprecated] public var annotatedProperty: String? = null
 
-    Inject
-    public var annotatedProperty: String? = null
-
-    Inject
-    public fun annotatedFunction() {
+    Deprecated public inline fun annotatedFunction() {
 
     }
 

plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt

@@ -1,4 +1,4 @@
-a javax.inject.Inject 0
+a java.lang.Deprecated 0
 p org.test 0
 f 0 0/SomeClass annotatedVal
 a org.jetbrains.annotations.Nullable 1

plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt

@@ -1,13 +1,11 @@
 package org.test
 
-import javax.inject.*
-
 public class SomeClass {
 
-    Inject
+    Deprecated
     public val annotatedVal: String? = null
 
-    Inject
+    Deprecated
     public var annotatedVar: Int = 5
 
 }

plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt

@@ -1,9 +1,9 @@
-a javax.inject.Named 0
+a java.lang.Deprecated 0
 p org.test 0
 c 0 0/SomeClass$someFunction$LocalClass
-a javax.inject.Inject 1
+f 0 0/SomeClass$someFunction$LocalClass annotatedProperty
+a org.jetbrains.annotations.Nullable 1
 f 1 0/SomeClass$someFunction$LocalClass annotatedProperty
-a org.jetbrains.annotations.Nullable 2
-f 2 0/SomeClass$someFunction$LocalClass annotatedProperty
-m 2 0/SomeClass$someFunction$LocalClass getAnnotatedProperty
-m 1 0/SomeClass$someFunction$LocalClass annotatedFunction
+m 1 0/SomeClass$someFunction$LocalClass getAnnotatedProperty
+a kotlin.inline 2
+m 2 0/SomeClass$someFunction$LocalClass annotatedFunction

plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt

@@ -1,18 +1,13 @@
 package org.test
 
-import javax.inject.*
-
 public class SomeClass {
 
     public fun someFunction() {
-        [Named("LocalKotlinClass")]
-        class LocalClass {
+        [Deprecated] class LocalClass {
 
-            [Inject]
-            public var annotatedProperty: String? = null
+            public Deprecated var annotatedProperty: String? = null
 
-            [Inject]
-            public fun annotatedFunction() {
+            public inline fun annotatedFunction() {
 
             }
 

plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt

@@ -1,5 +1,3 @@
-a javax.inject.Inject 0
+a java.lang.Deprecated 0
 p org.test 0
-m 0 0/SomeClass annotatedFunction
-a javax.inject.Named 1
-m 1 0/SomeClass$annotatedFunction$1 invoke
+m 0 0/SomeClass$annotatedFunction$1 invoke

plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt

@@ -1,14 +1,10 @@
 package org.test
 
-import javax.inject.*
-
 public class SomeClass {
 
-    Inject
     public fun annotatedFunction() {
 
-        [Named("LocalFunction")]
-        fun localFunction() {
+        [Deprecated] fun localFunction() {
 
         }
 

plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt

@@ -1,4 +1,4 @@
-a javax.inject.Named 0
+a java.lang.Deprecated 0
 p org.test 0
 c 0 0/SomeClass$Companion
 a org.jetbrains.annotations.NotNull 1
@@ -7,5 +7,4 @@ c 0 0/SomeClass$SomeInnerObject
 c 0 0/SomeClass$InnerClass
 c 0 0/SomeClass$InnerClass$InnerClassInInnerClass
 c 0 0/SomeClass$NestedClass
-a java.lang.Deprecated 2
-f 2 0/SomeClass OBJECT$
+f 0 0/SomeClass OBJECT$

plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt

@@ -1,30 +1,28 @@
 package org.test
 
-import javax.inject.*
-
 public class SomeClass {
 
-    Named("CompanionObject")
+    Deprecated
     companion object {
 
     }
 
-    Named("KotlinInnerObject")
+    Deprecated
     object SomeInnerObject {
 
     }
 
-    Named("InnerClass")
+    Deprecated
     inner class InnerClass {
 
-        Named("InnerClassInInnerClass")
+        Deprecated
         inner class InnerClassInInnerClass {
 
         }
 
     }
 
-    Named("NestedClass")
+    Deprecated
     class NestedClass {
 
     }

plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt

@@ -1,7 +1,7 @@
 a kotlin.platform.platformStatic 0
 p org.test 0
 m 0 0/SomeClass$Companion a
-a javax.inject.Inject 1
+a kotlin.inline 1
 m 1 0/SomeClass$Companion a
 a org.jetbrains.annotations.NotNull 2
 m 2 0/SomeClass$Companion access$init$0

plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt

@@ -1,12 +1,11 @@
 package org.test
 
-import javax.inject.*
 import kotlin.platform.platformStatic
 
 public class SomeClass {
 
     companion object {
-        platformStatic Inject fun a() {
+        platformStatic inline fun a() {
 
         }
     }