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

Remove all class object related constants and utils from JvmAbi

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-21 14:08:47 +03:00
parent 894c3bceac
commit 42d2b97c09
5 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java
+7 -6
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtil;
import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.idea.JetLightProjectDescriptor;
import org.jetbrains.kotlin.idea.PluginTestCaseBase;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.name.SpecialNames;
import org.jetbrains.kotlin.psi.*;
public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase {
@@ -186,20 +186,21 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase {
PsiField classobjField = theClass.findFieldByName("$classobj", false);
assertNull(classobjField);
PsiClass classObjectClass = theClass.findInnerClassByName("object", false);
String defaultClassObjectName = SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString();
PsiClass classObjectClass = theClass.findInnerClassByName(defaultClassObjectName, false);
assertNotNull(classObjectClass);
assertEquals("foo.TheClass.object", classObjectClass.getQualifiedName());
assertEquals("foo.TheClass." + defaultClassObjectName, classObjectClass.getQualifiedName());
assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC));
PsiField instance = theClass.findFieldByName(JvmAbi.CLASS_OBJECT_FIELD, false);
PsiField instance = theClass.findFieldByName(defaultClassObjectName, false);
assertNotNull(instance);
assertEquals("foo.TheClass.object", instance.getType().getCanonicalText());
assertEquals("foo.TheClass." + defaultClassObjectName, instance.getType().getCanonicalText());
assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC));
assertTrue(instance.hasModifierProperty(PsiModifier.STATIC));
assertTrue(instance.hasModifierProperty(PsiModifier.FINAL));
PsiMethod[] methods = classObjectClass.findMethodsByName("getOut", false);
assertEquals("java.io.PrintStream", methods[0].getReturnType().getCanonicalText());
}