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

Properly compute STATIC for light classes

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-18 14:28:00 -08:00
parent bd3d41e7ed
commit a7531926a4
6 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java
+8 -4
View File
@@ -136,22 +136,26 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
doTest();
}
public void testInnerPublic() throws Exception {
public void testNestedPublic() throws Exception {
doTest("test.Outer.Public");
}
public void testInnerProtected() throws Exception {
public void testNestedProtected() throws Exception {
doTest("test.Outer.Protected");
}
public void testInnerInternal() throws Exception {
public void testNestedInternal() throws Exception {
doTest("test.Outer.Internal");
}
public void testInnerPrivate() throws Exception {
public void testNestedPrivate() throws Exception {
doTest("test.Outer.Private");
}
public void testInner() throws Exception {
doTest("test.Outer.Inner");
}
public void testAbstract() throws Exception {
doTest();
}
compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java
+7 -5
View File
@@ -60,10 +60,12 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
}
public void testNestedVisibilities() {
checkModifiers("test.Outer.Public", PUBLIC, FINAL, INNER);
checkModifiers("test.Outer.Protected", PROTECTED, FINAL, INNER);
checkModifiers("test.Outer.Internal", PUBLIC, FINAL, INNER);
checkModifiers("test.Outer.Private", PRIVATE, FINAL, INNER);
checkModifiers("test.Outer.Public", PUBLIC, STATIC, FINAL, NESTED);
checkModifiers("test.Outer.Protected", PROTECTED, STATIC, FINAL, NESTED);
checkModifiers("test.Outer.Internal", PUBLIC, STATIC, FINAL, NESTED);
checkModifiers("test.Outer.Private", PRIVATE, STATIC, FINAL, NESTED);
checkModifiers("test.Outer.Inner", PUBLIC, FINAL, NESTED);
}
public void testModalities() {
checkModifiers("test.Abstract", PUBLIC, ABSTRACT);
@@ -224,7 +226,7 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
return psiClass.isDeprecated();
}
},
INNER {
NESTED {
@Override
public boolean present(@NotNull PsiClass psiClass) {
return psiClass.getContainingClass() != null;