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

Converted DirectiveBasedActionUtils to Kotlin

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-11 13:38:25 +03:00
parent 646653aa9a
commit 09723b9991
6 changed files with 98 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.java
-109
View File
@@ -1,109 +0,0 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.test;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.Severity;
import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.idea.highlighter.IdeErrorMessages;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class DirectiveBasedActionUtils {
private DirectiveBasedActionUtils() {
}
public static void checkForUnexpectedErrors(JetFile file) {
if (!InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// DISABLE-ERRORS").isEmpty()) {
return;
}
Collection<Diagnostic> diagnostics = ResolvePackage.analyzeFully(file).getDiagnostics().all();
Collection<Diagnostic> errorDiagnostics = Collections2.filter(diagnostics, new Predicate<Diagnostic>() {
@Override
public boolean apply(@Nullable Diagnostic diagnostic) {
assert (diagnostic != null);
return diagnostic.getSeverity() == Severity.ERROR;
}
});
Collection<String> actualErrorStrings = Collections2.transform(errorDiagnostics, new Function<Diagnostic, String>() {
@Override
public String apply(@Nullable Diagnostic diagnostic) {
assert (diagnostic != null);
return IdeErrorMessages.render(diagnostic);
}
});
List<String> expectedErrorStrings = InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ERROR:");
Collections.sort(expectedErrorStrings);
UsefulTestCase.assertOrderedEquals(
"All actual errors should be mentioned in test data with // ERROR: directive. But no unnecessary errors should be me mentioned",
Ordering.natural().sortedCopy(actualErrorStrings), expectedErrorStrings);
}
public static void checkAvailableActionsAreExpected(JetFile file, Collection<IntentionAction> availableActions) {
List<String> validActions = Ordering.natural().sortedCopy(
Lists.newArrayList(InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ACTION:")));
Collection<String> actualActions = Ordering.natural().sortedCopy(
Lists.newArrayList(Collections2.transform(availableActions, new Function<IntentionAction, String>() {
@Override
public String apply(@Nullable IntentionAction input) {
assert input != null;
return input.getText();
}
})));
UsefulTestCase.assertOrderedEquals("Some unexpected actions available at current position. Use // ACTION: directive",
filterOutIrrelevantActions(actualActions), filterOutIrrelevantActions(validActions));
}
@NotNull
//TODO: hack, implemented because irrelevant actions behave in different ways on build server and locally
// this behaviour should be investigated and hack can be removed
private static Collection<String> filterOutIrrelevantActions(@NotNull Collection<String> actions) {
return Collections2.filter(actions, new Predicate<String>() {
@Override
public boolean apply(String input) {
for (String prefix : IRRELEVANT_ACTION_PREFIXES) {
if (input.startsWith(prefix) || input.isEmpty()) {
return false;
}
}
return true;
}
});
}
private static final Collection<String> IRRELEVANT_ACTION_PREFIXES =
Arrays.asList("Disable ", "Edit intention settings", "Edit inspection profile setting", "Inject language or reference", "Suppress ");
}
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/DirectiveBasedActionUtils.kt
+92
View File
@@ -0,0 +1,92 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.test
import com.google.common.base.Function
import com.google.common.base.Predicate
import com.google.common.collect.Collections2
import com.google.common.collect.Lists
import com.google.common.collect.Ordering
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.idea.caches.resolve.*
import org.jetbrains.kotlin.idea.highlighter.IdeErrorMessages
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import java.util.Arrays
import java.util.Collections
public object DirectiveBasedActionUtils {
public fun checkForUnexpectedErrors(file: JetFile) {
if (!InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// DISABLE-ERRORS").isEmpty()) {
return
}
val diagnostics = file.analyzeFully().getDiagnostics().all()
val errorDiagnostics = Collections2.filter(diagnostics, object : Predicate<Diagnostic> {
override fun apply(diagnostic: Diagnostic?): Boolean {
assert((diagnostic != null))
return diagnostic!!.getSeverity() == Severity.ERROR
}
})
val actualErrorStrings = Collections2.transform(errorDiagnostics, object : Function<Diagnostic, String> {
override fun apply(diagnostic: Diagnostic?): String? {
assert((diagnostic != null))
return IdeErrorMessages.render(diagnostic)
}
})
val expectedErrorStrings = InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ERROR:")
Collections.sort(expectedErrorStrings)
UsefulTestCase.assertOrderedEquals("All actual errors should be mentioned in test data with // ERROR: directive. But no unnecessary errors should be me mentioned", Ordering.natural<Comparable>().sortedCopy(actualErrorStrings), expectedErrorStrings)
}
public fun checkAvailableActionsAreExpected(file: JetFile, availableActions: Collection<IntentionAction>) {
val validActions = Ordering.natural<Comparable>().sortedCopy(Lists.newArrayList(InTextDirectivesUtils.findLinesWithPrefixesRemoved(file.getText(), "// ACTION:")))
val actualActions = Ordering.natural<Comparable>().sortedCopy(Lists.newArrayList(Collections2.transform(availableActions, object : Function<IntentionAction, String> {
override fun apply(input: IntentionAction?): String? {
assert(input != null)
return input!!.getText()
}
})))
UsefulTestCase.assertOrderedEquals("Some unexpected actions available at current position. Use // ACTION: directive", filterOutIrrelevantActions(actualActions), filterOutIrrelevantActions(validActions))
}
private //TODO: hack, implemented because irrelevant actions behave in different ways on build server and locally
// this behaviour should be investigated and hack can be removed
fun filterOutIrrelevantActions(actions: Collection<String>): Collection<String> {
return Collections2.filter(actions, object : Predicate<String> {
override fun apply(input: String?): Boolean {
for (prefix in IRRELEVANT_ACTION_PREFIXES) {
if (input!!.startsWith(prefix)) {
return false
}
}
return true
}
})
}
private val IRRELEVANT_ACTION_PREFIXES = Arrays.asList("Disable ", "Edit intention settings", "Edit inspection profile setting", "Inject language or reference")
}
idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+1 -1
View File
@@ -120,7 +120,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
ConfigLibraryUtil.configureKotlinRuntimeAndSdk(getModule(), PluginTestCaseBase.mockJdk());
}
DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile());
DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((JetFile) getFile());
doTestFor(pathToFile, intentionAction, fileText);
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+2 -2
View File
@@ -125,7 +125,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
boolean actionShouldBeAvailable = pair.getSecond();
if (psiFile instanceof JetFile) {
DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) psiFile);
DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((JetFile) psiFile);
}
doAction(text, actionShouldBeAvailable, beforeFileName);
@@ -163,7 +163,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
"Infos:" + infos);
}
else {
DirectiveBasedActionUtils.checkAvailableActionsAreExpected((JetFile) getFile(), availableActions);
DirectiveBasedActionUtils.INSTANCE$.checkAvailableActionsAreExpected((JetFile) getFile(), availableActions);
}
}
else {
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+2 -2
View File
@@ -219,13 +219,13 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
}
else {
// Action shouldn't be found. Check that other actions are expected and thus tested action isn't there under another name.
DirectiveBasedActionUtils.checkAvailableActionsAreExpected((JetFile) getFile(), actions);
DirectiveBasedActionUtils.INSTANCE$.checkAvailableActionsAreExpected((JetFile) getFile(), actions);
}
}
}
public static void checkForUnexpectedErrors() {
DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile());
DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((JetFile) getFile());
}
@Override
idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
+1 -1
View File
@@ -1110,7 +1110,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
PsiFile currentFile = getFile();
checkResultByFile(currentFile.getName().replace("Before.", "After."));
if (checkErrorsAfter && currentFile instanceof JetFile) {
DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) currentFile);
DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((JetFile) currentFile);
}
}
}