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

Test data split between compiledJava tests and compiledKotlin tests

Browse Source 
Basically, this commit splits test data from the from java-txt-kt to two pairs java-txt and kt-txt.
This commit leads to some duplication in test data.
This is temporary: in the platform types branch the test data for LoadJava tests will be changed dramatically, so duplication will go away
This commit is contained in:
Andrey Breslav
2014-08-15 17:07:35 +04:00
parent 1533c0e9f3
commit 1933e30905
711 changed files with 6824 additions and 4231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.txt
+3
View File
@@ -3,8 +3,11 @@ package test
internal final annotation class A : kotlin.Annotation {
/*primary*/ public constructor A(/*0*/ a: kotlin.Int = ..., /*1*/ b: kotlin.String = ..., /*2*/ c: kotlin.String)
internal final val a: kotlin.Int
internal final fun <get-a>(): kotlin.Int
internal final val b: kotlin.String
internal final fun <get-b>(): kotlin.String
internal final val c: kotlin.String
internal final fun <get-c>(): kotlin.String
}
test.A(a = IntegerValueType(12): IntegerValueType(12), c = "Hello": kotlin.String) internal object SomeObject {
compiler/testData/lazyResolve/recursiveComparator/ClassObject.kt
-6
View File
@@ -1,6 +0,0 @@
package test
trait TheTrait {
class object {
}
}
compiler/testData/lazyResolve/recursiveComparator/ClassObject.txt
-8
View File
@@ -1,8 +0,0 @@
package test
internal trait TheTrait {
internal class object <class-object-for-TheTrait> {
/*primary*/ private constructor <class-object-for-TheTrait>()
}
}
compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.txt
+1
View File
@@ -1,6 +1,7 @@
package test
internal val some: test.SomeObject
internal fun <get-some>(): test.SomeObject
[ERROR : BadAnnotation]() internal object SomeObject {
/*primary*/ private constructor SomeObject()
compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt
+1
View File
@@ -1,6 +1,7 @@
package test
internal val some: test.SomeObject
internal fun <get-some>(): test.SomeObject
internal final annotation class BadAnnotation : kotlin.Annotation {
/*primary*/ public constructor BadAnnotation(/*0*/ s: kotlin.String)
compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.kt
-7
View File
@@ -1,7 +0,0 @@
package test
class Some {
TestAnnotation class object {
annotation class TestAnnotation
}
}
compiler/testData/lazyResolve/recursiveComparator/classObjectAnnotation.txt
-13
View File
@@ -1,13 +0,0 @@
package test
internal final class Some {
/*primary*/ public constructor Some()
test.Some.TestAnnotation() internal class object <class-object-for-Some> {
/*primary*/ private constructor <class-object-for-Some>()
internal final annotation class TestAnnotation : kotlin.Annotation {
/*primary*/ public constructor TestAnnotation()
}
}
}
compiler/testData/lazyResolve/recursiveComparator/enum.kt
-6
View File
@@ -1,6 +0,0 @@
package test
enum class Test(a : Int) {
A : Test(0)
B : Test(0) {}
}
compiler/testData/lazyResolve/recursiveComparator/enum.txt
-37
View File
@@ -1,37 +0,0 @@
package test
internal final enum class Test : kotlin.Enum<test.Test> {
/*primary*/ private constructor Test(/*0*/ a: kotlin.Int)
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
}
public enum entry A : test.Test {
/*primary*/ private constructor A()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-A> : test.Test.A {
/*primary*/ private constructor <class-object-for-A>()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
public enum entry B : test.Test {
/*primary*/ private constructor B()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-B> : test.Test.B {
/*primary*/ private constructor <class-object-for-B>()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
}
}
compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.txt
+2
View File
@@ -1,4 +1,6 @@
package test
internal val fromImported: kotlin.Int = 1
internal fun <get-fromImported>(): kotlin.Int
internal val normal: kotlin.Int = 1
internal fun <get-normal>(): kotlin.Int
compiler/testData/lazyResolve/recursiveComparator/genericFunction.kt
-3
View File
@@ -1,3 +0,0 @@
package test
fun <T> foo(t : T) : T {}
compiler/testData/lazyResolve/recursiveComparator/genericFunction.txt
-3
View File
@@ -1,3 +0,0 @@
package test
internal fun </*0*/ T> foo(/*0*/ t: T): T
compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.txt
+1
View File
@@ -1,6 +1,7 @@
package test
internal val inferTypeFromImportedFun: kotlin.Int
internal fun <get-inferTypeFromImportedFun>(): kotlin.Int
internal final class B : testOther.A {
/*primary*/ public constructor B()
compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.txt
+1
View File
@@ -1,3 +1,4 @@
package test
internal val a: [ERROR : Type for TestFun()]
internal fun <get-a>(): [ERROR : Type for TestFun()]
compiler/testData/lazyResolve/recursiveComparator/objectInClass.kt
-9
View File
@@ -1,9 +0,0 @@
package test
class A {
object B {
fun foo(a: Int) : String {
return ""
}
}
}
compiler/testData/lazyResolve/recursiveComparator/objectInClass.txt
-15
View File
@@ -1,15 +0,0 @@
package test
internal final class A {
/*primary*/ public constructor A()
internal object B {
/*primary*/ private constructor B()
internal final fun foo(/*0*/ a: kotlin.Int): kotlin.String
public class object <class-object-for-B> : test.A.B {
/*primary*/ private constructor <class-object-for-B>()
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ a: kotlin.Int): kotlin.String
}
}
}
compiler/testData/lazyResolve/recursiveComparator/objectMembers.kt
-7
View File
@@ -1,7 +0,0 @@
package test
object SomeObject {
fun test(a: Int) : Int {
return 0
}
}
compiler/testData/lazyResolve/recursiveComparator/objectMembers.txt
-11
View File
@@ -1,11 +0,0 @@
package test
internal object SomeObject {
/*primary*/ private constructor SomeObject()
internal final fun test(/*0*/ a: kotlin.Int): kotlin.Int
public class object <class-object-for-SomeObject> : test.SomeObject {
/*primary*/ private constructor <class-object-for-SomeObject>()
internal final override /*1*/ /*fake_override*/ fun test(/*0*/ a: kotlin.Int): kotlin.Int
}
}
compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.kt
-4
View File
@@ -1,4 +0,0 @@
package test
object Bar {
}
compiler/testData/lazyResolve/recursiveComparator/packageLevelObject.txt
-9
View File
@@ -1,9 +0,0 @@
package test
internal object Bar {
/*primary*/ private constructor Bar()
public class object <class-object-for-Bar> : test.Bar {
/*primary*/ private constructor <class-object-for-Bar>()
}
}
compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.txt
+1
View File
@@ -1,6 +1,7 @@
package test
internal val checkTypeProp: test.PropType? = null
internal fun <get-checkTypeProp>(): test.PropType?
internal final class PropType {
/*primary*/ public constructor PropType()
compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.txt
+1
View File
@@ -7,5 +7,6 @@ internal final class Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
internal final val a: kotlin.Int
internal final fun <get-a>(): kotlin.Int
}
}
compiler/testData/lazyResolve/recursiveComparator/varargIterator.txt
+1
View File
@@ -3,4 +3,5 @@ package test
internal final class CompositeIterator</*0*/ T> {
/*primary*/ public constructor CompositeIterator</*0*/ T>(/*0*/ vararg iterators: java.util.Iterator<T> /*kotlin.Array<java.util.Iterator<T>>*/)
internal final val iteratorsIter: kotlin.Iterator<java.util.Iterator<T>>
internal final fun <get-iteratorsIter>(): kotlin.Iterator<java.util.Iterator<T>>
}