MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
anna
2012-07-13 17:58:59 +02:00
parent 1e00a12c68 f619145d2a
commit 2bf0768984
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
+4 -12
View File
@@ -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();
}
}
xml/tests/testData/xml/ComplexSchemaValidation.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<xsl:template match="/page">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"/>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
<link title="Esquema de cores padr?o" rel="stylesheet" type="text/css" href="stylesheets/css/default.css"/>
</head>
<body id="_top">
xml/tests/testData/xml/XHtmlValidation2.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "<error>http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd</error>">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<title>Untitled Document</title>
</head>