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

[mono.git] / mcs / class / System.Runtime.Remoting / Test / RemotingServicesTest.cs

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