2004-03-31 Atsushi Enomoto <[email protected]>

	* Added XmlSchemaAssertion.cs.
	* XmlSchemaTests.cs : now uses XmlSchemaAssertion.

svn path=/trunk/mcs/; revision=24856

mcs/class/System.XML/Test/System.Xml.Schema/ChangeLog

@@ -1,3 +1,14 @@
+2004-03-31  Atsushi Enomoto <[email protected]>
+
+	* Added XmlSchemaAssertion.cs.
+	* XmlSchemaTests.cs : now uses XmlSchemaAssertion.
+
+2004-01-03  Atsushi Enomoto <[email protected]>
+
+	* XmlSchemaTests.cs : fixed file path. Added more tests.
+	* added XmlSchemaCollectionTests.cs and XmlSchemaDatatypeTests.cs (the
+	  latter one's purpose overlaps with XmlSchemaBuiltInDatatypeTests ;)
+
 2003-12-17  David Sheldon <[email protected]>
 
   * Added XmlSchemaBuiltInDatatypeTests.cs : Currently fails due to

mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaAssertion.cs

@@ -0,0 +1,100 @@
+//
+// System.Xml.XmlSchemaAssertion.cs
+//
+// Author:
+//   Atsushi Enomoto <[email protected]>
+//
+// (C) 2004 Atsushi Enomoto
+//
+
+using System;
+using System.IO;
+using System.Xml;
+using System.Xml.Schema;
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	[TestFixture]
+	public class XmlSchemaAssertion : Assertion
+	{
+		protected XmlSchema GetSchema (string path)
+		{
+			return XmlSchema.Read (new XmlTextReader (path), null);
+		}
+
+		protected XmlQualifiedName QName (string name, string ns)
+		{
+			return new XmlQualifiedName (name, ns);
+		}
+
+		protected void AssertElement (XmlSchemaElement element,
+			string name, XmlQualifiedName refName, string id,
+			XmlQualifiedName schemaTypeName, XmlSchemaType schemaType)
+		{
+			AssertNotNull (element);
+			AssertEquals (name, element.Name);
+			AssertEquals (refName, element.RefName);
+			AssertEquals (id, element.Id);
+			AssertEquals (schemaTypeName, element.SchemaTypeName);
+			AssertEquals (schemaType, element.SchemaType);
+		}
+
+		protected void AssertElementEx (XmlSchemaElement element,
+			XmlSchemaDerivationMethod block, XmlSchemaDerivationMethod final,
+			string defaultValue, string fixedValue,
+			XmlSchemaForm form, bool isAbstract, bool isNillable,
+			XmlQualifiedName substGroup)
+		{
+			AssertNotNull (element);
+			AssertEquals (block, element.Block);
+			AssertEquals (final, element.Final);
+			AssertEquals (defaultValue, element.DefaultValue);
+			AssertEquals (fixedValue, element.FixedValue);
+			AssertEquals (form, element.Form);
+			AssertEquals (isAbstract, element.IsAbstract);
+			AssertEquals (isNillable, element.IsNillable);
+			AssertEquals (substGroup, element.SubstitutionGroup);
+		}
+
+		protected void AssertCompiledComplexType (XmlSchemaComplexType cType,
+			XmlQualifiedName name,
+			int attributesCount, int attributeUsesCount,
+			bool existsAny, Type contentModelType,
+			bool hasContentTypeParticle,
+			XmlSchemaContentType contentType)
+		{
+			AssertNotNull (cType);
+			AssertEquals (name.Name, cType.Name);
+			AssertEquals (name, cType.QualifiedName);
+			AssertEquals (attributesCount, cType.Attributes.Count);
+			AssertEquals (attributeUsesCount, cType.AttributeUses.Count);
+			Assert (existsAny == (cType.AttributeWildcard != null));
+			if (contentModelType == null)
+				AssertNull (cType.ContentModel);
+			else
+				AssertEquals (contentModelType, cType.ContentModel.GetType ());
+			AssertEquals (hasContentTypeParticle, cType.ContentTypeParticle != null);
+			AssertEquals (contentType, cType.ContentType);
+		}
+
+		protected void AssertCompiledComplexContentExtension (XmlSchemaComplexContentExtension xccx,
+			int attributeCount, bool hasAnyAttribute, XmlQualifiedName baseTypeName)
+		{
+			AssertNotNull (xccx);
+			AssertEquals (attributeCount, xccx.Attributes.Count);
+			AssertEquals (hasAnyAttribute, xccx.AnyAttribute != null);
+			AssertEquals (baseTypeName, xccx.BaseTypeName);
+			AssertNotNull (xccx.Particle);
+		}
+
+		protected void AssertCompiledElement (XmlSchemaElement element,
+			XmlQualifiedName name, object elementType)
+		{
+			AssertNotNull (element);
+			AssertEquals (name, element.QualifiedName);
+			AssertEquals (elementType, element.ElementType);
+		}
+
+	}
+}

mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs

@@ -16,86 +16,8 @@ using NUnit.Framework;
 namespace MonoTests.System.Xml
 {
 	[TestFixture]
-	public class XmlSchemaTests : Assertion
+	public class XmlSchemaTests : XmlSchemaAssertion
 	{
-		private XmlSchema GetSchema (string path)
-		{
-			return XmlSchema.Read (new XmlTextReader (path), null);
-		}
-
-		private XmlQualifiedName QName (string name, string ns)
-		{
-			return new XmlQualifiedName (name, ns);
-		}
-
-		private void AssertElement (XmlSchemaElement element,
-			string name, XmlQualifiedName refName, string id,
-			XmlQualifiedName schemaTypeName, XmlSchemaType schemaType)
-		{
-			AssertNotNull (element);
-			AssertEquals (name, element.Name);
-			AssertEquals (refName, element.RefName);
-			AssertEquals (id, element.Id);
-			AssertEquals (schemaTypeName, element.SchemaTypeName);
-			AssertEquals (schemaType, element.SchemaType);
-		}
-
-		private void AssertElementEx (XmlSchemaElement element,
-			XmlSchemaDerivationMethod block, XmlSchemaDerivationMethod final,
-			string defaultValue, string fixedValue,
-			XmlSchemaForm form, bool isAbstract, bool isNillable,
-			XmlQualifiedName substGroup)
-		{
-			AssertNotNull (element);
-			AssertEquals (block, element.Block);
-			AssertEquals (final, element.Final);
-			AssertEquals (defaultValue, element.DefaultValue);
-			AssertEquals (fixedValue, element.FixedValue);
-			AssertEquals (form, element.Form);
-			AssertEquals (isAbstract, element.IsAbstract);
-			AssertEquals (isNillable, element.IsNillable);
-			AssertEquals (substGroup, element.SubstitutionGroup);
-		}
-
-		private void AssertCompiledComplexType (XmlSchemaComplexType cType,
-			XmlQualifiedName name,
-			int attributesCount, int attributeUsesCount,
-			bool existsAny, Type contentModelType,
-			bool hasContentTypeParticle,
-			XmlSchemaContentType contentType)
-		{
-			AssertNotNull (cType);
-			AssertEquals (name.Name, cType.Name);
-			AssertEquals (name, cType.QualifiedName);
-			AssertEquals (attributesCount, cType.Attributes.Count);
-			AssertEquals (attributeUsesCount, cType.AttributeUses.Count);
-			Assert (existsAny == (cType.AttributeWildcard != null));
-			if (contentModelType == null)
-				AssertNull (cType.ContentModel);
-			else
-				AssertEquals (contentModelType, cType.ContentModel.GetType ());
-			AssertEquals (hasContentTypeParticle, cType.ContentTypeParticle != null);
-			AssertEquals (contentType, cType.ContentType);
-		}
-
-		private void AssertCompiledComplexContentExtension (XmlSchemaComplexContentExtension xccx,
-			int attributeCount, bool hasAnyAttribute, XmlQualifiedName baseTypeName)
-		{
-			AssertNotNull (xccx);
-			AssertEquals (attributeCount, xccx.Attributes.Count);
-			AssertEquals (hasAnyAttribute, xccx.AnyAttribute != null);
-			AssertEquals (baseTypeName, xccx.BaseTypeName);
-			AssertNotNull (xccx.Particle);
-		}
-
-		private void AssertCompiledElement (XmlSchemaElement element,
-			XmlQualifiedName name, object elementType)
-		{
-			AssertNotNull (element);
-			AssertEquals (name, element.QualifiedName);
-			AssertEquals (elementType, element.ElementType);
-		}
-
 		[Test]
 		public void TestRead ()
 		{
@@ -213,6 +135,7 @@ namespace MonoTests.System.Xml
 		{
 			XmlTextReader xtr = new XmlTextReader ("<root/>", XmlNodeType.Document, null);
 			XmlSchema schema = XmlSchema.Read (xtr, null);
+			xtr.Close ();
 		}
 
 		[Test]