diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt index b8497309888..31bbc335c10 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration import org.jetbrains.kotlin.asJava.elements.* import org.jetbrains.kotlin.asJava.toLightClass +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase import org.jetbrains.kotlin.idea.caches.lightClasses.IDELightClassConstructionContext import org.jetbrains.kotlin.idea.caches.resolve.LightClassLazinessChecker.Tracker.Level.* @@ -91,7 +92,8 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase( Assert.assertNotNull("Test file not found!", testFile) - val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(testFile!!.canonicalPath, libName()) + val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(testFile!!.canonicalPath, libName(), + extraClasspath = listOf(ForTestCompileRuntime.jetbrainsAnnotationsForTests().path)) val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/" ModuleRootModificationUtil.addModuleLibrary(module, jarUrl) } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 32e9fe6fbdc..41ab77d1813 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -88,7 +88,9 @@ public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildT } protected static JpsLibrary addKotlinStdlibDependency(@NotNull Collection modules, boolean exported) { - return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, "kotlin-stdlib", PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()); + return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, "kotlin-stdlib", + PathUtil.getKotlinPathsForDistDirectory().getStdlibPath(), + new File(PathUtil.getKotlinPathsForDistDirectory().getLibPath(), "annotations-13.0.jar")); } protected JpsLibrary addDependency(@NotNull String libraryName, @NotNull File libraryFile) {