AA standalone: set binary dependency kind in test configurator
This commit is contained in:
+3
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModul
|
|||||||
import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModuleDecompilerJar
|
import org.jetbrains.kotlin.analysis.test.framework.services.libraries.TestModuleDecompilerJar
|
||||||
import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
|
import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar
|
||||||
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
||||||
|
import org.jetbrains.kotlin.test.model.DependencyKind
|
||||||
import org.jetbrains.kotlin.test.model.TestModule
|
import org.jetbrains.kotlin.test.model.TestModule
|
||||||
import org.jetbrains.kotlin.test.preprocessors.ExternalAnnotationsSourcePreprocessor
|
import org.jetbrains.kotlin.test.preprocessors.ExternalAnnotationsSourcePreprocessor
|
||||||
import org.jetbrains.kotlin.test.services.TestModuleStructure
|
import org.jetbrains.kotlin.test.services.TestModuleStructure
|
||||||
@@ -45,6 +46,8 @@ object StandaloneModeLibraryBinaryTestConfigurator : StandaloneModeConfiguratorB
|
|||||||
useAdditionalService<KtModuleFactory> { KtCombinedModuleFactory() }
|
useAdditionalService<KtModuleFactory> { KtCombinedModuleFactory() }
|
||||||
useAdditionalService<TestModuleCompiler> { DispatchingTestModuleCompiler() }
|
useAdditionalService<TestModuleCompiler> { DispatchingTestModuleCompiler() }
|
||||||
useAdditionalService<TestModuleDecompiler> { TestModuleDecompilerJar() }
|
useAdditionalService<TestModuleDecompiler> { TestModuleDecompilerJar() }
|
||||||
|
|
||||||
|
this.defaultsProviderBuilder.dependencyKind = DependencyKind.Binary
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -17,8 +17,7 @@ package my.collections
|
|||||||
|
|
||||||
fun <K, V> myMapOf(vararg pairs: Pair<K, V>): Map<K, V> = mapOf(*pairs)
|
fun <K, V> myMapOf(vararg pairs: Pair<K, V>): Map<K, V> = mapOf(*pairs)
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
import my.collections.*
|
import my.collections.*
|
||||||
|
|||||||
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
Vendored
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
analysis/analysis-api/testData/standalone/multiModuleBinary/propertiesInCompanionObject_JvmStatic.kt
Vendored
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
Vendored
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
+1
-2
@@ -16,8 +16,7 @@ class Dependency {
|
|||||||
|
|
||||||
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
val DEPENDENCY_TOP_LEVEL_VAL_FLAG: Flag<*> = TODO()
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
+1
-2
@@ -10,8 +10,7 @@ object DependencyObject {
|
|||||||
var varFlag: Flag<*> = TODO()
|
var varFlag: Flag<*> = TODO()
|
||||||
}
|
}
|
||||||
|
|
||||||
// MODULE: app
|
// MODULE: app(lib)
|
||||||
// DEPENDENCY: lib Binary
|
|
||||||
// FILE: main.kt
|
// FILE: main.kt
|
||||||
|
|
||||||
package some
|
package some
|
||||||
|
|||||||
Reference in New Issue
Block a user