From 375d8ad106409272c7fc9c618e254c826ee9caef Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 28 Oct 2013 14:52:06 +0400 Subject: [PATCH] do not check infos by default --- .../daemon/DaemonAnalyzerTestCase.java | 16 ++++++++++++++-- .../impl/CodeInsightTestFixtureImpl.java | 10 ++++++---- .../idea/maven/dom/MavenDomTestCase.java | 4 +--- .../impl/analysis/XmlNsPrefixAnnotator.java | 2 -- .../codeInsight/daemon/XmlHighlightingTest.java | 10 +++++----- .../com/intellij/xml/XMLCatalogManagerTest.java | 3 +-- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java index a0c5bfaa53ce..81d8ac4f9c70 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java @@ -52,6 +52,7 @@ import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.startup.StartupManager; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; @@ -75,6 +76,7 @@ import com.intellij.testFramework.HighlightTestInfo; import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlSchemaProvider; import gnu.trove.THashMap; import gnu.trove.TIntArrayList; @@ -284,8 +286,18 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase { return doDoTest(checkWarnings, checkInfos, false); } - protected Collection doDoTest(boolean checkWarnings, boolean checkInfos, boolean checkWeakWarnings) { - return checkHighlighting(new ExpectedHighlightingData(myEditor.getDocument(),checkWarnings, checkWeakWarnings, checkInfos, myFile)); + protected Collection doDoTest(final boolean checkWarnings, final boolean checkInfos, final boolean checkWeakWarnings) { + return ContainerUtil.filter( + checkHighlighting(new ExpectedHighlightingData(myEditor.getDocument(), checkWarnings, checkWeakWarnings, checkInfos, myFile)), + new Condition() { + @Override + public boolean value(HighlightInfo info) { + return (info.getSeverity() == HighlightSeverity.INFORMATION) && checkInfos || + (info.getSeverity() == HighlightSeverity.WARNING) && checkWarnings || + (info.getSeverity() == HighlightSeverity.WEAK_WARNING) && checkWeakWarnings || + info.getSeverity().compareTo(HighlightSeverity.WARNING) > 0; + } + }); } @NotNull diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 3fa3b8b2fe2f..733aeafd7bb4 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -395,12 +395,12 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override public long checkHighlighting() { - return checkHighlighting(true, true, true); + return checkHighlighting(true, false, true); } @Override public long testHighlighting(final String... filePaths) { - return testHighlighting(true, true, true, filePaths); + return testHighlighting(true, false, true, filePaths); } @Override @@ -512,8 +512,10 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig List infos = doHighlighting(); ArrayList actions = new ArrayList(); for (HighlightInfo info : infos) { - for (Pair pair : info.quickFixActionRanges) { - actions.add(pair.getFirst().getAction()); + if (info.quickFixActionRanges != null) { + for (Pair pair : info.quickFixActionRanges) { + actions.add(pair.getFirst().getAction()); + } } } return actions; diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java index 5ab6163e6796..ec73f528aefe 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java @@ -26,8 +26,6 @@ import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter; import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.util.Comparing; @@ -291,7 +289,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase { } protected void checkHighlighting(VirtualFile f) throws IOException { - checkHighlighting(f, true, true, true); + checkHighlighting(f, true, false, true); } protected void checkHighlighting(VirtualFile f, boolean checkWarnings, boolean checkInfos, boolean checkWeakWarnings) throws IOException { diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java index d0a5d8d964e8..eacbd5c78c73 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNsPrefixAnnotator.java @@ -17,7 +17,6 @@ package com.intellij.codeInsight.daemon.impl.analysis; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.XmlHighlighterColors; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; @@ -36,7 +35,6 @@ import java.util.List; public class XmlNsPrefixAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (ApplicationManager.getApplication().isUnitTestMode()) return; if (element instanceof XmlTag || element instanceof XmlAttribute) { List references = ContainerUtil.findAll(element.getReferences(), SchemaPrefixReference.class); for (SchemaPrefixReference reference : references) { diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java index 5436628a4429..e52ff0a092e1 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java @@ -1195,10 +1195,10 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { configureByFile(BASE_PATH + "web-app_2_4.xsd"); final String testName = getTestName(false); final String actionName = XmlBundle.message(AddXsiSchemaLocationForExtResourceAction.KEY); - doTestWithQuickFix(BASE_PATH + testName, actionName, true); - doTestWithQuickFix(BASE_PATH + testName + "2", actionName, true); - doTestWithQuickFix(BASE_PATH + testName + "3", actionName, true); - doTestWithQuickFix(BASE_PATH + testName + "4", actionName, true); + doTestWithQuickFix(BASE_PATH + testName, actionName, false); + doTestWithQuickFix(BASE_PATH + testName + "2", actionName, false); + doTestWithQuickFix(BASE_PATH + testName + "3", actionName, false); + doTestWithQuickFix(BASE_PATH + testName + "4", actionName, false); } public void testHighlightingWithConditionalSectionsInDtd() throws Exception { @@ -1998,7 +1998,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { getVirtualFile(BASE_PATH + "Substitute/test.xml"), getVirtualFile(BASE_PATH + "Substitute/schema-b.xsd"), getVirtualFile(BASE_PATH + "Substitute/schema-a.xsd") - }, true, true); + }, true, false); } public void testDtdWithXsd() throws Exception { diff --git a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java index b70c961f96b0..e2091af5410f 100644 --- a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java +++ b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java @@ -68,8 +68,7 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa myFixture.configureByFile("policy.xml"); try { ExternalResourceManagerEx.getInstanceEx().setCatalogPropertiesFile(getTestDataPath() + "catalog.properties"); - List infos = myFixture.doHighlighting(); - assertEquals(infos.toString(), 0, infos.size()); + myFixture.checkHighlighting(); } finally { ExternalResourceManagerEx.getInstanceEx().setCatalogPropertiesFile(null);