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

Use MODULE_NAME configuration key in JS instead of MODULE_ID

Browse Source
This commit is contained in:
Alexander Udalov
2016-05-25 21:10:16 +03:00
parent 05f8836f46
commit 159d88102f
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java
+3 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.checkers;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.context.ModuleContext;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
@@ -31,6 +32,7 @@ import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.TargetPlatformKt;
import org.jetbrains.kotlin.storage.StorageManager;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +45,7 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
protected void setUp() throws Exception {
super.setUp();
CompilerConfiguration configuration = getEnvironment().getConfiguration().copy();
configuration.put(JSConfigurationKeys.MODULE_ID, "module");
configuration.put(CommonConfigurationKeys.MODULE_NAME, KotlinTestUtils.TEST_MODULE_NAME);
configuration.put(JSConfigurationKeys.LIBRARY_FILES, LibrarySourcesConfig.JS_STDLIB);
config = new LibrarySourcesConfig(getProject(), configuration);
}
compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt
+5 -5
View File
@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.utils.sure
import java.io.File
class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
private val MODULE_NAME = "module"
private val BASE_DIR = "compiler/testData/serialization"
private fun doTest(fileName: String, metaFileDir: File = tmpdir) {
@@ -49,9 +48,8 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
val srcDirs = listOf(File(source))
val configuration = CompilerConfiguration()
val configuration = KotlinTestUtils.newConfiguration()
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
configuration.put(JSConfigurationKeys.MODULE_ID, MODULE_NAME)
configuration.put(JSConfigurationKeys.LIBRARY_FILES, LibrarySourcesConfig.JS_STDLIB)
configuration.addKotlinSourceRoots(srcDirs.map { it.path })
@@ -73,7 +71,9 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
val files = environment.getSourceFiles()
val config = LibrarySourcesConfig(environment.project, environment.configuration)
val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config)
FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(MODULE_NAME, analysisResult.moduleDescriptor))
FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(
KotlinTestUtils.TEST_MODULE_NAME, analysisResult.moduleDescriptor
))
}
finally {
Disposer.dispose(rootDisposable)
@@ -81,7 +81,7 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
}
private fun deserialize(metaFile: File): ModuleDescriptorImpl {
val module = KotlinTestUtils.createEmptyModule("<$MODULE_NAME>", JsPlatform, JsPlatform.builtIns)
val module = KotlinTestUtils.createEmptyModule("<${KotlinTestUtils.TEST_MODULE_NAME}>", JsPlatform, JsPlatform.builtIns)
val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile)
assert(metadata.size == 1)