Author: atsushi
Date: 2006-10-27 12:17:11 -0400 (Fri, 27 Oct 2006)
New Revision: 67032
Modified:
trunk/mcs/class/System.XML/System.Xml.Schema/ChangeLog
trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
Log:
2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlSchemaValidator.cs : it must also be fixed for method signature
change.
* XmlSchemaSimpleTypeRestriction.cs : on .NET 2.0, use
IXmlNamespaceResolver for XmlSchemaValidator.
* XsdValidatingReaderTests.cs : the previous test raises different
exception in 2.0.
Modified: trunk/mcs/class/System.XML/System.Xml.Schema/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Schema/ChangeLog 2006-10-27
15:12:25 UTC (rev 67031)
+++ trunk/mcs/class/System.XML/System.Xml.Schema/ChangeLog 2006-10-27
16:17:11 UTC (rev 67032)
@@ -1,5 +1,12 @@
2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * XmlSchemaValidator.cs : it must also be fixed for method signature
+ change.
+ * XmlSchemaSimpleTypeRestriction.cs : on .NET 2.0, use
+ IXmlNamespaceResolver for XmlSchemaValidator.
+
+2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* XmlSchemaSimpleTypeRestriction.cs : for facet validation, it should
use namespacemanager. Though the change is not perfect, thus I
disable this change for now.
Modified:
trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
===================================================================
---
trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
2006-10-27 15:12:25 UTC (rev 67031)
+++
trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
2006-10-27 16:17:11 UTC (rev 67032)
@@ -30,6 +30,12 @@
using Mono.Xml.Schema;
using System.Globalization;
+#if NET_2_0
+using NSResolver = System.Xml.IXmlNamespaceResolver;
+#else
+using NSResolver = System.Xml.XmlNamespaceManager;
+#endif
+
namespace System.Xml.Schema
{
/// <summary>
@@ -601,7 +607,7 @@
return ret;
}
- internal bool ValidateValueWithFacets (string value,
XmlNameTable nt, XmlNamespaceManager nsmgr)
+ internal bool ValidateValueWithFacets (string value,
XmlNameTable nt, NSResolver nsmgr)
{
/*
* FIXME: Shouldn't this be recursing more? What if
this is a
@@ -617,7 +623,7 @@
return ValidateNonListValueWithFacets (value,
nt, nsmgr);
}
- private bool ValidateListValueWithFacets (string value,
XmlNameTable nt, XmlNamespaceManager nsmgr)
+ private bool ValidateListValueWithFacets (string value,
XmlNameTable nt, NSResolver nsmgr)
{
string [] list = ((XsdAnySimpleType)
XmlSchemaDatatype.FromName ("anySimpleType",
XmlSchema.Namespace)).ParseListValue (value, nt);
@@ -667,7 +673,7 @@
return true;
}
- private bool ValidateNonListValueWithFacets (string value,
XmlNameTable nt, XmlNamespaceManager nsmgr)
+ private bool ValidateNonListValueWithFacets (string value,
XmlNameTable nt, NSResolver nsmgr)
{
// pattern
// Patterns are the only facets that need to be checked
on this
Modified: trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
2006-10-27 15:12:25 UTC (rev 67031)
+++ trunk/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidator.cs
2006-10-27 16:17:11 UTC (rev 67032)
@@ -1033,7 +1033,7 @@
if (baseType != null) {
ret =
AssessStringValid (baseType, dt, value);
}
- if
(!str.ValidateValueWithFacets (value, nameTable)) {
+ if
(!str.ValidateValueWithFacets (value, nameTable, nsResolver)) {
HandleError ("Specified
value was invalid against the facets.");
break;
}
Modified: trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog 2006-10-27
15:12:25 UTC (rev 67031)
+++ trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog 2006-10-27
16:17:11 UTC (rev 67032)
@@ -1,9 +1,14 @@
2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
- * XmlValidatingReaderTests.cs : added bug #79650 case.
+ * XsdValidatingReaderTests.cs : the previous test raises different
+ exception in 2.0.
2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * XsdValidatingReaderTests.cs : added bug #79650 case.
+
+2006-10-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* XmlTextReaderTests.cs : added bug #79683 case.
2006-09-26 Atsushi Enomoto <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
2006-10-27 15:12:25 UTC (rev 67031)
+++ trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
2006-10-27 16:17:11 UTC (rev 67032)
@@ -321,7 +321,12 @@
}
[Test] // bug #79650
+#if NET_2_0
+ // annoyance
+ [ExpectedException (typeof (XmlSchemaValidationException))]
+#else
[ExpectedException (typeof (XmlSchemaException))]
+#endif
public void EnumerationFacetOnAttribute ()
{
string xml = "<test mode='NOT A ENUMERATION VALUE' />";
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
