Mono BCL test fixes so XM can run them (#4210)

diff --git a/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
index 9722b5be1b7b10e177eb1280962abd7efa3dc161..5edab9cf29d0cd58db6933c4550d0befe1889b11 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/ConnectionStringsSectionTest.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Configuration;

diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
index a8974949973e3fc8afcd95fc9b88c3a91b5f588e..3cd936090fbd7b0c7f71eaf92890822d835e8ec7 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
@@ -32,7 +32,7 @@ using System.Data.Common;
 using System.Data.SqlClient;
 
 /*--For Bug 853 Test Begin--*/
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using Mono.Data.Sqlite;
 #endif
 /*--For Bug 853 Test End--*/
@@ -189,7 +189,7 @@ namespace MonoTests.System.Data.Common
                                Assert.IsNotNull (ex.Message, "#4");
                        }
                }
-#if !MOBILE    
+#if !MOBILE && !MONOMAC
                [Test]
                [Category ("NotWorking")] // Requires newer sqlite than is on wrench
                public void XimarinBugzillaBug853Test()

diff --git a/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
index fe239ea4fb92fa9d65a9e2849dfcff0e43a46430..7fd810a697ac631d6f7a75cbe8c268355e06d610 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Common/DbProviderFactoriesConfigurationHandlerTest.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System.IO;
 using System.Xml;

diff --git a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
index 2e2890b4ec5b303c526d81cb0062289831fd1a55..8b35f50b83ad78f52bbe3cbf224e375bc6528df9 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
@@ -28,7 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug666333Test.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug666333Test.cs
index ff587520a49b5a402e432dcce64537942c8f1fdc..13950d88ec60fc2bf9d7c396c56c2e9112c7b0fe 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug666333Test.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/Bug666333Test.cs
@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Runtime.Serialization;

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/WsdlHelper.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/WsdlHelper.cs
index 57274e2d940b65e0272ca0f3d8273293ffbde80a..6c7d8f7de03774eca8fd6e33019c3796a991d2a1 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/WsdlHelper.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/WsdlHelper.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.IO;

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 394d7d48ad056c2ba8e5be0c6362cf86e978b8b1..bff20177c9dabd9e76f85e94a45d17a409e37337 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
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
index 7e86906afe3b68b833efa3f65e439a6c9ebdd379..a3fb7edd900423dbba932c5bb010864c47dcbd33 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs
index d5c40ddd4e7a857389cbbdedc034d43c45424e7a..e2af0ca1f761eb9c27ac566b3c08da078fafced2 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs
@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.ServiceModel;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs
index d7af674eab67c47ef7444b8b59681aa47ecf6ad5..a54fd6a7c863048eb1a0fa439ba45fa5f683ce42 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs
@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.IO;
 using System.ServiceModel;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Configuration/WebHttpBindingElementTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Configuration/WebHttpBindingElementTest.cs
index 1ab1b89b1a5a2788ab6a9ac876affc6f28310f60..e8cf4d55f040d678a349d29b2ef7a7f255acedcd 100755 (executable)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Configuration/WebHttpBindingElementTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Configuration/WebHttpBindingElementTest.cs
@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.ServiceModel.Configuration;
 using NUnit.Framework;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
