diff options
| author | Chris Hamons <chris.hamons@xamarin.com> | 2017-03-22 21:15:02 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-03-22 21:15:02 +0300 |
| commit | 4d1e45d76a82d28fc281edd8e9db5ce0ed54e40e (patch) | |
| tree | 3e00b7b483ae489d5e79a82075d72d65163369c0 /mcs/class/System/Test | |
| parent | 90b11833ff2f7b1d588763f6a22ebc92937ec735 (diff) | |
AppleTls Support (#4470)
Diffstat (limited to 'mcs/class/System/Test')
4 files changed, 8 insertions, 3 deletions
diff --git a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs index ab92e6a4fb2..91b5379d8c0 100644 --- 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 && !MONOMAC +#if !MOBILE && !MONOMAC && !XAMMAC_4_5 using System.Drawing.Design; #endif using NUnit.Framework; @@ -1053,7 +1053,7 @@ namespace MonoTests.System.ComponentModel return attr; return null; } -#if !MOBILE && !MONOMAC +#if !MOBILE && !MONOMAC && !XAMMAC_4_5 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 8707702ce0e..8f2662a2678 100644 --- 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 && !MONOMAC +#if !MOBILE && !MONOMAC && !XAMMAC_4_5 [Test] public void DefaultType () { diff --git a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs index e12f53291d2..50b605adae7 100644 --- a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs +++ b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs @@ -287,7 +287,11 @@ namespace MonoTests.System.Configuration { [Test] public void TestSettings2_Properties () { +#if XAMMAC_4_5 + string expected = "MonoTests.System.Configuration.ProviderPoker, xammac_net_4_5_System_test, Version=0.0.0.0"; +#else string expected = "MonoTests.System.Configuration.ProviderPoker, net_4_x_System_test, Version=0.0.0.0"; +#endif Assert.AreEqual (expected, new SettingsProviderAttribute (typeof (ProviderPoker)).ProviderTypeName.Substring (0, expected.Length), "#1"); TestSettings2 settings = new TestSettings2 (); diff --git a/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs b/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs index e3542c34f37..be4e5ad9831 100644 --- a/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs +++ b/mcs/class/System/Test/System.Net.Security/SslStreamTest.cs @@ -59,6 +59,7 @@ public class SslStreamTest { } [Test] //bug https://bugzilla.novell.com/show_bug.cgi?id=457120 + [Category ("MacNotWorking")] // Works but launches a prompt on 10.12 that will fail if you don't click in a few seconds #if FEATURE_NO_BSD_SOCKETS [ExpectedException (typeof (PlatformNotSupportedException))] #endif |