diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2014-10-24 03:14:58 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2014-10-24 03:14:58 +0400 |
| commit | 3d9a2b7175525f8451476f4b6d63c88c2cd4a197 (patch) | |
| tree | 250ee63ce0f1ab3e93c2b1233c352b6542aee3eb /mcs/class/Commons.Xml.Relaxng | |
| parent | e1da8e304d3b330a968de9c14305632e9285e5ca (diff) | |
[relaxng] fix default namespace handling in compact syntax.
Also had to disable RNC tests that depended on vanished web resource...
Diffstat (limited to 'mcs/class/Commons.Xml.Relaxng')
3 files changed, 16 insertions, 2 deletions
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay index df3157f022a..625df5ca152 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncParser.jay @@ -107,7 +107,7 @@ namespace Commons.Xml.Relaxng.Rnc public RelaxngPattern Parse (TextReader source, string baseUri, string defaultNamespace) { - this.defaultNamespace = defaultNamespace; + this.defaultNamespace = defaultNamespace ?? string.Empty; if (defaultNamespace != null && defaultNamespace.Length != 0) nsmgr.AddNamespace (String.Empty, defaultNamespace); try { diff --git a/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs b/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs index d25fcb1e1c7..fb7ac65e9c7 100644 --- a/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs +++ b/mcs/class/Commons.Xml.Relaxng/Test/RncTests.cs @@ -95,5 +95,19 @@ start = mine"; r.Close (); } } + + [Test] + public void SimpleDefaultNamespace () + { + var g = RncParser.ParseRnc (new StringReader ("element e { empty }")); + var x = XmlReader.Create (new StringReader ("<e/>")); + var r = new RelaxngValidatingReader (x, g); + try { + while (!r.EOF) + r.Read (); + } finally { + r.Close (); + } + } } } diff --git a/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile b/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile index 6653702d556..9be0e7ff400 100644 --- a/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile +++ b/mcs/class/Commons.Xml.Relaxng/Test/standalone_tests/Makefile @@ -8,7 +8,7 @@ TEST_ARCHIVE = testSuite.zip RNCTESTS = test/RNCTest.xml RNCTEST_ARCHIVE = anglia-test-suite.zip -all : relaxngtest.exe anglia-test-runner.exe +all : relaxngtest.exe #anglia-test-runner.exe relaxngtest.exe : relaxngtest.cs $(TESTS) $(MCS_RUNTIME) $(MCS) -debug+ relaxngtest.cs -r:Commons.Xml.Relaxng.dll |