Split KotlinInfo annotation into two: KotlinClass and KotlinPackage

Two annotations are needed to properly distinguish package classes
2013-07-05 20:55:35 +04:00
parent 8a508fe938
commit 977cd7608a
12 changed files with 95 additions and 51 deletions
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.codegen;
+
+import jet.KotlinClass;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.descriptors.serialization.AbstractDescriptorFinder;
+import org.jetbrains.jet.descriptors.serialization.ClassData;
+import org.jetbrains.jet.descriptors.serialization.ClassId;
+import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl;
+import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
+
+import java.io.IOException;
+
+public class KotlinClassAnnotationTest extends CodegenTestCase {
+    public static final FqName NAMESPACE_NAME = new FqName("test");
+    public static final FqNameUnsafe CLASS_NAME = new FqNameUnsafe("A");
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+    }
+
+    public void testClassKotlinInfo() throws Exception {
+        loadText("package " + NAMESPACE_NAME + "\n" +
+                 "\n" +
+                 "class " + CLASS_NAME + " {\n" +
+                 "    fun foo() {}\n" +
+                 "    fun bar() = 42\n" +
+                 "}\n");
+        Class aClass = generateClass(NAMESPACE_NAME + "." + CLASS_NAME);
+
+        assertTrue(aClass.isAnnotationPresent(KotlinClass.class));
+        KotlinClass kotlinClass = (KotlinClass) aClass.getAnnotation(KotlinClass.class);
+
+        AbstractDescriptorFinder descriptorFinder = new KotlinInfoBasedDescriptorFinder(kotlinClass);
+
+        ClassDescriptor descriptor = descriptorFinder.findClass(new ClassId(NAMESPACE_NAME, CLASS_NAME));
+        assertNotNull(descriptor);
+        assertEquals(CLASS_NAME.asString(), descriptor.getName().asString());
+    }
+
+    private static class KotlinInfoBasedDescriptorFinder extends AbstractDescriptorFinder {
+        private final ClassData classData;
+        private final NamespaceDescriptorImpl namespace;
+
+        public KotlinInfoBasedDescriptorFinder(@NotNull KotlinClass kotlinClass) throws IOException {
+            super(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED);
+
+            this.classData = JavaProtoBufUtil.readClassDataFrom(kotlinClass.data());
+            this.namespace = JetTestUtils.createTestNamespace(NAMESPACE_NAME.shortName());
+        }
+
+        @Nullable
+        @Override
+        protected ClassData getClassData(@NotNull ClassId classId) {
+            assert classId.getPackageFqName().equals(NAMESPACE_NAME) &&
+                   classId.getRelativeClassName().equals(CLASS_NAME) : "Unsupported classId: " + classId;
+            return classData;
+        }
+
+        @NotNull
+        @Override
+        public NamespaceDescriptor findPackage(@NotNull FqName fqName) {
+            assert fqName.equals(NAMESPACE_NAME) : "Unsupported namespace: " + fqName;
+            return namespace;
+        }
+
+        @Override
+        protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
+        }
+    }
+}