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/renderer/Classes.kt
+10 -10
View File
@@ -4,9 +4,9 @@ annotation class TheAnnotation
[TheAnnotation]
public open class TheClass<out T : Int, X> {
private val privateVal : Int = 5
private val privateVal: Int = 5
val shouldBeFinal : Int = 5
val shouldBeFinal: Int = 5
protected abstract fun foo() {}
@@ -20,13 +20,13 @@ trait TheTrait {
fun abstractFun()
class object : TheClass<Int, Int> {
fun classObjectFunction() : Int {}
fun classObjectFunction(): Int {}
}
}
public class WithReified<reified A, reified out B>
public trait TwoUpperBounds<T> where T: Number, T: Any
public trait TwoUpperBounds<T> where T : Number, T : Any
//package rendererTest defined in root package
//internal final annotation class TheAnnotation : jet.Annotation defined in rendererTest
@@ -35,21 +35,21 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
//public constructor TheClass<out T : jet.Int, X>() defined in rendererTest.TheClass
//<out T : jet.Int> defined in rendererTest.TheClass
//<X> defined in rendererTest.TheClass
//private final val privateVal : jet.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass
//protected abstract fun foo() : jet.Unit defined in rendererTest.TheClass
//private final val privateVal: jet.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal: jet.Int defined in rendererTest.TheClass
//protected abstract fun foo(): jet.Unit defined in rendererTest.TheClass
//private final class Inner defined in rendererTest.TheClass
//public constructor Inner() defined in rendererTest.TheClass.Inner
//internal final class InternalClass defined in rendererTest
//public constructor InternalClass() defined in rendererTest.InternalClass
//internal trait TheTrait defined in rendererTest
//internal abstract fun abstractFun() : jet.Unit defined in rendererTest.TheTrait
//internal abstract fun abstractFun(): jet.Unit defined in rendererTest.TheTrait
//internal class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
//private constructor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//internal final fun classObjectFunction(): jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
//public final class WithReified<reified A, reified out B> defined in rendererTest
//public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
//<reified A> defined in rendererTest.WithReified
//<reified out B> defined in rendererTest.WithReified
//public trait TwoUpperBounds<T> where T : jet.Number, T : jet.Any defined in rendererTest
//public trait TwoUpperBounds<T : jet.Number> where T : jet.Any defined in rendererTest
//<T : jet.Number & jet.Any> defined in rendererTest.TwoUpperBounds
compiler/testData/renderer/Enum.kt
+5 -5
View File
@@ -1,13 +1,13 @@
package rendererTest
private enum class TheEnum(val rgb : Int) {
VAL1 : TheEnum(0xFF0000)
private enum class TheEnum(val rgb: Int) {
VAL1: TheEnum(0xFF0000)
}
//package rendererTest defined in root package
//private final enum class TheEnum : jet.Enum<rendererTest.TheEnum> defined in rendererTest
//private constructor TheEnum(rgb : jet.Int) defined in rendererTest.TheEnum
//value-parameter val rgb : jet.Int defined in rendererTest.TheEnum.<init>
//private constructor TheEnum(rgb: jet.Int) defined in rendererTest.TheEnum
//value-parameter val rgb: jet.Int defined in rendererTest.TheEnum.<init>
//private enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
//private constructor VAL1() defined in rendererTest.TheEnum.VAL1
//public final val VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
//public final val VAL1: rendererTest.TheEnum defined in rendererTest.TheEnum.<class-object-for-TheEnum>
compiler/testData/renderer/ErrorType.kt
+2 -2
View File
@@ -1,3 +1,3 @@
val a : E = 0
val a: E = 0
//internal val a : [ERROR : E] defined in root package
//internal val a: [ERROR : E] defined in root package
compiler/testData/renderer/FunctionTypes.kt
+16 -16
View File
@@ -1,18 +1,18 @@
var v1 : () -> Unit
var v2 : (Int) -> Int
var v3 : (Int, String) -> String
var v4 : Function1<Int, String>
var v4 : (() -> Int, (String) -> Unit) -> String
var v5 : Int.() -> Int
var v6 : Int.(String, Int) -> Unit
var v7 : ExtensionFunction1<Int, String, Boolean>
var v1: () -> Unit
var v2: (Int) -> Int
var v3: (Int, String) -> String
var v4: Function1<Int, String>
var v4: (() -> Int, (String) -> Unit) -> String
var v5: Int.() -> Int
var v6 : Int.(String, Int) -> Unit
var v7 : ExtensionFunction1<Int, String, Boolean>
//internal var v1 : () -> jet.Unit defined in root package
//internal var v2 : (jet.Int) -> jet.Int defined in root package
//internal var v3 : (jet.Int, jet.String) -> jet.String defined in root package
//internal var v4 : (jet.Int) -> jet.String defined in root package
//internal var v4 : (() -> jet.Int, (jet.String) -> jet.Unit) -> jet.String defined in root package
//internal var v5 : jet.Int.() -> jet.Int defined in root package
//internal var v6 : jet.Int.(jet.String, jet.Int) -> jet.Unit defined in root package
//internal var v7 : jet.Int.(jet.String) -> jet.Boolean defined in root package
//internal var v1: () -> jet.Unit defined in root package
//internal var v2: (jet.Int) -> jet.Int defined in root package
//internal var v3: (jet.Int, jet.String) -> jet.String defined in root package
//internal var v4: (jet.Int) -> jet.String defined in root package
//internal var v4: (() -> jet.Int, (jet.String) -> jet.Unit) -> jet.String defined in root package
//internal var v5: jet.Int.() -> jet.Int defined in root package
//internal var v6: jet.Int.(jet.String, jet.Int) -> jet.Unit defined in root package
//internal var v7: jet.Int.(jet.String) -> jet.Boolean defined in root package
compiler/testData/renderer/GlobalFunctions.kt
+17 -17
View File
@@ -2,15 +2,15 @@ package rendererTest
public fun pub() {}
internal fun int : String {}
internal fun int: String {}
fun int2(vararg ints : Int) : Int = 5
fun int2(vararg ints: Int): Int = 5
private fun prv(a : String, b : Int = 5) = 5
private fun prv(a: String, b: Int = 5) = 5
public fun Int.ext() : Int {}
public fun Int.ext(): Int {}
public fun <out T> withTypeParam(a : Array<T>) : Int {}
public fun <out T> withTypeParam(a: Array<T>): Int {}
trait Foo
trait Bar
@@ -20,19 +20,19 @@ fun <P> funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17
deprecated("") fun deprecatedFun()
//package rendererTest defined in root package
//public fun pub() : jet.Unit defined in rendererTest
//internal fun int() : jet.String defined in rendererTest
//internal fun int2(vararg ints : jet.Int) : jet.Int defined in rendererTest
//value-parameter vararg val ints : jet.Int defined in rendererTest.int2
//private fun prv(a : jet.String, b : jet.Int = ...) : jet.Int defined in rendererTest
//value-parameter val a : jet.String defined in rendererTest.prv
//value-parameter val b : jet.Int = ... defined in rendererTest.prv
//public fun jet.Int.ext() : jet.Int defined in rendererTest
//public fun <out T> withTypeParam(a : jet.Array<T>) : jet.Int defined in rendererTest
//public fun pub(): jet.Unit defined in rendererTest
//internal fun int(): jet.String defined in rendererTest
//internal fun int2(vararg ints: jet.Int): jet.Int defined in rendererTest
//value-parameter vararg val ints: jet.Int defined in rendererTest.int2
//private fun prv(a: jet.String, b: jet.Int = ...): jet.Int defined in rendererTest
//value-parameter val a: jet.String defined in rendererTest.prv
//value-parameter val b: jet.Int = ... defined in rendererTest.prv
//public fun jet.Int.ext(): jet.Int defined in rendererTest
//public fun <out T> withTypeParam(a: jet.Array<T>): jet.Int defined in rendererTest
//<out T> defined in rendererTest.withTypeParam
//value-parameter val a : jet.Array<T> defined in rendererTest.withTypeParam
//value-parameter val a: jet.Array<T> defined in rendererTest.withTypeParam
//internal trait Foo defined in rendererTest
//internal trait Bar defined in rendererTest
//internal fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest
//internal fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): jet.Int where P : rendererTest.Bar defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//jet.deprecated internal fun deprecatedFun() : jet.Unit defined in rendererTest
//jet.deprecated internal fun deprecatedFun(): jet.Unit defined in rendererTest
compiler/testData/renderer/GlobalProperties.kt
+13 -13
View File
@@ -2,28 +2,28 @@ package rendererTest
public val pub = ""
internal var int : String = ""
internal var int: String = ""
val int2 : Int = 5
val int2: Int = 5
private var private = 5
public val Int.ext : Int
public val Int.ext: Int
get() {}
deprecated("") val deprecatedVal = 5
public val <T> T.extWithTwoUpperBounds: Int where T: CharSequence, T: Number
public val <T> T.extWithTwoUpperBounds: Int where T : CharSequence, T : Number
get() {}
//package rendererTest defined in root package
//public val pub : jet.String defined in rendererTest
//internal var int : jet.String defined in rendererTest
//internal val int2 : jet.Int defined in rendererTest
//private var private : jet.Int defined in rendererTest
//public val jet.Int.ext : jet.Int defined in rendererTest
//public fun jet.Int.<get-ext>() : jet.Int defined in rendererTest
//jet.deprecated internal val deprecatedVal : jet.Int defined in rendererTest
//public val <T> T.extWithTwoUpperBounds : jet.Int where T : jet.CharSequence, T : jet.Number defined in rendererTest
//public val pub: jet.String defined in rendererTest
//internal var int: jet.String defined in rendererTest
//internal val int2: jet.Int defined in rendererTest
//private var private: jet.Int defined in rendererTest
//public val jet.Int.ext: jet.Int defined in rendererTest
//public fun jet.Int.<get-ext>(): jet.Int defined in rendererTest
//jet.deprecated internal val deprecatedVal: jet.Int defined in rendererTest
//public val <T : jet.CharSequence> T.extWithTwoUpperBounds: jet.Int where T : jet.Number defined in rendererTest
//<T : jet.CharSequence & jet.Number> defined in rendererTest
//public fun T.<get-extWithTwoUpperBounds>() : jet.Int defined in rendererTest
//public fun T.<get-extWithTwoUpperBounds>(): jet.Int defined in rendererTest
compiler/testData/renderer/InheritedMembersVisibility.kt
+13 -13
View File
@@ -1,9 +1,9 @@
trait A {
val v : Int
public var int : Int
val v: Int
public var int: Int
private set
protected fun f() : Int
protected fun f(): Int
}
class B : A {
@@ -16,15 +16,15 @@ class B : A {
}
//internal trait A defined in root package
//internal abstract val v : jet.Int defined in A
//public abstract var int : jet.Int defined in A
//private abstract fun <set-int>(<set-?> : jet.Int) : jet.Unit defined in A
//protected abstract fun f() : jet.Int defined in A
//internal abstract val v: jet.Int defined in A
//public abstract var int: jet.Int defined in A
//private abstract fun <set-int>(<set-?>: jet.Int): jet.Unit defined in A
//protected abstract fun f(): jet.Int defined in A
//internal final class B : A defined in root package
//public constructor B() defined in B
//public open var int : jet.Int defined in B
//public open fun <get-int>() : jet.Int defined in B
//private open fun <set-int>(<set-?> : jet.Int) : jet.Unit defined in B
//protected open fun f() : jet.Int defined in B
//internal open val v : jet.Int defined in B
//internal open fun <get-v>() : jet.Int defined in B
//public open var int: jet.Int defined in B
//public open fun <get-int>(): jet.Int defined in B
//private open fun <set-int>(<set-?>: jet.Int): jet.Unit defined in B
//protected open fun f(): jet.Int defined in B
//internal open val v: jet.Int defined in B
//internal open fun <get-v>(): jet.Int defined in B
compiler/testData/renderer/KeywordsInNames.kt
+8 -8
View File
@@ -11,20 +11,20 @@ class `class`<`in`>(p: `in`?) {
val `is` = `class`<`trait`>(null).`class`()
val `in` = `class`<`trait`>(null)
fun <`in`: `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in`: Number
fun <`in` : `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in` : Number
//internal final annotation class `true` : jet.Annotation defined in root package
//public constructor `true`() defined in `true`
//internal val `val` : jet.Int defined in root package
//internal val `val`: jet.Int defined in root package
//`true` internal trait `trait` defined in root package
//internal final class `class`<`in`> defined in root package
//public constructor `class`<`in`>(p : `in`?) defined in `class`
//public constructor `class`<`in`>(p: `in`?) defined in `class`
//<`in`> defined in `class`
//value-parameter val p : `in`? defined in `class`.<init>
//value-parameter val p: `in`? defined in `class`.<init>
//internal final inner class `class` defined in `class`
//public constructor `class`() defined in `class`.`class`
//internal val `is` : `class`.`class` defined in root package
//internal val `in` : `class`<`trait`> defined in root package
//internal fun <`in`> `trait`.`fun`(`false` : `trait`) : `trait` where `in` : `trait`, `in` : jet.Number defined in root package
//internal val `is`: `class`.`class` defined in root package
//internal val `in`: `class`<`trait`> defined in root package
//internal fun <`in` : `trait`> `trait`.`fun`(`false`: `trait`): `trait` where `in` : jet.Number defined in root package
//<`in` : `trait` & jet.Number> defined in `fun`
//value-parameter val `false` : `trait` defined in `fun`
//value-parameter val `false`: `trait` defined in `fun`
compiler/testData/renderer/UnitType.kt
+4 -4
View File
@@ -1,5 +1,5 @@
var v1 : Unit
var v2 : Unit?
var v1: Unit
var v2: Unit?
//internal var v1 : jet.Unit defined in root package
//internal var v2 : jet.Unit? defined in root package
//internal var v1: jet.Unit defined in root package
//internal var v2: jet.Unit? defined in root package