[bcl] Replace deprecated usage of Assertion class and Is.InstanceOfType usages.

nunitlite does not contain Assertion class.

nunitlite does not implement Is.InstanceOfType, replaced usages of:
Assert.That (type, Is.InstanceOfType(typeof(T))) with Assert.IsInstanceOfType.

diff --git a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
index 945b22a484c133f221f36a64228b248096e57777..2e2890b4ec5b303c526d81cb0062289831fd1a55 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
@@ -40,7 +40,7 @@ using Microsoft.CSharp;
 namespace MonoTests.System.Data
 {
        [TestFixture]
-       public class TypedDataSetGeneratorTest : Assertion
+       public class TypedDataSetGeneratorTest
        {
                private ICodeGenerator gen;
                private ICodeCompiler compiler;
@@ -70,20 +70,20 @@ namespace MonoTests.System.Data
                public void TestGenerateIdName ()
                {
                
-                       AssertEquals ("#1", "a", TypedDataSetGenerator.GenerateIdName ("a", gen));
-                       AssertEquals ("#2", "_int", TypedDataSetGenerator.GenerateIdName ("int", gen));
-                       AssertEquals ("#3", "_", TypedDataSetGenerator.GenerateIdName ("_", gen));
-                       AssertEquals ("#3-2", "_", TypedDataSetGenerator.GenerateIdName ("_", gen));
-                       AssertEquals ("#4", "_1", TypedDataSetGenerator.GenerateIdName ("1", gen));
-                       AssertEquals ("#4-2", "_1", TypedDataSetGenerator.GenerateIdName ("1", gen));
-                       AssertEquals ("#5", "_1a", TypedDataSetGenerator.GenerateIdName ("1a", gen));
-                       AssertEquals ("#6", "_1_2", TypedDataSetGenerator.GenerateIdName ("1*2", gen));
-                       AssertEquals ("#7", "__", TypedDataSetGenerator.GenerateIdName ("-", gen));
-                       AssertEquals ("#8", "__", TypedDataSetGenerator.GenerateIdName ("+", gen));
-                       AssertEquals ("#9", "_", TypedDataSetGenerator.GenerateIdName ("", gen));
-                       AssertEquals ("#10", "___", TypedDataSetGenerator.GenerateIdName ("--", gen));
-                       AssertEquals ("#11", "___", TypedDataSetGenerator.GenerateIdName ("++", gen));
-                       AssertEquals ("#12", "\u3042", TypedDataSetGenerator.GenerateIdName ("\u3042", gen));
+                       Assert.AreEqual ("a", TypedDataSetGenerator.GenerateIdName ("a", gen), "#1");
+                       Assert.AreEqual ("_int", TypedDataSetGenerator.GenerateIdName ("int", gen), "#2");
+                       Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("_", gen), "#3");
+                       Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("_", gen), "#3-2");
+                       Assert.AreEqual ("_1", TypedDataSetGenerator.GenerateIdName ("1", gen), "#4");
+                       Assert.AreEqual ("_1", TypedDataSetGenerator.GenerateIdName ("1", gen), "#4-2");
+                       Assert.AreEqual ("_1a", TypedDataSetGenerator.GenerateIdName ("1a", gen), "#5");
+                       Assert.AreEqual ("_1_2", TypedDataSetGenerator.GenerateIdName ("1*2", gen), "#6");
+                       Assert.AreEqual ("__", TypedDataSetGenerator.GenerateIdName ("-", gen), "#7");
+                       Assert.AreEqual ("__", TypedDataSetGenerator.GenerateIdName ("+", gen), "#8");
+                       Assert.AreEqual ("_", TypedDataSetGenerator.GenerateIdName ("", gen), "#9");
+                       Assert.AreEqual ("___", TypedDataSetGenerator.GenerateIdName ("--", gen), "#10");
+                       Assert.AreEqual ("___", TypedDataSetGenerator.GenerateIdName ("++", gen), "#11");
+                       Assert.AreEqual ("\u3042", TypedDataSetGenerator.GenerateIdName ("\u3042", gen), "#12");
                }
 
                [Test]
