From 1963571be3e36a59e3de0463cf7111a6a7ddcd83 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 3 Dec 2018 15:36:56 +0900 Subject: [PATCH] Add missing 'disallowRootAccess()' to debugger and stub tests --- .../kotlin/idea/debugger/KotlinDebuggerTestCase.java | 2 +- .../kotlin/idea/debugger/KotlinDebuggerTestCase.java.173 | 2 +- .../jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index 4a6e7d96656..122494d263c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -243,7 +243,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { }); super.tearDown(); - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); } @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod") diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java.173 b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java.173 index b021517f724..8f9bc5a033f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java.173 +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java.173 @@ -273,7 +273,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { }); super.tearDown(); - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); } @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod") diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt index 63781ce944f..f7e3c0b3e04 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt @@ -62,6 +62,11 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { return moduleWithSrcRootSet } + override fun tearDown() { + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + super.tearDown() + } + public override fun createModule(path: String, moduleType: ModuleType<*>): Module { return super.createModule(path, moduleType) }