From ceae7eda391b5a9ecdc8b8f84b72d7d085e1bba7 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sat, 8 Aug 2015 12:13:27 +0300 Subject: [PATCH] Fixed test data --- compiler/testData/diagnostics/tests/PackageQualified.txt | 6 +++--- .../diagnostics/tests/classLiteral/genericClasses.kt | 2 +- ...oundsSubstitutionForOverloadResolutionWithErrorTypes.txt | 4 ++-- compiler/testData/type/binding/explicit/unresolvedType.kt | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/testData/diagnostics/tests/PackageQualified.txt b/compiler/testData/diagnostics/tests/PackageQualified.txt index 05c921a5dbf..36104b57cf9 100644 --- a/compiler/testData/diagnostics/tests/PackageQualified.txt +++ b/compiler/testData/diagnostics/tests/PackageQualified.txt @@ -59,9 +59,9 @@ package foobar { package foobar.a { internal val a: java.util.List? = null - internal val a2: [ERROR : util.List]? - internal val a3: [ERROR : ArrayList]? + internal val a2: [ERROR : util.List]? + internal val a3: [ERROR : ArrayList]? internal val b: kotlin.List? = null - internal val b1: [ERROR : util.List]? + internal val b1: [ERROR : util.List]? } } diff --git a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt index c179e8f92dd..b424eeac499 100644 --- a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt +++ b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt @@ -16,7 +16,7 @@ val n2 = A.Nested<*>::class val i1 = A.Inner::class val i2 = A<*>.Inner<*>::class -val i3 = A<Int>.Inner::class +val i3 = A.Inner::class val m1 = Map::class val m2 = Map::class diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt index eb045084cdb..68d35be56fa 100644 --- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt +++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt @@ -1,6 +1,6 @@ package -internal fun f1(/*0*/ l: [ERROR : List1]): T -internal fun f1(/*0*/ l: [ERROR : List2]): T +internal fun f1(/*0*/ l: [ERROR : List1]): T +internal fun f1(/*0*/ l: [ERROR : List2]): T internal fun f1(/*0*/ c: kotlin.Collection): T internal fun test(/*0*/ l: kotlin.List): kotlin.Unit diff --git a/compiler/testData/type/binding/explicit/unresolvedType.kt b/compiler/testData/type/binding/explicit/unresolvedType.kt index 8019165a15d..b9a9e1200b0 100644 --- a/compiler/testData/type/binding/explicit/unresolvedType.kt +++ b/compiler/testData/type/binding/explicit/unresolvedType.kt @@ -1,11 +1,11 @@ val foo: List>> = null!! /* psi: List>> -type: List<[ERROR : adad>]> +type: List<[ERROR : adad>]>> typeParameter: defined in kotlin.List - typeProjection: [ERROR : adad>] + typeProjection: [ERROR : adad>]> psi: adad> - type: [ERROR : adad>] + type: [ERROR : adad>]> typeParameter: null typeProjection: List<[ERROR : dd]> psi: List