Rename JvmPackageTable -> JvmModuleProtoBuf, PackageTable -> Module

This protobuf message is going to contain more information about the module than just the table of package parts
2017-12-18 12:52:19 +01:00
parent 5d6d1bf182
commit ba5cc65792
34 changed files with 3806 additions and 377 deletions
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010-2017 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.kotlin.codegen
+
+import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
+import org.jetbrains.kotlin.config.ApiVersion
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
+import org.jetbrains.kotlin.load.kotlin.ModuleMapping
+import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
+import org.jetbrains.kotlin.test.CompilerTestUtil
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
+import java.io.File
+
+class JvmModuleProtoBufTest : KtUsefulTestCase() {
+    private fun doTest(
+            relativeDirectory: String,
+            compileWith: LanguageVersion = LanguageVersion.LATEST_STABLE,
+            loadWith: LanguageVersion = LanguageVersion.LATEST_STABLE
+    ) {
+        val directory = KotlinTestUtils.getTestDataPathBase() + relativeDirectory
+        val tmpdir = KotlinTestUtils.tmpDir(this::class.simpleName)
+
+        val moduleName = "main"
+        CompilerTestUtil.executeCompilerAssertSuccessful(K2JVMCompiler(), listOf(
+                directory,
+                "-d", tmpdir.path,
+                "-module-name", moduleName,
+                "-language-version", compileWith.versionString
+        ))
+
+        val mapping = ModuleMapping.create(
+                File(tmpdir, "META-INF/$moduleName.${ModuleMapping.MAPPING_FILE_EXT}").readBytes(), "test",
+                CompilerDeserializationConfiguration(
+                        LanguageVersionSettingsImpl(loadWith, ApiVersion.createByLanguageVersion(loadWith))
+                )
+        )
+        val result = buildString {
+            for ((fqName, packageParts) in mapping.packageFqName2Parts) {
+                appendln(fqName)
+                for (part in packageParts.parts) {
+                    append("  ")
+                    append(part)
+                    val facadeName = packageParts.getMultifileFacadeName(part)
+                    if (facadeName != null) {
+                        append(" (")
+                        append(facadeName)
+                        append(")")
+                    }
+                    appendln()
+                }
+            }
+        }
+
+        KotlinTestUtils.assertEqualsToFile(File(directory, "module-proto.txt"), result)
+    }
+
+    fun testSimple() {
+        doTest("/moduleProtoBuf/simple")
+    }
+
+    fun testJvmPackageName() {
+        doTest("/moduleProtoBuf/jvmPackageName",
+               compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2)
+    }
+
+    fun testJvmPackageNameManyParts() {
+        doTest("/moduleProtoBuf/jvmPackageNameManyParts",
+               compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2)
+    }
+
+    fun testJvmPackageNameLanguageVersion11() {
+        doTest("/moduleProtoBuf/jvmPackageNameLanguageVersion11",
+               compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_1)
+    }
+}