@@ -98,7 +98,7 @@ namespace MonoTests.System.Data
                        ccu.Namespaces.Add (cns);
                        CompilerResults r = compiler.CompileAssemblyFromDom (
                                new CompilerParameters (), ccu);
-                       AssertEquals (0, r.Errors.Count);
+                       Assert.AreEqual (0, r.Errors.Count);
                }
        }
 }

diff --git a/mcs/class/System.Runtime.Remoting/Test/RemotingServicesTest.cs b/mcs/class/System.Runtime.Remoting/Test/RemotingServicesTest.cs
index f9ad75cd3ac4a05f55b984212b19982d795a576a..02c6a532c00ce24d94a757b312892a2df1920c86 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Test/RemotingServicesTest.cs
+++ b/mcs/class/System.Runtime.Remoting/Test/RemotingServicesTest.cs
@@ -193,7 +193,7 @@ namespace MonoTests.Remoting
 \r
        // The main test class\r
        [TestFixture]\r
-       public class RemotingServicesTest : Assertion\r
+       public class RemotingServicesTest\r
        {\r
                private static int MarshalObjectId = 0;\r
 \r
@@ -233,13 +233,13 @@ namespace MonoTests.Remoting
                        MarshalObject objMarshal = NewMarshalObject ();\r
                        ObjRef objRef = RemotingServices.Marshal (objMarshal);\r
 \r
-                       Assert ("#A01", objRef.URI != null);\r
+                       Assert.IsNotNull (objRef.URI, "#A01");\r
 \r
                        MarshalObject objRem = (MarshalObject) RemotingServices.Unmarshal (objRef);\r
-                       AssertEquals ("#A02", objMarshal.Id, objRem.Id);\r
+                       Assert.AreEqual (objMarshal.Id, objRem.Id, "#A02");\r
 \r
                        objRem.Id = 2;\r
-                       AssertEquals ("#A03", objMarshal.Id, objRem.Id);\r
+                       Assert.AreEqual (objMarshal.Id, objRem.Id, "#A03");\r
 \r
                        // TODO: uncomment when RemotingServices.Disconnect is implemented\r
                        //RemotingServices.Disconnect(objMarshal);\r
@@ -248,7 +248,7 @@ namespace MonoTests.Remoting
 \r
                        objRef = RemotingServices.Marshal (objMarshal, objMarshal.Uri);\r
 \r
-                       Assert ("#A04", objRef.URI.EndsWith (objMarshal.Uri));\r
+                       Assert.IsTrue (objRef.URI.EndsWith (objMarshal.Uri), "#A04");\r
                        // TODO: uncomment when RemotingServices.Disconnect is implemented\r
                        //RemotingServices.Disconnect(objMarshal);\r
                }\r
@@ -261,7 +261,7 @@ namespace MonoTests.Remoting
                        ObjRef objRef = RemotingServices.Marshal (derivedObjMarshal, derivedObjMarshal.Uri, typeof (MarshalObject));\r
 \r
                        // Check that the type of the marshaled object is MarshalObject\r
-                       Assert ("#A05", objRef.TypeInfo.TypeName.StartsWith ((typeof (MarshalObject)).ToString ()));\r
+                       Assert.IsTrue (objRef.TypeInfo.TypeName.StartsWith ((typeof (MarshalObject)).ToString ()), "#A05");\r
 \r
                        // TODO: uncomment when RemotingServices.Disconnect is implemented\r
                        //RemotingServices.Disconnect(derivedObjMarshal);\r
