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

Fix running Android tests locally on windows

Browse Source
This commit is contained in:
Nikolay Krasko
2017-06-06 14:46:43 +03:00
parent 45958e630d
commit 0980446836
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
+4 -1
View File
@@ -28,7 +28,6 @@ import com.intellij.facet.FacetManager;
import com.intellij.facet.ModifiableFacetModel; import com.intellij.facet.ModifiableFacetModel;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.impl.ComponentManagerImpl;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.roots.ModuleRootModificationUtil;
@@ -54,6 +53,7 @@ import org.jetbrains.android.facet.AndroidRootUtil;
import org.jetbrains.android.formatter.AndroidXmlCodeStyleSettings; import org.jetbrains.android.formatter.AndroidXmlCodeStyleSettings;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.picocontainer.MutablePicoContainer; import org.picocontainer.MutablePicoContainer;
import java.io.File; import java.io.File;
@@ -79,6 +79,8 @@ public abstract class AndroidTestCase extends AndroidTestBase {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
TestFixtureBuilder<IdeaProjectTestFixture> projectBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()); TestFixtureBuilder<IdeaProjectTestFixture> projectBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName());
myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture()); myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture());
JavaModuleFixtureBuilder moduleFixtureBuilder = projectBuilder.addModule(JavaModuleFixtureBuilder.class); JavaModuleFixtureBuilder moduleFixtureBuilder = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
@@ -164,6 +166,7 @@ public abstract class AndroidTestCase extends AndroidTestBase {
} }
finally { finally {
super.tearDown(); super.tearDown();
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
} }
} }
idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt
-1
View File
@@ -29,7 +29,6 @@ abstract class AbstractKotlinLintTest : KotlinAndroidTestCase() {
ConfigLibraryUtil.configureKotlinRuntime(myModule) ConfigLibraryUtil.configureKotlinRuntime(myModule)
AndroidLintInspectionBase.invalidateInspectionShortName2IssueMap() AndroidLintInspectionBase.invalidateInspectionShortName2IssueMap()
// needs access to .class files in kotlin runtime jar // needs access to .class files in kotlin runtime jar
myFixture.allowTreeAccessForAllFiles()
} }
override fun tearDown() { override fun tearDown() {