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

Method from java overridden in kotlin should have kotlin visibility

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-02-06 18:58:20 +04:00
parent 55d4599b3b
commit 1749e3298c
14 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
+13 -5
View File
@@ -83,7 +83,7 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment {
}
public void testPackageLocalVisibility() throws Exception {
String dir = PATH + "/packageLocalVisibility";
String dir = PATH + "/packageLocalVisibility/simple/";
String javaDir = dir + "/java";
doTest(dir + "/expected.txt",
javaDir + "/test/JFrame.java",
@@ -163,15 +163,23 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment {
public static class SubclassingKotlinInJavaTest extends KotlinTestWithEnvironmentManagement {
public void testSubclassingKotlinInJava() throws Exception {
doTest();
doTest(PATH + "/" + getTestName(true));
}
public void testDeepSubclassingKotlinInJava() throws Exception {
doTest();
doTest(PATH + "/" + getTestName(true));
}
public void doTest() throws Exception {
File dir = new File(PATH + "/" + getTestName(true));
public void testPackageInheritance() throws Exception {
doTest(PATH + "/packageLocalVisibility/inheritance");
}
public void testProtectedPackageInheritance() throws Exception {
doTest(PATH + "/protectedPackageVisibility/inheritance");
}
public void doTest(String path) throws Exception {
File dir = new File(path);
CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(
ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, new File(dir, "java"));