diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 07:38:01 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-12-08 07:38:01 +0300 |
| commit | e87e54f481ad5952e7586f88ec2170d6be596f1f (patch) | |
| tree | 042da9bf272b4286413857a2990ef8f087b7c50d /mcs/class/System.XML | |
| parent | 9e03d582bc41fc5997ebff2b365c04910cafa9b5 (diff) | |
2005-12-08 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchemaValidationException.cs : added SetSourceObject() which
is just for API compat (it does nothing on MS.NET).
Removed #if NET_2_0 inside #if NET_2_0.
* XsdParticleValidationTests.cs : ValidateRootElementOnlyInvalid()
does not throw validation exception under MS 2.0, this NotDotNet.
svn path=/trunk/mcs/; revision=54092
Diffstat (limited to 'mcs/class/System.XML')
4 files changed, 20 insertions, 2 deletions
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 994533aa5be..8dce9a6e518 100644 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,3 +1,9 @@ +2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + + * XmlSchemaValidationException.cs : added SetSourceObject() which + is just for API compat (it does nothing on MS.NET). + Removed #if NET_2_0 inside #if NET_2_0. + 2005-12-01 Atsushi Enomoto <atsushi@ximian.com> * XmlSchemaSequence.cs : when a subcomponent is not optional diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs index 8b6b9542ad4..df9258c1908 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaValidationException.cs @@ -83,15 +83,18 @@ namespace System.Xml.Schema { } -#if NET_2_0 [SecurityPermission (SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)] -#endif public override void GetObjectData ( SerializationInfo info, StreamingContext context) { base.GetObjectData (info, context); } + + // Never use it. It actually does nothing even on MS.NET 2.0. + protected internal void SetSourceObject (object o) + { + } } } diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog index f34580c14ae..d8a6c63fba1 100644 --- a/mcs/class/System.XML/Test/System.Xml/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog @@ -1,5 +1,10 @@ 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XsdParticleValidationTests.cs : ValidateRootElementOnlyInvalid() + does not throw validation exception under MS 2.0, this NotDotNet. + +2005-12-08 Atsushi Enomoto <atsushi@ximian.com> + * XmlReaderCommonTests.cs : use ProhibitDtd=false in CreateSimple() and added CreateSimpleProhibitDtd(). diff --git a/mcs/class/System.XML/Test/System.Xml/XsdParticleValidationTests.cs b/mcs/class/System.XML/Test/System.Xml/XsdParticleValidationTests.cs index 13f5b3cc82e..b7d4342e28f 100644 --- a/mcs/class/System.XML/Test/System.Xml/XsdParticleValidationTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XsdParticleValidationTests.cs @@ -48,6 +48,10 @@ namespace MonoTests.System.Xml }
[Test]
+#if NET_2_0
+ [Category ("NotDotNet")]
+ // MS.NET throws XmlSchemaException, not -ValidationException.
+#endif
[ExpectedException (typeof (ValidationException))]
public void ValidateRootElementOnlyInvalid ()
{
|