ExpressionCodegen: take EnumEntry type from containingDeclarationDescriptor

JavaDescriptorResolver: pass to propertyDescriptor correct value of isObject parameter
2012-08-22 14:29:38 +04:00
parent 6740a712d8
commit 3d9ad3f6cb
9 changed files with 63 additions and 9 deletions
@@ -105,6 +105,18 @@ public class EnumGenTest extends CodegenTestCase {
            throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
        blackBoxFile("enum/abstractmethod.kt");
    }
+    
+    public void testSimpleJavaEnum() throws Exception {
+        blackBoxFileWithJava("enum/simpleJavaEnum.kt");
+    }
+    
+    public void testSimpleJavaEnumWithStaticImport() throws Exception {
+        blackBoxFileWithJava("enum/simpleJavaEnumWithStaticImport.kt");
+    } 
+    
+    public void testSimpleJavaEnumWithFunction() throws Exception {
+        blackBoxFileWithJava("enum/simpleJavaEnumWithFunction.kt");
+    }

    public void testNoClassForSimpleEnum()
            throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {