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

Refactored completion tests to not set/restore auto-complete settings in 2 different places

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-08 19:06:26 +04:00
parent 043c65b1d4
commit 6d69608feb
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt
+1 -5
View File
@@ -45,11 +45,7 @@ fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (Int)
}
private fun testWithAutoCompleteSetting(fileText: String, doTest: () -> Unit) {
val autoComplete = ExpectedCompletionUtils.getAutocompleteSetting(fileText)
if (autoComplete == null) {
doTest()
return
}
val autoComplete = ExpectedCompletionUtils.getAutocompleteSetting(fileText) ?: false
val settings = CodeInsightSettings.getInstance()
val oldValue1 = settings.AUTOCOMPLETE_ON_CODE_COMPLETION
idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
-27
View File
@@ -16,9 +16,7 @@
package org.jetbrains.jet.completion;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
@@ -31,31 +29,6 @@ import org.jetbrains.jet.plugin.project.TargetPlatform;
import java.io.File;
public abstract class JetFixtureCompletionBaseTestCase extends JetLightCodeInsightFixtureTestCase {
private Pair<Boolean, Boolean> savedAutoCompleteSettings;
@Override
protected void setUp() throws Exception {
super.setUp();
savedAutoCompleteSettings = setAutoCompleteSetting(new Pair<Boolean, Boolean>(false, false));
}
@Override
protected void tearDown() throws Exception {
setAutoCompleteSetting(savedAutoCompleteSettings);
super.tearDown();
}
private static Pair<Boolean, Boolean> setAutoCompleteSetting(Pair<Boolean, Boolean> value){
CodeInsightSettings settings = CodeInsightSettings.getInstance();
boolean oldValue1 = settings.AUTOCOMPLETE_ON_CODE_COMPLETION;
boolean oldValue2 = settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION;
settings.AUTOCOMPLETE_ON_CODE_COMPLETION = value.first;
settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = value.second;
return new Pair<Boolean, Boolean>(oldValue1, oldValue2);
}
public abstract TargetPlatform getPlatform();
@Nullable