Fixed orders in XmlSchemaObjectTable and got some S.R.Serialization tests working.

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
index 1bdeb26f61b4aa58c3d2154d6691687731c55bc2..705233649cb0f07380aa6f29139234d6a2c89f5e 100755 (executable)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
@@ -315,7 +315,6 @@ namespace MonoTests.System.Runtime.Serialization
 
                [Test]
                [ExpectedException (typeof (SerializationException))]
-               [Category ("NotWorking")] // behavior changed in 3.5/SP1
                public void SerializeSimpleXml ()
                {
                        DataContractSerializer ser =
@@ -980,7 +979,6 @@ namespace MonoTests.System.Runtime.Serialization
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void DeserializeDCWithNullableEnum ()
                {
                        DCWithNullableEnum dc = Deserialize<DCWithNullableEnum> (

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
index 725e24845ac2c505e3c993d72b3c4569313a4237..917c827aca89c7443b083ef9557d181e095316ed 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
@@ -236,12 +236,13 @@ namespace MonoTests.System.Runtime.Serialization
                }
 
                [Test]
-               [Category ("NotWorking")]
+               [Category ("NotWorking")] // importing almost-invalid element. This test is almost missing the point.
                public void ImportTest ()
                {
                        XsdDataContractImporter xsdi = GetImporter ();
                        XmlSchemaElement element = new XmlSchemaElement();
-                       //Assert.IsTrue (xsdi.CanImport (xss, element));
+                       Assert.IsTrue (xsdi.CanImport (xss, new QName ("dc", "http://schemas.datacontract.org/2004/07/")), "#i01");
+                       Assert.IsTrue (xsdi.CanImport (xss, element), "#i01-2");
                        Assert.AreEqual (new XmlQualifiedName ("anyType", XmlSchema.Namespace), xsdi.Import (xss, element), "#i02");
 
                        CodeCompileUnit ccu = xsdi.CodeCompileUnit;
@@ -318,7 +319,6 @@ namespace MonoTests.System.Runtime.Serialization
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void ImportAll ()
                {
                        NewXmlSchemaSet ();

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs
index ac3c1d5da4d96dd5656fc98c8bc998c0c7cf1845..9794b6038b3a6092dd8e4e3a0b46c0f72bf59557 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs
@@ -33,13 +33,11 @@ namespace System.Xml.Schema
        /// </summary>
        public class XmlSchemaObjectTable
        {
-//             private Hashtable table;
-               private HybridDictionary table;
+               private ListDictionary table;
 
                internal XmlSchemaObjectTable ()
                {
-//                     table = new Hashtable(); 
-                       table = new HybridDictionary (); 
+                       table = new ListDictionary (); 
                }
                public int Count 
                {