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

Fix tests for imports dumper

Browse Source 
Remove local absolute paths from testdata, introduce new testrunner to
support relativization of imports dump.
This commit is contained in:
Dmitry Savvinov
2018-05-16 15:52:45 +03:00
parent c97f4539d3
commit 16ee2df585
12 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/importsProducer.args
Vendored
-4
View File
@@ -1,4 +0,0 @@
$TESTDATA_DIR$/importsProducer
-d
$TEMP_DIR$
-Xoutput-imports=$TESTDATA_DIR$/importsProducerDump.txt
compiler/testData/cli/jvm/importsProducer.out
Vendored
-1
View File
@@ -1 +0,0 @@
OK
compiler/testData/cli/jvm/importsProducer/a/A1.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
package a
import c.JavaC
class A1 {
val j: JavaC = JavaC()
}
compiler/testData/cli/jvm/importsProducer/a/A2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package a
class A2 {
val a1: A1? = null
}
compiler/testData/cli/jvm/importsProducer/b/B1.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package b
import a.*
class B1 {
companion object {
val a1: A1 = A1()
val a2: A2 = A2()
}
}
compiler/testData/cli/jvm/importsProducer/b/nestedB/B2.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
package b.nestedB
import a.A1 as AliasedA1
import a.A1
fun foo(x: AliasedA1): Int = TODO()
fun bar(x: A1): Int = TODO()
compiler/testData/cli/jvm/importsProducer/c/C1.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
package c
import a.A1
import a.A2
import b.B1.Companion.a2
import b.nestedB.bar
import b.nestedB.foo
class C1 {
val x = foo(TODO())
val y = bar(TODO())
val z: A1? = null
val t: A2? = a2
}
compiler/testData/cli/jvm/importsProducer/c/JavaC.java
Vendored
-13
View File
@@ -1,13 +0,0 @@
package c;
import a.A1;
import b.B1;
import b.nestedB.B2Kt;
public class JavaC {
private void doStuff() {
C1 c1 = new C1();
B1 b1 = new B1();
B2Kt.bar(new A1());
}
}
compiler/testData/cli/jvm/importsProducerDump.txt
Vendored
-1
View File
@@ -1 +0,0 @@
{"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/a\/A1.kt":["import c.JavaC"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/a\/A2.kt":[],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/b\/B1.kt":["import a.*"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/b\/nestedB\/B2.kt":["import a.A1 as AliasedA1","import a.A1"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/c\/C1.kt":["import a.A1","import a.A2","import b.B1.Companion.a2","import b.nestedB.bar","import b.nestedB.foo"]}