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

Fix incorrect test data for wrong KotlinSignature CLI test

Browse Source 
Classes from the root package cannot be referenced from a non-root package
This commit is contained in:
Alexander Udalov
2014-09-03 16:40:26 +04:00
parent 8ccca1781d
commit bb54825fac
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/wrongKotlinSignature.kt
+3 -1
View File
@@ -1,4 +1,6 @@
package test;
import library.ClassWithWrongKotlinSignatures
val x = ClassWithWrongKotlinSignatures.foo()
val y = ClassWithWrongKotlinSignatures.bar()
val y = ClassWithWrongKotlinSignatures.bar()
compiler/testData/cli/jvm/wrongKotlinSignature.out
+2 -2
View File
@@ -1,7 +1,7 @@
ERROR: The following Java entities have annotations with wrong Kotlin signatures:
ClassWithWrongKotlinSignatures java.lang.String foo():
library.ClassWithWrongKotlinSignatures java.lang.String foo():
Function names mismatch, original: foo, alternative: bar
ClassWithWrongKotlinSignatures java.lang.String bar():
library.ClassWithWrongKotlinSignatures java.lang.String bar():
Function names mismatch, original: bar, alternative: foo
COMPILATION_ERROR
compiler/testData/cli/jvm/wrongKotlinSignatureLib/ClassWithWrongKotlinSignatures.java → compiler/testData/cli/jvm/wrongKotlinSignatureLib/library/ClassWithWrongKotlinSignatures.java
+2
View File
@@ -1,3 +1,5 @@
package library
import jet.runtime.typeinfo.KotlinSignature;
public class ClassWithWrongKotlinSignatures {
compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
+11 -1
View File
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest {
@TestMetadata("compiler/testData/cli/jvm")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Jvm.WrongAbiVersionLib.class})
@InnerTestClasses({Jvm.WrongAbiVersionLib.class, Jvm.WrongKotlinSignatureLib.class})
@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
public static class Jvm extends AbstractKotlincExecutableTest {
public void testAllFilesPresentInJvm() throws Exception {
@@ -155,6 +155,16 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
}
@TestMetadata("compiler/testData/cli/jvm/wrongKotlinSignatureLib")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({})
public static class WrongKotlinSignatureLib extends AbstractKotlincExecutableTest {
public void testAllFilesPresentInWrongKotlinSignatureLib() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm/wrongKotlinSignatureLib"), Pattern.compile("^(.+)\\.args$"), true);
}
}
}
@TestMetadata("compiler/testData/cli/js")