@@ -273,11 +273,11 @@ namespace MonoTests.Remoting
                {\r
                        MarshalObject objMarshal = NewMarshalObject ();\r
 \r
-                       Assert ("#A06", RemotingServices.GetObjectUri (objMarshal) == null);\r
+                       Assert.IsNull (RemotingServices.GetObjectUri (objMarshal), "#A06");\r
 \r
                        RemotingServices.Marshal (objMarshal);\r
 \r
-                       Assert ("#A07", RemotingServices.GetObjectUri (objMarshal) != null);\r
+                       Assert.IsNotNull (RemotingServices.GetObjectUri (objMarshal), "#A07");\r
                        // TODO: uncomment when RemotingServices.Disconnect is implemented\r
                        //RemotingServices.Disconnect(objMarshal);\r
                }\r
@@ -297,7 +297,7 @@ namespace MonoTests.Remoting
                        try {\r
                                RemotingServices.Marshal (objMarshal, objMarshal.Uri);\r
                                MarshalObject objRem = (MarshalObject) RemotingServices.Connect (typeof (MarshalObject), "tcp://localhost:1236/" + objMarshal.Uri);\r
-                               Assert ("#A08", RemotingServices.IsTransparentProxy (objRem));\r
+                               Assert.IsTrue (RemotingServices.IsTransparentProxy (objRem), "#A08");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                                RemotingServices.Disconnect (objMarshal);\r
@@ -324,7 +324,7 @@ namespace MonoTests.Remoting
                                // a real object\r
                                try {\r
                                        RemotingServices.Marshal (objRem, objMarshal.Uri);\r
-                                       Fail ("#1");\r
+                                       Assert.Fail ("#1");\r
                                } catch (RemotingException e) {\r
                                }\r
                        } finally {\r
@@ -355,15 +355,15 @@ namespace MonoTests.Remoting
                                objRem.Method1 ();\r
 \r
                                // Tests RemotingServices.GetMethodBaseFromMethodMessage()\r
-                               AssertEquals ("#A09", "Method1", proxy.MthBase.Name);\r
-                               Assert ("#A09.1", !proxy.IsMethodOverloaded);\r
+                               Assert.AreEqual ("Method1", proxy.MthBase.Name, "#A09");\r
+                               Assert.IsFalse (proxy.IsMethodOverloaded, "#A09.1");\r
 \r
                                objRem.Method2 ();\r
-                               Assert ("#A09.2", proxy.IsMethodOverloaded);\r
+                               Assert.IsTrue (proxy.IsMethodOverloaded, "#A09.2");\r
 \r
                                // Tests RemotingServices.ExecuteMessage();\r
                                // If ExecuteMessage does it job well, Method1 should be called 2 times\r
-                               AssertEquals ("#A10", 2, MarshalObject.Called);\r
+                               Assert.AreEqual (2, MarshalObject.Called, "#A10");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -380,14 +380,14 @@ namespace MonoTests.Remoting
 \r
                                MarshalObject objRem = (MarshalObject) Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1238/MarshalObject.rem");\r
 \r
-                               Assert ("#A10.1", RemotingServices.IsTransparentProxy (objRem));\r
+                               Assert.IsTrue (RemotingServices.IsTransparentProxy (objRem), "#A10.1");\r
 \r
                                objRem.Method1 ();\r
                                Thread.Sleep (20);\r
-                               Assert ("#A10.2", !MarshalObject.IsMethodOneWay);\r
+                               Assert.IsFalse (MarshalObject.IsMethodOneWay, "#A10.2");\r
                                objRem.Method3 ();\r
                                Thread.Sleep (20);\r
-                               Assert ("#A10.3", MarshalObject.IsMethodOneWay);\r
+                               Assert.IsTrue (MarshalObject.IsMethodOneWay, "#A10.3");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -409,7 +409,7 @@ namespace MonoTests.Remoting
 \r
                                ObjRef objRefRem = RemotingServices.GetObjRefForProxy ((MarshalByRefObject) objRem);\r
 \r
-                               Assert ("#A11", objRefRem != null);\r
+                               Assert.IsNotNull (objRefRem, "#A11");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -429,8 +429,8 @@ namespace MonoTests.Remoting
 \r
                                RealProxy rp = RemotingServices.GetRealProxy (objRem);\r
 \r
-                               Assert ("#A12", rp != null);\r
-                               AssertEquals ("#A13", "MonoTests.System.Runtime.Remoting.RemotingServicesInternal.MyProxy", rp.GetType ().ToString ());\r
+                               Assert.IsNotNull (rp, "#A12");\r
+                               Assert.AreEqual ("MonoTests.System.Runtime.Remoting.RemotingServicesInternal.MyProxy", rp.GetType ().ToString (), "#A13");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -448,7 +448,7 @@ namespace MonoTests.Remoting
                                RemotingServices.Marshal (objRem);\r
 \r
                                objRem = (MarshalObject) Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1242/" + objRem.Uri);\r
-                               Assert ("#A14", objRem != null);\r
+                               Assert.IsNotNull (objRem, "#A14");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -468,7 +468,7 @@ namespace MonoTests.Remoting
                                RemotingServices.Marshal (objRem);\r
 \r
                                Type typeRem = RemotingServices.GetServerTypeForUri (RemotingServices.GetObjectUri (objRem));\r
-                               AssertEquals ("#A15", type, typeRem);\r
+                               Assert.AreEqual (type, typeRem, "#A15");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -487,12 +487,12 @@ namespace MonoTests.Remoting
 \r
                                MarshalObject objRem = (MarshalObject) Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1245/MarshalObject2.rem");\r
 \r
-                               Assert ("#A16", RemotingServices.IsObjectOutOfAppDomain (objRem));\r
-                               Assert ("#A17", RemotingServices.IsObjectOutOfContext (objRem));\r
+                               Assert.IsTrue (RemotingServices.IsObjectOutOfAppDomain (objRem), "#A16");\r
+                               Assert.IsTrue (RemotingServices.IsObjectOutOfContext (objRem), "#A17");\r
 \r
                                MarshalObject objMarshal = new MarshalObject ();\r
-                               Assert ("#A18", !RemotingServices.IsObjectOutOfAppDomain (objMarshal));\r
-                               Assert ("#A19", !RemotingServices.IsObjectOutOfContext (objMarshal));\r
+                               Assert.IsFalse (RemotingServices.IsObjectOutOfAppDomain (objMarshal), "#A18");\r
+                               Assert.IsFalse (RemotingServices.IsObjectOutOfContext (objMarshal), "#A19");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -510,16 +510,16 @@ namespace MonoTests.Remoting
                                MarshalObject objRem = (MarshalObject) Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1246/app/obj3.rem");\r
                                MarshalObject objRem2 = (MarshalObject) Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1246/obj3.rem");\r
 \r
-                               Assert ("#AN1", RemotingServices.IsTransparentProxy (objRem));\r
-                               Assert ("#AN2", RemotingServices.IsTransparentProxy (objRem2));\r
+                               Assert.IsTrue (RemotingServices.IsTransparentProxy (objRem), "#AN1");\r
+                               Assert.IsTrue (RemotingServices.IsTransparentProxy (objRem2), "#AN2");\r
 \r
-                               AssertNotNull ("#AN3", RemotingServices.GetServerTypeForUri ("obj3.rem"));\r
-                               AssertNotNull ("#AN4", RemotingServices.GetServerTypeForUri ("/app/obj3.rem"));\r
-                               AssertNull ("#AN5", RemotingServices.GetServerTypeForUri ("//app/obj3.rem"));\r
-                               AssertNull ("#AN6", RemotingServices.GetServerTypeForUri ("app/obj3.rem"));\r
-                               AssertNull ("#AN7", RemotingServices.GetServerTypeForUri ("/whatever/obj3.rem"));\r
-                               AssertNotNull ("#AN8", RemotingServices.GetServerTypeForUri ("/obj3.rem"));\r
-                               AssertNull ("#AN9", RemotingServices.GetServerTypeForUri ("//obj3.rem"));\r
+                               Assert.IsNotNull (RemotingServices.GetServerTypeForUri ("obj3.rem"), "#AN3");\r
+                               Assert.IsNotNull (RemotingServices.GetServerTypeForUri ("/app/obj3.rem"), "#AN4");\r
+                               Assert.IsNull (RemotingServices.GetServerTypeForUri ("//app/obj3.rem"), "#AN5");\r
+                               Assert.IsNull (RemotingServices.GetServerTypeForUri ("app/obj3.rem"), "#AN6");\r
+                               Assert.IsNull (RemotingServices.GetServerTypeForUri ("/whatever/obj3.rem"), "#AN7");\r
+                               Assert.IsNotNull (RemotingServices.GetServerTypeForUri ("/obj3.rem"), "#AN8");\r
+                               Assert.IsNull (RemotingServices.GetServerTypeForUri ("//obj3.rem"), "#AN9");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -534,7 +534,7 @@ namespace MonoTests.Remoting
                                RemotingConfiguration.RegisterWellKnownServiceType (typeof (MarshalObject), "getobjectwithchanneldata.rem", WellKnownObjectMode.Singleton);\r
 \r
                                string channelData = "test";\r
-                               AssertNotNull ("#01", Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1247/getobjectwithchanneldata.rem", channelData));\r
+                               Assert.IsNotNull (Activator.GetObject (typeof (MarshalObject), "tcp://localhost:1247/getobjectwithchanneldata.rem", channelData), "#01");\r
                        } finally {\r
                                ChannelServices.UnregisterChannel (chn);\r
                        }\r
@@ -548,28 +548,28 @@ namespace MonoTests.Remoting
                        RemotingConfiguration.Configure (null);\r
 \r
                        o = RemotingServices.Connect (typeof (MarshalByRefObject), "tcp://localhost:3434/ff1.rem");\r
-                       Assert ("#m1", o is DD);\r
-                       Assert ("#m2", o is A);\r
-                       Assert ("#m3", o is B);\r
-                       Assert ("#m4", !(o is CC));\r
+                       Assert.IsInstanceOfType (typeof (DD), o, "#m1");\r
+                       Assert.IsInstanceOfType (typeof (A), o, "#m2");\r
+                       Assert.IsInstanceOfType (typeof (B), o, "#m3");\r
+                       AssertHelper.IsNotInstanceOfType (typeof (CC), !(o is CC), "#m4");\r
 \r
                        o = RemotingServices.Connect (typeof (A), "tcp://localhost:3434/ff3.rem");\r
-                       Assert ("#a1", o is DD);\r
-                       Assert ("#a2", o is A);\r
-                       Assert ("#a3", o is B);\r
-                       Assert ("#a4", !(o is CC));\r
+                       Assert.IsInstanceOfType (typeof (DD), o, "#a1");\r
+                       Assert.IsInstanceOfType (typeof (A), o, "#a2");\r
+                       Assert.IsInstanceOfType (typeof (B), o, "#a3");\r
+                       AssertHelper.IsNotInstanceOfType (typeof (CC), o, "#a4");\r
 \r
                        o = RemotingServices.Connect (typeof (DD), "tcp://localhost:3434/ff4.rem");\r
-                       Assert ("#d1", o is DD);\r
-                       Assert ("#d2", o is A);\r
-                       Assert ("#d3", o is B);\r
-                       Assert ("#d4", !(o is CC));\r
+                       Assert.IsInstanceOfType (typeof (DD), o, "#d1");\r
+                       Assert.IsInstanceOfType (typeof (A), o, "#d2");\r
+                       Assert.IsInstanceOfType (typeof (B), o, "#d3");\r
+                       AssertHelper.IsNotInstanceOfType (typeof (CC), o, "#d4");\r
 \r
                        o = RemotingServices.Connect (typeof (CC), "tcp://localhost:3434/ff5.rem");\r
-                       Assert ("#c1", !(o is DD));\r
-                       Assert ("#c2", o is A);\r
-                       Assert ("#c3", o is B);\r
-                       Assert ("#c4", o is CC);\r
+                       AssertHelper.IsNotInstanceOfType (typeof (DD), o, "#c1");\r
+                       Assert.IsInstanceOfType (typeof (A), o, "#c2");\r
+                       Assert.IsInstanceOfType (typeof (B), o, "#c3");\r
+                       Assert.IsInstanceOfType (typeof (CC), o, "#c4");\r
                }\r
                // Don't add any tests that must create channels\r
                // after ConnectProxyCast (), because this test calls\r

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs
index 9f4c6e14fd7dbcbc1009dd4866209cdd9cc15508..394d7d48ad056c2ba8e5be0c6362cf86e978b8b1 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs
@@ -66,7 +66,7 @@ namespace MonoTests.System.Runtime.Serialization
                        var type = exporter.Schemas.GlobalTypes [typeName];
 
                        Assert.That (type, Is.Not.Null, "#2");
-                       Assert.That (type, Is.InstanceOfType (typeof (XmlSchemaComplexType)), "#3");
+                       Assert.IsInstanceOfType (typeof (XmlSchemaComplexType), type, "#3");
 
                        var complex = (XmlSchemaComplexType)type;
                        Assert.That (complex.Annotation, Is.Null, "#4");
@@ -82,16 +82,16 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (list, Is.Not.Null, "#6");
                        Assert.That (list.Annotation, Is.Null, "#6a");
                        Assert.That (list.Name, Is.EqualTo ("list"), "#6b");
-                       Assert.That (list.ElementSchemaType, Is.InstanceOfType (typeof (XmlSchemaComplexType)), "#6c");
+                       Assert.IsInstanceOfType (typeof (XmlSchemaComplexType), list.ElementSchemaType, "#6c");
 
                        var listElement = (XmlSchemaComplexType)list.ElementSchemaType;
                        Assert.That (listElement.QualifiedName.Namespace, Is.EqualTo (MSArraysNamespace), "#6d");
                        Assert.That (listElement.QualifiedName.Name, Is.EqualTo ("ArrayOfint"), "#6e");
 
-                       Assert.That (listElement.Particle, Is.InstanceOfType (typeof(XmlSchemaSequence)), "#7");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaSequence), listElement.Particle, "#7");
                        var listSeq = (XmlSchemaSequence)listElement.Particle;
                        Assert.That (listSeq.Items.Count, Is.EqualTo (1), "#7b");
