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

Adjusted tests to the new DescriptorRenderer behaviour

Browse Source
This commit is contained in:
Michał Sapalski
2013-04-15 07:43:51 +02:00
committed by Andrey Breslav
parent 2352d86932
commit 7deec28b9c
406 changed files with 2360 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+6 -6
View File
@@ -3,14 +3,14 @@ package test
public trait ArraysInSubtypes : java.lang.Object {
public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public abstract override /*1*/ fun array() : jet.Array<jet.String>?
public abstract override /*1*/ fun listOfArray() : jet.MutableList<out jet.Array<jet.String>?>?
public abstract override /*1*/ fun objArray() : jet.Array<T>?
public abstract override /*1*/ fun array(): jet.Array<jet.String>?
public abstract override /*1*/ fun listOfArray(): jet.MutableList<out jet.Array<jet.String>?>?
public abstract override /*1*/ fun objArray(): jet.Array<T>?
}
public trait Super : java.lang.Object {
public abstract fun array() : jet.Array<jet.CharSequence>?
public abstract fun listOfArray() : jet.MutableList<out jet.Array<jet.CharSequence>?>?
public abstract fun objArray() : jet.Array<jet.Any>?
public abstract fun array(): jet.Array<jet.CharSequence>?
public abstract fun listOfArray(): jet.MutableList<out jet.Array<jet.CharSequence>?>?
public abstract fun objArray(): jet.Array<jet.Any>?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+2 -2
View File
@@ -3,11 +3,11 @@ package test
public trait MethodTypeParameterErased : java.lang.Object {
public trait Bug</*0*/ T> : java.lang.Object {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save() : RET?
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
}
public open class SubBug : test.MethodTypeParameterErased.Bug<jet.Any> {
public constructor SubBug()
public open fun save() : test.MethodTypeParameterErased.SubBug?
public open fun save(): test.MethodTypeParameterErased.SubBug?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+3 -3
View File
@@ -5,14 +5,14 @@ public open class RawSuperType : java.lang.Object {
public open inner class Derived : test.RawSuperType.Super<jet.Any?> {
public constructor Derived()
public open override /*1*/ fun foo(/*0*/ p0 : jet.Any?) : jet.Unit
public open override /*1*/ fun foo(/*0*/ p0: jet.Any?): jet.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public abstract fun foo(/*0*/ p0 : T?) : jet.Unit
public abstract fun foo(/*0*/ p0: T?): jet.Unit
}
}
package RawSuperType {
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function : (T?) -> jet.Unit) : test.RawSuperType.Super<T>
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T?) -> jet.Unit): test.RawSuperType.Super<T>
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+2 -2
View File
@@ -7,7 +7,7 @@ public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get() : test.ReturnInnerSubclassOfSupersInner.Sub<B>?
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B>?
}
}
@@ -16,7 +16,7 @@ public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
public/*package*/ open inner class Inner : java.lang.Object {
public/*package*/ constructor Inner()
public/*package*/ open fun get() : test.ReturnInnerSubclassOfSupersInner.Super<A>?
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+16 -16
View File
@@ -3,24 +3,24 @@ package test
public trait SubclassWithRawType : java.lang.Object {
public trait Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1() : jet.Array<jet.List<jet.String?>>?
public abstract override /*1*/ fun array2() : jet.Array<jet.List<jet.Any>>?
public abstract override /*1*/ fun boundWildcard1() : jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun boundWildcard2() : jet.MutableList<in jet.List<jet.Any>?>?
public abstract override /*1*/ fun simple1() : jet.MutableList<out jet.String?>?
public abstract override /*1*/ fun simple2() : jet.MutableList<out jet.List<jet.String>?>?
public abstract override /*1*/ fun simple3() : jet.MutableList<out jet.Any>?
public abstract override /*1*/ fun wildcard() : jet.MutableList<out jet.Any?>?
public abstract override /*1*/ fun array1(): jet.Array<jet.List<jet.String?>>?
public abstract override /*1*/ fun array2(): jet.Array<jet.List<jet.Any>>?
public abstract override /*1*/ fun boundWildcard1(): jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun boundWildcard2(): jet.MutableList<in jet.List<jet.Any>?>?
public abstract override /*1*/ fun simple1(): jet.MutableList<out jet.String?>?
public abstract override /*1*/ fun simple2(): jet.MutableList<out jet.List<jet.String>?>?
public abstract override /*1*/ fun simple3(): jet.MutableList<out jet.Any>?
public abstract override /*1*/ fun wildcard(): jet.MutableList<out jet.Any?>?
}
public trait Super : java.lang.Object {
public abstract fun array1() : jet.Array<jet.List<jet.Any?>>?
public abstract fun array2() : jet.Array<jet.List<jet.String>>?
public abstract fun boundWildcard1() : jet.MutableList<out jet.List<jet.Any?>?>?
public abstract fun boundWildcard2() : jet.MutableList<in jet.List<jet.String>?>?
public abstract fun simple1() : jet.MutableList<out jet.Any?>?
public abstract fun simple2() : jet.MutableList<out jet.Any?>?
public abstract fun simple3() : jet.MutableList<jet.String>?
public abstract fun wildcard() : jet.MutableList<out jet.Any?>?
public abstract fun array1(): jet.Array<jet.List<jet.Any?>>?
public abstract fun array2(): jet.Array<jet.List<jet.String>>?
public abstract fun boundWildcard1(): jet.MutableList<out jet.List<jet.Any?>?>?
public abstract fun boundWildcard2(): jet.MutableList<in jet.List<jet.String>?>?
public abstract fun simple1(): jet.MutableList<out jet.Any?>?
public abstract fun simple2(): jet.MutableList<out jet.Any?>?
public abstract fun simple3(): jet.MutableList<jet.String>?
public abstract fun wildcard(): jet.MutableList<out jet.Any?>?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+5 -5
View File
@@ -1,20 +1,20 @@
package test
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function : () -> jet.MutableList<jet.String?>) : test.TwoSuperclassesInconsistentGenericTypes
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> jet.MutableList<jet.String?>): test.TwoSuperclassesInconsistentGenericTypes
public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
public abstract fun foo() : jet.MutableList<jet.String?>
public abstract fun foo(): jet.MutableList<jet.String?>
public trait Other : java.lang.Object {
public abstract fun foo() : jet.MutableList<jet.String>?
public abstract fun foo(): jet.MutableList<jet.String>?
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun foo() : jet.MutableList<jet.String>
public open override /*2*/ fun foo(): jet.MutableList<jet.String>
}
}
package TwoSuperclassesInconsistentGenericTypes {
public /*synthesized*/ fun Other(/*0*/ function : () -> jet.MutableList<jet.String>?) : test.TwoSuperclassesInconsistentGenericTypes.Other
public /*synthesized*/ fun Other(/*0*/ function: () -> jet.MutableList<jet.String>?): test.TwoSuperclassesInconsistentGenericTypes.Other
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+6 -6
View File
@@ -3,20 +3,20 @@ package test
public trait TwoSuperclassesVarargAndNot : java.lang.Object {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Unit
}
public trait Super1 : java.lang.Object {
public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Unit
}
public trait Super2 : java.lang.Object {
public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
public abstract fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Unit
}
}
package TwoSuperclassesVarargAndNot {
public /*synthesized*/ fun Super1(/*0*/ function : (jet.Array<jet.String?>) -> jet.Unit) : test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function : (jet.Array<out jet.String?>?) -> jet.Unit) : test.TwoSuperclassesVarargAndNot.Super2
public /*synthesized*/ fun Super1(/*0*/ function: (jet.Array<jet.String?>) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (jet.Array<out jet.String?>?) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super2
}