[corlib] Update mobile tests

diff --git a/mcs/class/corlib/Test/System/ActivatorTest.cs b/mcs/class/corlib/Test/System/ActivatorTest.cs
index a9fe413ccd8fca533b3346a0af0934fe9f60e8b9..f06c2c1963287448307379a8bcc2f962d4c59cf9 100644 (file)
--- a/mcs/class/corlib/Test/System/ActivatorTest.cs
+++ b/mcs/class/corlib/Test/System/ActivatorTest.cs
@@ -403,7 +403,7 @@ namespace MonoTests.System {
                        Assert.AreEqual (typeof (int), Activator.CreateInstance (typeof (Nullable<int>), new object [] { null }).GetType ());
                        Assert.AreEqual (null, Activator.CreateInstance (typeof (Nullable<int>)));
                }
-
+#if FEATURE_REMOTING
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void GetObject_TypeNull ()
@@ -411,7 +411,6 @@ namespace MonoTests.System {
                        Activator.GetObject (null, "tcp://localhost:1234/COMTestUri");
                }
 
-#if !MOBILE
                [Test]
                [ExpectedException (typeof (ArgumentNullException))]
                public void GetObject_UrlNull ()
@@ -420,26 +419,6 @@ namespace MonoTests.System {
                }
 #endif
 
-/* This test is now executed in System.Runtime.Remoting unit tests 
-               [Test]
-               public void GetObject ()
-               {
-                       // This will provide a COMTest object on  tcp://localhost:1234/COMTestUri
-                       COMTest objCOMTest = new COMTest (8);
-                       TcpChannel chnServer = new TcpChannel (1234);
-                       ChannelServices.RegisterChannel (chnServer);
-                       RemotingServices.SetObjectUriForMarshal (objCOMTest, "COMTestUri");
-                       RemotingServices.Marshal (objCOMTest);
-
-                       // This will get the remoting object
-                       object objRem = Activator.GetObject (typeof (COMTest), "tcp://localhost:1234/COMTestUri");
-                       Assert.IsNotNull (objRem, "#A07");
-                       COMTest remCOMTest = (COMTest) objRem;
-                       Assert.AreEqual (8, remCOMTest.Id, "#A08");
-
-                       ChannelServices.UnregisterChannel(chnServer);
-               }
-*/
                // TODO: Implemente the test methods for all the overriden function using activationAttribute
 
                [Test]

diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index 4f92e8c086b82922e3d4badfc9f6d55bdc292c33..2636fda983cc49e85df751a6ddf1be2da68dc0f1 100644 (file)
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -1700,10 +1700,7 @@ namespace MonoTests.System
                        Assert.AreEqual ("System.String[*]", t.ToString ());
                }
 
-#if MONOTOUCH
-               // feature not available when compiled under FULL_AOT_RUNTIME
-               [ExpectedException (typeof (NotImplementedException))]
-#endif
+#if MONO_COM
                [Test]
                public void TypeFromCLSID ()
                {
@@ -1738,7 +1735,7 @@ namespace MonoTests.System
                        else
                                throw new COMException ();
                }
-               
+#endif
                [Test]
                public void ExerciseFilterName ()
                {