-                       Assert.That (listSeq.Items[0], Is.InstanceOfType (typeof(XmlSchemaElement)), "#7c");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaElement), listSeq.Items[0], "#7c");
                        Assert.That (listSeq.Annotation, Is.Null, "#7d");
 
                        var listSeqElement = (XmlSchemaElement)listSeq.Items[0];
@@ -102,16 +102,16 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (dict, Is.Not.Null, "#8");
                        Assert.That (dict.Annotation, Is.Null, "#8a");
                        Assert.That (dict.Name, Is.EqualTo ("dictionary"), "#8b");
-                       Assert.That (dict.ElementSchemaType, Is.InstanceOfType (typeof (XmlSchemaComplexType)), "#8c");
+                       Assert.IsInstanceOfType (typeof (XmlSchemaComplexType), dict.ElementSchemaType, "#8c");
                        
                        var dictElement = (XmlSchemaComplexType)dict.ElementSchemaType;
                        Assert.That (dictElement.QualifiedName.Namespace, Is.EqualTo (MSArraysNamespace), "#8d");
                        Assert.That (dictElement.QualifiedName.Name, Is.EqualTo ("ArrayOfKeyValueOfstringdouble"), "#8e");
 
-                       Assert.That (dictElement.Particle, Is.InstanceOfType (typeof(XmlSchemaSequence)), "#9");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaSequence), dictElement.Particle, "#9");
                        var dictSeq = (XmlSchemaSequence)dictElement.Particle;
                        Assert.That (dictSeq.Items.Count, Is.EqualTo (1), "#9b");
