Misc: Fix Android SDK path in Gradle import tests

This commit is contained in:
Alexey Sedunov
2018-02-01 18:50:07 +03:00
parent 7995ae05c5
commit d51da8bafd
3 changed files with 11 additions and 4 deletions
@@ -37,6 +37,7 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.testFramework.TestDataFile;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase;
import kotlin.collections.CollectionsKt;
@@ -377,6 +378,7 @@ public class KotlinTestUtils {
return androidJarFile;
}
@NotNull
public static File findAndroidSdk() {
String androidSdkProp = System.getProperty("android.sdk");
File androidSdkDir = androidSdkProp == null ? null : new File(androidSdkProp);
@@ -389,6 +391,10 @@ public class KotlinTestUtils {
return androidSdkDir;
}
public static String getAndroidSdkSystemIndependentPath() {
return PathUtil.toSystemIndependentName(findAndroidSdk().getAbsolutePath());
}
public static File getAnnotationsJar() {
return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar");
}