azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix annotation collector tests (now using mock JDK)

Browse Source
This commit is contained in:
Yan Zhulanow
2015-05-20 16:02:51 +03:00
parent 921017367a
commit b9a9f783e9
19 changed files with 53 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotatedGettersSetters.kt
+4 -6
View File
@@ -1,14 +1,12 @@
package org.test package org.test
import javax.inject.* public data class SomeClass {
public class SomeClass {
public val immutableProperty: Int = 5 public val immutableProperty: Int = 5
[Inject] get [Deprecated] get
public var mutableProperty: String = "String" public var mutableProperty: String = "String"
[Inject] get [Deprecated] get
[Inject] set [Deprecated] set
} }
plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/annotations.txt
+9 -6
View File
@@ -1,8 +1,11 @@
a javax.inject.Inject 0 a kotlin.data 0
p org.test 0 p org.test 0
m 0 0/SomeClass getImmutableProperty c 0 0/SomeClass
a org.jetbrains.annotations.NotNull 1 a java.lang.Deprecated 1
f 1 0/SomeClass mutableProperty m 1 0/SomeClass getImmutableProperty
m 0 0/SomeClass getMutableProperty a org.jetbrains.annotations.NotNull 2
f 2 0/SomeClass mutableProperty
m 1 0/SomeClass getMutableProperty 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 -4
View File
@@ -2,11 +2,9 @@ package org.test
public annotation class SomeAnnotation public annotation class SomeAnnotation
SomeAnnotation SomeAnnotation public class SomeClass {
public class SomeClass {
SomeAnnotation SomeAnnotation public fun annotatedFunction() {
public fun annotatedFunction() {
} }
plugins/annotation-collector/testData/collectToFile/anonymousClasses/annotations.txt
+1 -1
View File
@@ -1,3 +1,3 @@
a javax.inject.Inject 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
f 0 0/SomeClass$a$1 property f 0 0/SomeClass$a$1 property
plugins/annotation-collector/testData/collectToFile/anonymousClasses/anonymousClasses.kt
+1 -3
View File
@@ -1,12 +1,10 @@
package org.test package org.test
import javax.inject.*
public class SomeClass { public class SomeClass {
private fun a() { private fun a() {
object : Any() { object : Any() {
[Inject] [Deprecated]
val property: Int = 5 val property: Int = 5
} }
plugins/annotation-collector/testData/collectToFile/classAnnotations/annotations.txt
+1 -1
View File
@@ -1,4 +1,4 @@
a javax.inject.Named 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
c 0 0/SomeClass c 0 0/SomeClass
c 0 0/SomeObject c 0 0/SomeObject
plugins/annotation-collector/testData/collectToFile/classAnnotations/classAnnotations.kt
+2 -6
View File
@@ -1,9 +1,5 @@
package org.test package org.test
import javax.inject.* Deprecated public class SomeClass
Named("KotlinClass") Deprecated public object SomeObject
public class SomeClass
Named("KotlinObject")
public object SomeObject
plugins/annotation-collector/testData/collectToFile/defaultPackage/annotations.txt
+6 -2
View File
@@ -1,8 +1,12 @@
a javax.inject.Named 0 a kotlin.data 0
c 0 SomeClass c 0 SomeClass
a javax.inject.Inject 1 a java.lang.Deprecated 1
f 1 SomeClass annotatedProperty f 1 SomeClass annotatedProperty
a org.jetbrains.annotations.Nullable 2 a org.jetbrains.annotations.Nullable 2
f 2 SomeClass annotatedProperty f 2 SomeClass annotatedProperty
m 2 SomeClass getAnnotatedProperty m 2 SomeClass getAnnotatedProperty
m 1 SomeClass annotatedFunction 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
+3 -8
View File
@@ -1,13 +1,8 @@
import javax.inject.* data public class SomeClass {
Named("KotlinClass") [Deprecated] public var annotatedProperty: String? = null
public class SomeClass {
Inject Deprecated public inline fun annotatedFunction() {
public var annotatedProperty: String? = null
Inject
public fun annotatedFunction() {
} }
plugins/annotation-collector/testData/collectToFile/fieldAnnotations/annotations.txt
+1 -1
View File
@@ -1,4 +1,4 @@
a javax.inject.Inject 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
f 0 0/SomeClass annotatedVal f 0 0/SomeClass annotatedVal
a org.jetbrains.annotations.Nullable 1 a org.jetbrains.annotations.Nullable 1
plugins/annotation-collector/testData/collectToFile/fieldAnnotations/fieldAnnotations.kt
+2 -4
View File
@@ -1,13 +1,11 @@
package org.test package org.test
import javax.inject.*
public class SomeClass { public class SomeClass {
Inject Deprecated
public val annotatedVal: String? = null public val annotatedVal: String? = null
Inject Deprecated
public var annotatedVar: Int = 5 public var annotatedVar: Int = 5
} }
plugins/annotation-collector/testData/collectToFile/localClasses/annotations.txt
+6 -6
View File
@@ -1,9 +1,9 @@
a javax.inject.Named 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
c 0 0/SomeClass$someFunction$LocalClass 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 f 1 0/SomeClass$someFunction$LocalClass annotatedProperty
a org.jetbrains.annotations.Nullable 2 m 1 0/SomeClass$someFunction$LocalClass getAnnotatedProperty
f 2 0/SomeClass$someFunction$LocalClass annotatedProperty a kotlin.inline 2
m 2 0/SomeClass$someFunction$LocalClass getAnnotatedProperty m 2 0/SomeClass$someFunction$LocalClass annotatedFunction
m 1 0/SomeClass$someFunction$LocalClass annotatedFunction
plugins/annotation-collector/testData/collectToFile/localClasses/localClasses.kt
+3 -8
View File
@@ -1,18 +1,13 @@
package org.test package org.test
import javax.inject.*
public class SomeClass { public class SomeClass {
public fun someFunction() { public fun someFunction() {
[Named("LocalKotlinClass")] [Deprecated] class LocalClass {
class LocalClass {
[Inject] public Deprecated var annotatedProperty: String? = null
public var annotatedProperty: String? = null
[Inject] public inline fun annotatedFunction() {
public fun annotatedFunction() {
} }
plugins/annotation-collector/testData/collectToFile/methodAnnotations/annotations.txt
+2 -4
View File
@@ -1,5 +1,3 @@
a javax.inject.Inject 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
m 0 0/SomeClass annotatedFunction m 0 0/SomeClass$annotatedFunction$1 invoke
a javax.inject.Named 1
m 1 0/SomeClass$annotatedFunction$1 invoke
plugins/annotation-collector/testData/collectToFile/methodAnnotations/methodAnnotations.kt
+1 -5
View File
@@ -1,14 +1,10 @@
package org.test package org.test
import javax.inject.*
public class SomeClass { public class SomeClass {
Inject
public fun annotatedFunction() { public fun annotatedFunction() {
[Named("LocalFunction")] [Deprecated] fun localFunction() {
fun localFunction() {
} }
plugins/annotation-collector/testData/collectToFile/nestedClasses/annotations.txt
+2 -3
View File
@@ -1,4 +1,4 @@
a javax.inject.Named 0 a java.lang.Deprecated 0
p org.test 0 p org.test 0
c 0 0/SomeClass$Companion c 0 0/SomeClass$Companion
a org.jetbrains.annotations.NotNull 1 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
c 0 0/SomeClass$InnerClass$InnerClassInInnerClass c 0 0/SomeClass$InnerClass$InnerClassInInnerClass
c 0 0/SomeClass$NestedClass c 0 0/SomeClass$NestedClass
a java.lang.Deprecated 2 f 0 0/SomeClass OBJECT$
f 2 0/SomeClass OBJECT$
plugins/annotation-collector/testData/collectToFile/nestedClasses/nestedClasses.kt
+5 -7
View File
@@ -1,30 +1,28 @@
package org.test package org.test
import javax.inject.*
public class SomeClass { public class SomeClass {
Named("CompanionObject") Deprecated
companion object { companion object {
} }
Named("KotlinInnerObject") Deprecated
object SomeInnerObject { object SomeInnerObject {
} }
Named("InnerClass") Deprecated
inner class InnerClass { inner class InnerClass {
Named("InnerClassInInnerClass") Deprecated
inner class InnerClassInInnerClass { inner class InnerClassInInnerClass {
} }
} }
Named("NestedClass") Deprecated
class NestedClass { class NestedClass {
} }
plugins/annotation-collector/testData/collectToFile/platformStatic/annotations.txt
+1 -1
View File
@@ -1,7 +1,7 @@
a kotlin.platform.platformStatic 0 a kotlin.platform.platformStatic 0
p org.test 0 p org.test 0
m 0 0/SomeClass$Companion a m 0 0/SomeClass$Companion a
a javax.inject.Inject 1 a kotlin.inline 1
m 1 0/SomeClass$Companion a m 1 0/SomeClass$Companion a
a org.jetbrains.annotations.NotNull 2 a org.jetbrains.annotations.NotNull 2
m 2 0/SomeClass$Companion access$init$0 m 2 0/SomeClass$Companion access$init$0
plugins/annotation-collector/testData/collectToFile/platformStatic/platformStatic.kt
+1 -2
View File
@@ -1,12 +1,11 @@
package org.test package org.test
import javax.inject.*
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
public class SomeClass { public class SomeClass {
companion object { companion object {
platformStatic Inject fun a() { platformStatic inline fun a() {
} }
} }