-                       Assert.That (dictSeq.Items[0], Is.InstanceOfType (typeof(XmlSchemaElement)), "#9c");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaElement), dictSeq.Items[0], "#9c");
                        Assert.That (dictSeq.Annotation, Is.Null, "#9d");
                        
                        var dictSeqElement = (XmlSchemaElement)dictSeq.Items[0];
@@ -123,7 +123,7 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (custom, Is.Not.Null, "#10");
                        Assert.That (custom.Annotation, Is.Null, "#10a");
                        Assert.That (custom.Name, Is.EqualTo ("customCollection"), "#10b");
-                       Assert.That (custom.ElementSchemaType, Is.InstanceOfType (typeof (XmlSchemaComplexType)), "#10c");
+                       Assert.IsInstanceOfType (typeof (XmlSchemaComplexType), custom.ElementSchemaType, "#10c");
                        
                        var customElement = (XmlSchemaComplexType)custom.ElementSchemaType;
                        var customEQN = customElement.QualifiedName;
@@ -131,10 +131,10 @@ namespace MonoTests.System.Runtime.Serialization
                        Assert.That (customEQN.Name.StartsWith ("XsdDataContractExporterTest2.MyCollectionOfstring", StringComparison.InvariantCultureIgnoreCase),
                                     Is.True, "#10e");
 
