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

[JS TESTS] Extract common code responsible for getting dependencies

Browse Source
This commit is contained in:
Ivan Kylchik
2021-10-28 18:58:05 +03:00
parent fdf3288e3d
commit 81211acbc0
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsIrBackendFacade.kt
+3 -12
View File
@@ -34,10 +34,7 @@ import org.jetbrains.kotlin.serialization.js.ModuleKind
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
import org.jetbrains.kotlin.test.frontend.classic.moduleDescriptorProvider
import org.jetbrains.kotlin.test.model.AbstractTestFacade
import org.jetbrains.kotlin.test.model.ArtifactKinds
import org.jetbrains.kotlin.test.model.BinaryArtifacts
import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.model.*
import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
import org.jetbrains.kotlin.utils.fileUtils.withReplacedExtensionOrNull
@@ -181,14 +178,8 @@ class JsIrBackendFacade(
val moduleDescriptor = testServices.moduleDescriptorProvider.getModuleDescriptor(module)
val mainModuleLib = testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(moduleDescriptor)
val friendLibraries = configuration[JSConfigurationKeys.FRIEND_PATHS]!!.map {
val descriptor = testServices.jsLibraryProvider.getDescriptorByPath(
File(it).absolutePath
.replace("_v5.meta.js", "")
.replace("outputDir", "outputKlibDir")
)
testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(descriptor)
}
val friendLibraries = JsEnvironmentConfigurator.getDependencies(module, testServices, DependencyRelation.FriendDependency)
.map { testServices.jsLibraryProvider.getCompiledLibraryByDescriptor(it) }
val friendModules = mapOf(mainModuleLib.uniqueName to friendLibraries.map { it.uniqueName })
return getIrModuleInfoForKlib(