From f619145d2a53edc232943d6698c792218ee3a03a Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Fri, 13 Jul 2012 19:49:28 +0400 Subject: [PATCH] fixing blinking tests --- .../codeInsight/daemon/XmlHighlightingTest.java | 16 ++++------------ .../testData/xml/ComplexSchemaValidation.xml | 2 +- xml/tests/testData/xml/XHtmlValidation2.xml | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java index 5eb87b91d94b..5e9dfb510802 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java @@ -634,16 +634,8 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { } public void testXHtmlValidation2() throws Exception { - disableHtmlSupport(); - try { - configureByFile(getFullRelativeTestName()); - XmlFile descriptorFile = ((XmlFile)getFile()).getRootTag().getDescriptor().getNSDescriptor().getDescriptorFile(); - assertEquals("xhtml1-transitional.xsd", descriptorFile.getVirtualFile().getName()); - doDoTest(true, true, true); - } - finally { - enableHtmlSupport(); - } + configureByFile(getFullRelativeTestName()); + doDoTest(true, true, true); } public void testXHtmlValidation3() throws Exception { @@ -700,12 +692,12 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase { } public void testComplexSchemaValidation() throws Exception { - disableHtmlSupport(); +// disableHtmlSupport(); try { doTest(getFullRelativeTestName(), false, false); } finally { - enableHtmlSupport(); +// enableHtmlSupport(); } } diff --git a/xml/tests/testData/xml/ComplexSchemaValidation.xml b/xml/tests/testData/xml/ComplexSchemaValidation.xml index 49aa455d5f8d..8ce00275c70f 100644 --- a/xml/tests/testData/xml/ComplexSchemaValidation.xml +++ b/xml/tests/testData/xml/ComplexSchemaValidation.xml @@ -6,7 +6,7 @@ - + diff --git a/xml/tests/testData/xml/XHtmlValidation2.xml b/xml/tests/testData/xml/XHtmlValidation2.xml index 2429ef5e0f17..49dd99faab6e 100644 --- a/xml/tests/testData/xml/XHtmlValidation2.xml +++ b/xml/tests/testData/xml/XHtmlValidation2.xml @@ -1,7 +1,7 @@ http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd"> - + Untitled Document