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

Moved tests for imports into proper group

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-14 22:28:52 +03:00
parent 2c60201832
commit a9d4fd5213
23 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
-15
View File
@@ -1,15 +0,0 @@
//FILE:a.kt
package a
import <!CONFLICTING_IMPORT!>b.O<!>
import <!CONFLICTING_IMPORT!>c.O<!>
//FILE:b.kt
package b
object O {}
//FILE:c.kt
package c
object O {}
compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt
-38
View File
@@ -1,38 +0,0 @@
package
package a {
}
package b {
internal object O {
private constructor O()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-O> : b.O {
private constructor <class-object-for-O>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
package c {
internal object O {
private constructor O()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-O> : c.O {
private constructor <class-object-for-O>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt
-25
View File
@@ -1,25 +0,0 @@
// FILE: rootPackage.kt
class Klass {
}
fun function() = ""
val property = ""
// FILE: anotherFromRootPackage.kt
fun foo() {
Klass()
function() + property
}
// FILE: anotherFromRootPackage.kt
package pkg
import <!UNRESOLVED_REFERENCE!>Klass<!>
import <!UNRESOLVED_REFERENCE!>function<!>
import <!UNRESOLVED_REFERENCE!>property<!>
fun foo() {
<!UNRESOLVED_REFERENCE!>Klass<!>()
<!UNRESOLVED_REFERENCE!>function<!>() <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> <!UNRESOLVED_REFERENCE!>property<!>
}
compiler/testData/diagnostics/tests/scopes/DontImportRootScope.txt
-16
View File
@@ -1,16 +0,0 @@
package
internal val property: kotlin.String = ""
internal fun foo(): kotlin.Unit
internal fun function(): kotlin.String
internal final class Klass {
public constructor Klass()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
package pkg {
internal fun foo(): kotlin.Unit
}
compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt
-5
View File
@@ -1,5 +0,0 @@
package a
import a.A as ER
class A()
compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.txt
-11
View File
@@ -1,11 +0,0 @@
package
package a {
internal final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt
-19
View File
@@ -1,19 +0,0 @@
// FILE: a.kt
package foo
object Bar {
fun bar() {}
}
// FILE: b.kt
package baz
import foo.Bar
class C: <!SINGLETON_IN_SUPERTYPE!>Bar<!>
fun test() {
Bar.bar()
}
compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.txt
-32
View File
@@ -1,32 +0,0 @@
package
package baz {
internal fun test(): kotlin.Unit
internal final class C : foo.Bar {
public constructor C()
internal final override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
package foo {
internal object Bar {
private constructor Bar()
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-Bar> : foo.Bar {
private constructor <class-object-for-Bar>()
internal final override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt
-12
View File
@@ -1,12 +0,0 @@
//FILE:a.kt
package a
// no error is reported
import b.a
fun foo() = a
//FILE:b.kt
package b
object a {}
compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.txt
-22
View File
@@ -1,22 +0,0 @@
package
package a {
internal fun foo(): b.a
}
package b {
internal object a {
private constructor a()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-a> : b.a {
private constructor <class-object-for-a>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt
-14
View File
@@ -1,14 +0,0 @@
// FILE: a.kt
package weatherForecast
fun weatherToday() = "snow"
// FILE: b.kt
package myApp
import weatherForecast.weatherToday
import weatherForecast.weatherToday
fun needUmbrella() = weatherToday() == "rain"
compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.txt
-9
View File
@@ -1,9 +0,0 @@
package
package myApp {
internal fun needUmbrella(): kotlin.Boolean
}
package weatherForecast {
internal fun weatherToday(): kotlin.String
}
compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt
-14
View File
@@ -1,14 +0,0 @@
// FILE: a.kt
package weatherForecast
fun weatherToday() = "snow"
// FILE: b.kt
package myApp
import weatherForecast.*
import weatherForecast.*
fun needUmbrella() = weatherToday() == "rain"
compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.txt
-9
View File
@@ -1,9 +0,0 @@
package
package myApp {
internal fun needUmbrella(): kotlin.Boolean
}
package weatherForecast {
internal fun weatherToday(): kotlin.String
}
compiler/testData/diagnostics/tests/scopes/Imports.kt
-99
View File
@@ -1,99 +0,0 @@
// FILE:a.kt
package a
import b.B //class
import b.foo //function
import b.ext //extension function
import b.value //property
import b.C.<!CANNOT_BE_IMPORTED!>bar<!> //function from class object
import b.C.<!CANNOT_BE_IMPORTED!>cValue<!> //property from class object
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>fff<!> //function from val
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>constant<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>dValue<!> //property from val
import b.constant
import b.E.<!CANNOT_BE_IMPORTED!>f<!> //val from class object
import <!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
import b.C.<!UNRESOLVED_REFERENCE!>smth<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>illegal<!>
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>smth<!>
import b.<!CANNOT_IMPORT_FROM_ELEMENT!>bar<!>.*
fun test(arg: B) {
foo(value)
arg.ext()
<!UNRESOLVED_REFERENCE!>bar<!>()
foo(<!UNRESOLVED_REFERENCE!>cValue<!>)
<!UNRESOLVED_REFERENCE!>fff<!>(<!UNRESOLVED_REFERENCE!>dValue<!>)
constant.fff(constant.dValue)
<!UNRESOLVED_REFERENCE!>f<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>f<!>()
}
// FILE:b.kt
package b
class B() {}
fun foo(i: Int) = i
fun B.ext() {}
val value = 0
class C() {
class object {
fun bar() {}
val cValue = 1
}
}
class D() {
fun fff(s: String) = s
val dValue = "w"
}
val constant = D()
class E() {
class object {
val f = F()
}
}
class F() {
fun f() {}
}
fun bar() {}
//FILE:c.kt
package c
import c.<!CANNOT_IMPORT_FROM_ELEMENT!>C<!>.*
object C {
fun f() {
}
val i = 348
}
fun foo() {
if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
}
//FILE:d.kt
package d
import d.A.B
import d.A.C
val b : B = B()
val c : B = C
class A() {
class object {
open class B() {}
object C : B() {}
}
}
compiler/testData/diagnostics/tests/scopes/Imports.txt
-130
View File
@@ -1,130 +0,0 @@
package
package a {
internal fun test(/*0*/ arg: b.B): kotlin.Unit
}
package b {
internal val constant: b.D
internal val value: kotlin.Int = 0
internal fun bar(): kotlin.Unit
internal fun foo(/*0*/ i: kotlin.Int): kotlin.Int
internal fun b.B.ext(): kotlin.Unit
internal final class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object <class-object-for-C> {
private constructor <class-object-for-C>()
internal final val cValue: kotlin.Int = 1
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class D {
public constructor D()
internal final val dValue: kotlin.String = "w"
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun fff(/*0*/ s: kotlin.String): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class E {
public constructor E()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object <class-object-for-E> {
private constructor <class-object-for-E>()
internal final val f: b.F
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
internal final class F {
public constructor F()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
package c {
internal fun foo(): kotlin.Unit
internal object C {
private constructor C()
internal final val i: kotlin.Int = 348
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-C> : c.C {
private constructor <class-object-for-C>()
internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
package d {
internal val b: d.A.B
internal val c: d.A.B
internal final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal class object <class-object-for-A> {
private constructor <class-object-for-A>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
internal open class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal object C : d.A.B {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-C> : d.A.C {
private constructor <class-object-for-C>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
}
}
compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt
-15
View File
@@ -1,15 +0,0 @@
//FILE:a.kt
package a
import b.foo
import c.foo // TODO: need warning here
//FILE:b.kt
package b
fun foo() = 2
//FILE:c.kt
package c
fun foo() = 1
compiler/testData/diagnostics/tests/scopes/ImportsConflicting.txt
-12
View File
@@ -1,12 +0,0 @@
package
package a {
}
package b {
internal fun foo(): kotlin.Int
}
package c {
internal fun foo(): kotlin.Int
}
compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt
-5
View File
@@ -1,5 +0,0 @@
package a
import <!USELESS_SIMPLE_IMPORT!>a<!>
object B {}
compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.txt
-18
View File
@@ -1,18 +0,0 @@
package
package a {
internal object B {
private constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-B> : a.B {
private constructor <class-object-for-B>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
}
compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt
-9
View File
@@ -1,9 +0,0 @@
// FILE:a.kt
package a
import <!USELESS_SIMPLE_IMPORT!>b<!>
// FILE:b.kt
package b
class B()
compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.txt
-14
View File
@@ -1,14 +0,0 @@
package
package a {
}
package b {
internal final class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}