index b5b64fd295e8d355e76e75ed81d4d555a77f6ad0..dd4d46ab0133615b66f107213ab113efa683a7e0 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpBehaviorTest.cs
@@ -74,7 +74,7 @@ namespace MonoTests.System.ServiceModel.Description
                        Assert.AreEqual (0, pl.Count, "#1");
                }
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                [Test]
                public void ApplyDispatchBehavior ()
                {

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
index a8423ad3f1109ebefe77509e272e3eaab1f462bf..88ad7106714df5eede7472c757c47fe337cc857e 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebHttpEndpointTest.cs
@@ -1,4 +1,4 @@
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.IO;
 using System.Runtime.Serialization;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebScriptEnablingBehaviorTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebScriptEnablingBehaviorTest.cs
index a552f6ea0e0f925c7cf9095ef3ba86d3b5fa73dd..b2dd26364e780989c4bc1a66bf7674f35c6e19d5 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebScriptEnablingBehaviorTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Description/WebScriptEnablingBehaviorTest.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.Net;
 using System.Runtime.Serialization;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Dispatcher/WebHttpDispatchOperationSelectorTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Dispatcher/WebHttpDispatchOperationSelectorTest.cs
index d99036dfdbde7bac5fd3dffce71cd67cd3371398..2319a3ae6f5ca17b40541488a79fa7c997d1f787 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Dispatcher/WebHttpDispatchOperationSelectorTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Dispatcher/WebHttpDispatchOperationSelectorTest.cs
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System;
 using System.Globalization;
 using System.Runtime.Serialization;

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
index a8fa07ec7b3c493c0f4f3bd4d1b2180cfe2c5531..4624d889892b477020c0190502b721ddc335382f 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
@@ -74,7 +74,7 @@ namespace MonoTests.System.ServiceModel.Web
                        ch.Close ();
                }
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                [Test]
                public void CreateAtom10Response ()
                {

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs
index 8f0cd0e14e28e5f90462acd83306d44d44497bb8..baef1460cc039718a0be299b94a405e56834143b 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebServiceHostTest.cs
@@ -25,7 +25,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
 //\r
-#if !MOBILE\r
+#if !MOBILE && !MONOMAC\r
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r

diff --git a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel/WebHttpBindingTest.cs b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel/WebHttpBindingTest.cs
index b4a016a26f440ef6aec434633fbd37f8bd8a49d0..46ee4f6dfd9985bbe61f9bb34064129803a1f4de 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel/WebHttpBindingTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System.ServiceModel/WebHttpBindingTest.cs
@@ -16,7 +16,7 @@ namespace MonoTests.System.ServiceModel
                        Assert.AreEqual ("http", b.Scheme, "#1");
                        Assert.AreEqual (Encoding.UTF8, b.WriteEncoding, "#2");
                        Assert.AreEqual (0x10000, b.MaxBufferSize, "#3");
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                        Assert.AreEqual (0x80000, b.MaxBufferPoolSize, "#4");
 #endif
                        Assert.AreEqual (0x10000, b.MaxReceivedMessageSize, "#5");

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionImporterTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionImporterTest.cs
index ec88cb908333d5b28e392632b7523ead8b567cdf..41f594f64f7bd325960bcb4e8536f2b8069658ef 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionImporterTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionImporterTest.cs
@@ -7,7 +7,7 @@
 // Copyright (C) 2007 Novell, Inc.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
index bdb8672d093a676b4675570defc7eb1ad1027a14..ca726564926038f65900ee75dc6e913b4e0abbbe 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionReflectorTest.cs
@@ -10,7 +10,7 @@
 //
 
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using NUnit.Framework;
 
 using System;

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs
index 943d903a4dc9583a3ab70f6a989de8b411d7496c..1aeb13d19f97c553134dff4e89ff1c377082996e 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs
@@ -24,6 +24,7 @@ namespace MonoTests.System.Web.Services.Description
        public class ServiceDescriptionTest
        {
                [Test]
+               [Category ("MacNotWorking")] // https://bugzilla.xamarin.com/show_bug.cgi?id=51254
                public void SimpleWrite ()
                {
                        ServiceDescription sd = new ServiceDescription ();

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebReferenceOptionsTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebReferenceOptionsTest.cs
index a3f16ee7978ab0890d2ad4057859ee6d30b2ed2a..cce160ea50c1a45e2bd6d96602122eca1ad26455 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebReferenceOptionsTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebReferenceOptionsTest.cs
@@ -7,7 +7,7 @@
 // Copyright (C) 2006 Novell, Inc.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebServicesInteroperabilityTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebServicesInteroperabilityTest.cs
index 064af69530cc73b5225408aa9e72ae6cb5f7086d..5aaaedebc3a9fffa66dbecd5edcf2e82b20ab27e 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebServicesInteroperabilityTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Description/WebServicesInteroperabilityTest.cs
@@ -7,7 +7,7 @@
 // Copyright (C) 2008 Novell, Inc.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/LogicalMethodInfoTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/LogicalMethodInfoTest.cs
index 7703aedb811a4faf0e0c766190b902a9d2e0810a..7b87f279107e4f4cb1e03302584b8d339a1ded8e 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/LogicalMethodInfoTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/LogicalMethodInfoTest.cs
@@ -6,7 +6,7 @@
 //
 // Copyright (C) 2007 Novell, Inc.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using NUnit.Framework;
 
 using System;

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
index 6952a996261cc766112cfec1b99f419cff86c278..906f393413eebaf53456b592b6141996234a61c0 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
@@ -6,7 +6,7 @@
 //
 // Copyright (C) 2007 Novell, Inc.
 //
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using NUnit.Framework;
 
 using System;

diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceTest.cs
index 82429d61f578a1238d3a4991f107f5a1eafbdaba..2deda20ec2c6b4b84915b66519caabf5576fbcb6 100644 (file)
--- a/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceTest.cs
@@ -7,7 +7,7 @@
 // Copyright (C) 2007 Novell, Inc.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using NUnit.Framework;
 using System;
 using System.Web.Services;

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
index e8bdfd8829c1ef8d4662dce4a739de610503f2ac..bb8222543c4b8f1ea994ca0415601e626d862b57 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
@@ -8,7 +8,7 @@
 // (C) 2006 Novell
 // 
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.CodeDom;

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
index 2624f2a5ba087f3629c397f41d376b6fd072317d..5de770652f7372ab652a02f4b910908f2c6cbaff 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs
@@ -136,7 +136,7 @@ namespace MonoTests.System.Xml
                        Assert.AreEqual ("file", resolved.Scheme);
                        var task = sr.GetEntityAsync (resolved, null, typeof (Stream));
                        Assert.That (task.Wait (3000));
-                       Assert.IsInstanceOfType (typeof (FileStream), task.Result);
+                       Assert.IsTrue (task.Result is FileStream, "Unexpected type: " + task.Result.GetType());
                }
 
        }

diff --git a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
index f81baa6a984c5408debfe0a6da673e2dc2191bce..ab92e6a4fb2fb3cbdbd458859bef000c6a5e5182 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
@@ -16,7 +16,7 @@ using System.ComponentModel.Design;
 using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using System.Drawing.Design;
 #endif
 using NUnit.Framework;
@@ -1053,7 +1053,7 @@ namespace MonoTests.System.ComponentModel
                                        return attr;
                        return null;
                }
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                class GetEditor_test 
                {
                        [Editor (typeof (UIEditor), typeof (UITypeEditor))]

diff --git a/mcs/class/System/Test/System.ComponentModel/ToolboxItemAttributeTests.cs b/mcs/class/System/Test/System.ComponentModel/ToolboxItemAttributeTests.cs
index df863e939d702170c58a6a0c38751daae2ab04f7..8707702ce0ec0276e14ddf4fefc927fbf40d2ccd 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/ToolboxItemAttributeTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/ToolboxItemAttributeTests.cs
@@ -16,7 +16,7 @@ namespace MonoTests.System.ComponentModel
        [TestFixture]
        public class ToolboxItemAttributeTests
        {
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                [Test]
                public void DefaultType ()
                {

diff --git a/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs b/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
index d8821a00c2ddbb42d380e3c49437300be24eac11..0d26154097c236f9bac26e6d29bbaf95820be2ec 100644 (file)
--- a/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
+++ b/mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
@@ -11,7 +11,7 @@
 // (C) 2003 Martin Willemoes Hansen
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 using System;

diff --git a/mcs/class/System/Test/System.Net.Configuration/ConnectionManagementSectionTest.cs b/mcs/class/System/Test/System.Net.Configuration/ConnectionManagementSectionTest.cs
index 1a3d3e36161b3141ad20a6284e8cdd9002616682..c612cf33325f6a1f8c59323dab6a19e5ddc4f04b 100644 (file)
--- a/mcs/class/System/Test/System.Net.Configuration/ConnectionManagementSectionTest.cs
+++ b/mcs/class/System/Test/System.Net.Configuration/ConnectionManagementSectionTest.cs
@@ -29,7 +29,7 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Configuration;

diff --git a/mcs/class/System/Test/System.Net.Configuration/HttpWebRequestElementTest.cs b/mcs/class/System/Test/System.Net.Configuration/HttpWebRequestElementTest.cs
index 646369053cdf6d7c8c882461306a4ae86b4fbb0c..b143a91766d96d120f4d06dd4ee908318a0d484a 100644 (file)
--- a/mcs/class/System/Test/System.Net.Configuration/HttpWebRequestElementTest.cs
+++ b/mcs/class/System/Test/System.Net.Configuration/HttpWebRequestElementTest.cs
@@ -7,7 +7,7 @@
 // (C) 2005 Novell
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System.Net.Configuration;
 

diff --git a/mcs/class/System/Test/System.Net.Configuration/WebRequestModulesSectionTest.cs b/mcs/class/System/Test/System.Net.Configuration/WebRequestModulesSectionTest.cs
index 1581c0135f6051f4d209706daefc2ef9ae7873d7..4e4f59772e934968b07f3de7849d3cada0372730 100644 (file)
--- a/mcs/class/System/Test/System.Net.Configuration/WebRequestModulesSectionTest.cs
+++ b/mcs/class/System/Test/System.Net.Configuration/WebRequestModulesSectionTest.cs
@@ -29,7 +29,7 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using System;
 using System.Configuration;

diff --git a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
index a597b4cd0a240dd08b9f9f2e1722d4a28bcc6754..80be0e4eb94d37e9482b76b02caba36592ba91b1 100644 (file)
--- a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
+++ b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
@@ -27,7 +27,7 @@ using System.Text;
 using System.Threading;
 using System.Reflection;
 using Mono.Security.Authenticode;
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 using Mono.Security.Protocol.Tls;
 #endif
 
@@ -160,7 +160,7 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                [Test]
                [Ignore ("Fails on MS.NET")]
                public void SslClientBlock ()
@@ -2703,7 +2703,7 @@ namespace MonoTests.System.Net
                        }
                }
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                class SslHttpServer : HttpServer {
                        X509Certificate _certificate;
 

diff --git a/mcs/class/corlib/Test/System.Security/HostSecurityManagerTest.cs b/mcs/class/corlib/Test/System.Security/HostSecurityManagerTest.cs
index a420ffb56003f56efb12101fbc053e660eb54427..de0d1e89b7213c1140e1cf8d5f8afb968b6cb7b2 100644 (file)
--- a/mcs/class/corlib/Test/System.Security/HostSecurityManagerTest.cs
+++ b/mcs/class/corlib/Test/System.Security/HostSecurityManagerTest.cs
@@ -28,7 +28,7 @@
 //
 
 // MOBILE profile lacks some (of the few) CAS features required to execute those tests
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 using System;

diff --git a/mcs/class/corlib/Test/System.Security/SecurityManagerTest.cs b/mcs/class/corlib/Test/System.Security/SecurityManagerTest.cs
index 42971a4508c418d0a03194078b83f6669d393303..90a7aee55c1efd33acb38caed060e43641caf6dc 100644 (file)
--- a/mcs/class/corlib/Test/System.Security/SecurityManagerTest.cs
+++ b/mcs/class/corlib/Test/System.Security/SecurityManagerTest.cs
@@ -93,7 +93,7 @@ namespace MonoTests.System.Security {
                        Assert.IsNotNull (e, "PolicyHierarchy");
                }
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
                private void ResolveEvidenceHost (SecurityZone zone, bool unrestricted, bool empty)
                {
                        string prefix = zone.ToString () + "-";

diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
index 1af618d3336965aa43958c7f0370abdf5412cc0e..dd9edde9adf9ffe2301a0cbbb0df839308c6dce5 100644 (file)
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
@@ -445,6 +445,7 @@ namespace MonoTests.System.Threading.Tasks
                }
 
                [Test]
+               [Category ("MacNotWorking")] // Randomly fails - https://bugzilla.xamarin.com/show_bug.cgi?id=51255
                public void FromAsync_Completed ()
                {
                        var completed = new CompletedAsyncResult ();
@@ -568,6 +569,7 @@ namespace MonoTests.System.Threading.Tasks
                }
 
                [Test]
+               [Category ("MacNotWorking")] // Randomly fails - https://bugzilla.xamarin.com/show_bug.cgi?id=51255
                public void FromAsync_BeginCallback ()
                {
                        bool called = false;

diff --git a/mcs/class/corlib/Test/System/ActivatorTest.cs b/mcs/class/corlib/Test/System/ActivatorTest.cs
index a7959bc6efcd223aeaa8bfadecd18438143b3560..fc5d762eb2f9066343471a4a5b58aed79c0b1f46 100644 (file)
--- a/mcs/class/corlib/Test/System/ActivatorTest.cs
+++ b/mcs/class/corlib/Test/System/ActivatorTest.cs
@@ -513,7 +513,7 @@ namespace MonoTests.System {
                                                  null, null);
                }
 
-#if !MONOTOUCH && !FULL_AOT_RUNTIME
+#if !MONOTOUCH && !FULL_AOT_RUNTIME && !MONOMAC
                [Test]
                public void CreateInstanceCustomDomain ()
                {

diff --git a/mcs/class/corlib/Test/System/AppDomainTest.cs b/mcs/class/corlib/Test/System/AppDomainTest.cs
index 34874b1f81f0bae8977486ef067eec0eceac7e71..61e6a764534426216122856dba783860e8915efe 100644 (file)
--- a/mcs/class/corlib/Test/System/AppDomainTest.cs
+++ b/mcs/class/corlib/Test/System/AppDomainTest.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !MOBILE
+#if !MOBILE && !MONOMAC
 
 using NUnit.Framework;
 using System;

diff --git a/mcs/class/corlib/Test/System/TypeTest.cs b/mcs/class/corlib/Test/System/TypeTest.cs
index 4676c8551e8f574d360c72f125a7dee0aa0b122b..100f1c362742134360fd3562f632b1192f0d50c3 100644 (file)
--- a/mcs/class/corlib/Test/System/TypeTest.cs
+++ b/mcs/class/corlib/Test/System/TypeTest.cs
@@ -4289,7 +4289,7 @@ namespace MonoTests.System
 
                }
 
-#if !MONOTOUCH && !FULL_AOT_RUNTIME
+#if !MONOTOUCH && !FULL_AOT_RUNTIME && !MONOMAC
                [Test]
                [Category ("AndroidNotWorking")] // requires symbol writer
                public void FullNameGetTypeParseEscapeRoundtrip () // bug #26384