From 16099c8e793ba0cbccf6d753e54828fab571eb25 Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Tue, 23 Apr 2013 14:08:07 +0400 Subject: [PATCH] Fixed tests. Replaced http://www.w3.org/1999/xhtml/html5 with http://www.w3.org/1999/xhtml according to html5.rnc --- .../org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java | 2 +- .../org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java | 2 +- xml/relaxng/testData/completion/html5_1.xml | 2 +- xml/relaxng/testData/completion/html5_10.xml | 2 +- xml/relaxng/testData/completion/html5_10_after.xml | 2 +- xml/relaxng/testData/completion/html5_11.xml | 2 +- xml/relaxng/testData/completion/html5_11_after.xml | 2 +- xml/relaxng/testData/completion/html5_12.xml | 2 +- xml/relaxng/testData/completion/html5_12_after.xml | 2 +- xml/relaxng/testData/completion/html5_13.xml | 2 +- xml/relaxng/testData/completion/html5_13_after.xml | 2 +- xml/relaxng/testData/completion/html5_14.xml | 2 +- xml/relaxng/testData/completion/html5_14_after.xml | 2 +- xml/relaxng/testData/completion/html5_15.xml | 2 +- xml/relaxng/testData/completion/html5_15_after.xml | 2 +- xml/relaxng/testData/completion/html5_16.xml | 2 +- xml/relaxng/testData/completion/html5_16_after.xml | 2 +- xml/relaxng/testData/completion/html5_17.xml | 2 +- xml/relaxng/testData/completion/html5_17_after.xml | 2 +- xml/relaxng/testData/completion/html5_1_after.xml | 2 +- xml/relaxng/testData/completion/html5_2.xml | 2 +- xml/relaxng/testData/completion/html5_2_after.xml | 2 +- xml/relaxng/testData/completion/html5_3.xml | 2 +- xml/relaxng/testData/completion/html5_3_after.xml | 2 +- xml/relaxng/testData/completion/html5_4.xml | 2 +- xml/relaxng/testData/completion/html5_4_after.xml | 2 +- xml/relaxng/testData/completion/html5_5.xml | 2 +- xml/relaxng/testData/completion/html5_5_after.xml | 2 +- xml/relaxng/testData/completion/html5_6.xml | 2 +- xml/relaxng/testData/completion/html5_6_after.xml | 2 +- xml/relaxng/testData/completion/html5_7.xml | 2 +- xml/relaxng/testData/completion/html5_7_after.xml | 2 +- xml/relaxng/testData/completion/html5_8.xml | 2 +- xml/relaxng/testData/completion/html5_8_after.xml | 2 +- xml/relaxng/testData/completion/html5_9.xml | 2 +- xml/relaxng/testData/completion/html5_9_after.xml | 2 +- xml/relaxng/testData/highlighting/Html5.xml | 2 +- xml/relaxng/testData/highlighting/Html5_2.xml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java index a91b109d1631..ada223d18413 100644 --- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java +++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java @@ -32,7 +32,7 @@ public class RngHtml5CompletionTest extends HighlightingTestBase { protected void init() { super.init(); - ExternalResourceManagerImpl.addTestResource("http://www.w3.org/1999/xhtml/html5", toAbsolutePath("/highlighting/html5/html5.rnc"), + ExternalResourceManagerImpl.addTestResource("http://www.w3.org/1999/xhtml", toAbsolutePath("/highlighting/html5/html5.rnc"), myTestRootDisposable); } diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java index 18a3f274a337..d813d2bcbf48 100644 --- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java +++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java @@ -47,7 +47,7 @@ public class RngXmlHighlightingTest extends HighlightingTestBase { ExternalResourceManagerImpl.addTestResource("http://www.w3.org/1999/XSL/Format", toAbsolutePath("highlighting/rnc/fo/main.rnc"), myTestRootDisposable); ExternalResourceManagerImpl.addTestResource("http://docbook.org/ns/docbook", toAbsolutePath("highlighting/docbook.rng"), myTestRootDisposable); ExternalResourceManagerImpl.addTestResource("urn:intelliForm:AttachmentFilter", toAbsolutePath("highlighting/attachment-filter.rng"), myTestRootDisposable); - ExternalResourceManagerImpl.addTestResource("http://www.w3.org/1999/xhtml/html5", toAbsolutePath("highlighting/html5/xhtml5.rnc"), myTestRootDisposable); + ExternalResourceManagerImpl.addTestResource("http://www.w3.org/1999/xhtml", toAbsolutePath("highlighting/html5/xhtml5.rnc"), myTestRootDisposable); m.addIgnoredResource("urn:intelliForm:Spaces"); m.addIgnoredResource("http://www.w3.org/1999/xlink"); diff --git a/xml/relaxng/testData/completion/html5_1.xml b/xml/relaxng/testData/completion/html5_1.xml index 7ee0c6e457a1..3f9d25bfb95d 100644 --- a/xml/relaxng/testData/completion/html5_1.xml +++ b/xml/relaxng/testData/completion/html5_1.xml @@ -1,4 +1,4 @@ - + > diff --git a/xml/relaxng/testData/completion/html5_10.xml b/xml/relaxng/testData/completion/html5_10.xml index e6d1b0392a5b..d4c912da7bfd 100644 --- a/xml/relaxng/testData/completion/html5_10.xml +++ b/xml/relaxng/testData/completion/html5_10.xml @@ -1,4 +1,4 @@ - + diff --git a/xml/relaxng/testData/completion/html5_10_after.xml b/xml/relaxng/testData/completion/html5_10_after.xml index a726437c7c26..9ddc16df2c56 100644 --- a/xml/relaxng/testData/completion/html5_10_after.xml +++ b/xml/relaxng/testData/completion/html5_10_after.xml @@ -1,4 +1,4 @@ - + diff --git a/xml/relaxng/testData/completion/html5_11.xml b/xml/relaxng/testData/completion/html5_11.xml index e0f811a6ba61..118122563768 100644 --- a/xml/relaxng/testData/completion/html5_11.xml +++ b/xml/relaxng/testData/completion/html5_11.xml @@ -1,4 +1,4 @@ - +