-                       Assert.That (customElement.Particle, Is.InstanceOfType (typeof(XmlSchemaSequence)), "#11");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaSequence), customElement.Particle, "#11");
                        var customSeq = (XmlSchemaSequence)customElement.Particle;
                        Assert.That (customSeq.Items.Count, Is.EqualTo (1), "#11b");
-                       Assert.That (customSeq.Items[0], Is.InstanceOfType (typeof(XmlSchemaElement)), "#11c");
+                       Assert.IsInstanceOfType (typeof(XmlSchemaElement), customSeq.Items[0], "#11c");
                        Assert.That (customSeq.Annotation, Is.Null, "#11d");
                        
                        var customSeqElement = (XmlSchemaElement)customSeq.Items[0];

diff --git a/mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs b/mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs
index d9b75a637c6a31ccbab67c50bd422f522e0aaf47..583dc20edd2601846a902254f892e4f026be8f02 100644 (file)
--- a/mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs
+++ b/mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs
@@ -90,7 +90,7 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                static void CheckSoapBinding (object extension, string transport, TestLabel label)
                {
                        label.EnterScope ("soap");
-                       Assert.That (extension, Is.InstanceOfType (typeof (WS.SoapBinding)), label.Get ());
+                       Assert.IsInstanceOfType (typeof (WS.SoapBinding), extension, label.Get ());
                        var soap = (WS.SoapBinding)extension;
                        Assert.That (soap.Style, Is.EqualTo (WS.SoapBindingStyle.Document), label.Get ());
                        Assert.That (soap.Transport, Is.EqualTo (transport), label.Get ());
@@ -106,9 +106,9 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                        label.EnterScope ("http");
 
                        if (security == BasicHttpSecurityMode.Message) {
-                               Assert.That (binding, Is.InstanceOfType (typeof(CustomBinding)), label.Get ());
+                               Assert.IsInstanceOfType (typeof(CustomBinding), binding, label.Get ());
                        } else {
-                               Assert.That (binding, Is.InstanceOfType (typeof(BasicHttpBinding)), label.Get ());
+                               Assert.IsInstanceOfType (typeof(BasicHttpBinding), binding, label.Get ());
                                var basicHttp = (BasicHttpBinding)binding;
                                Assert.That (basicHttp.EnvelopeVersion, Is.EqualTo (EnvelopeVersion.Soap11), label.Get ());
                                Assert.That (basicHttp.MessageVersion, Is.EqualTo (MessageVersion.Soap11), label.Get ());
@@ -156,7 +156,7 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                        label.EnterScope ("text");
                        if (encoding == WSMessageEncoding.Text) {
                                Assert.That (textElement, Is.Not.Null, label.Get ());
-                               Assert.That (textElement.WriteEncoding, Is.InstanceOfType (typeof(UTF8Encoding)), label.Get ());
+                               Assert.IsInstanceOfType (typeof(UTF8Encoding), textElement.WriteEncoding, label.Get ());
                        } else {
                                Assert.That (textElement, Is.Null, label.Get ());
                        }
@@ -408,9 +408,9 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                {
                        label.EnterScope ("net-tcp");
                        if (security == SecurityMode.Message) {
-                               Assert.That (binding, Is.InstanceOfType (typeof(CustomBinding)), label.Get ());
+                               Assert.IsInstanceOfType (typeof(CustomBinding), binding, label.Get ());
                        } else {
-                               Assert.That (binding, Is.InstanceOfType (typeof(NetTcpBinding)), label.Get ());
+                               Assert.IsInstanceOfType (typeof(NetTcpBinding), binding, label.Get ());
                                var netTcp = (NetTcpBinding)binding;
                                Assert.That (netTcp.EnvelopeVersion, Is.EqualTo (EnvelopeVersion.Soap12), label.Get ());
                                Assert.That (netTcp.MessageVersion, Is.EqualTo (MessageVersion.Soap12WSAddressing10), label.Get ());
@@ -750,7 +750,7 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                        foreach (var node in all.ChildNodes) {
                                if (node is XmlWhitespace)
                                        continue;
-                               Assert.That (node, Is.InstanceOfType (typeof (XmlElement)), label.ToString ());
+                               Assert.IsInstanceOfType (typeof (XmlElement), node, label.ToString ());
                                collection.Add ((XmlElement)node);
                        }
                        label.LeaveScope ();
@@ -788,7 +788,7 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                        label.EnterScope ("extensions");
                        Assert.That (op.Extensions, Is.Not.Null, label.Get ());
                        Assert.That (op.Extensions.Count, Is.EqualTo (1), label.Get ());
-                       Assert.That (op.Extensions [0], Is.InstanceOfType (typeof (WS.SoapOperationBinding)), label.Get ());
+                       Assert.IsInstanceOfType (typeof (WS.SoapOperationBinding), op.Extensions [0], label.Get ());
                        var soap = (WS.SoapOperationBinding)op.Extensions [0];
                        TestSoap (soap, soap12, label);
                        label.LeaveScope ();
@@ -820,7 +820,7 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
                        Assert.That (binding.ExtensibleAttributes, Is.Null, label.Get ());
                        Assert.That (binding.Extensions, Is.Not.Null, label.Get ());
                        Assert.That (binding.Extensions.Count, Is.EqualTo (1), label.Get ());
-                       Assert.That (binding.Extensions [0], Is.InstanceOfType (typeof (WS.SoapBodyBinding)), label.Get ());
+                       Assert.IsInstanceOfType (typeof (WS.SoapBodyBinding), binding.Extensions [0], label.Get ());
                        var body = (WS.SoapBodyBinding)binding.Extensions [0];
                        TestSoapBody (body, soap12, label);
                        label.LeaveScope ();

diff --git a/mcs/class/corlib/Test/System.Text/Latin1EncodingTest.cs b/mcs/class/corlib/Test/System.Text/Latin1EncodingTest.cs
index 0195967cd3663b36d32cc4de6eb210f73d463c7e..c96da97d9c185eb470a8e1393443981f171ab2f2 100644 (file)
--- a/mcs/class/corlib/Test/System.Text/Latin1EncodingTest.cs
+++ b/mcs/class/corlib/Test/System.Text/Latin1EncodingTest.cs
@@ -32,10 +32,6 @@ using System.Text;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
 
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 namespace MonoTests.System.Text
 {
        [TestFixture]