From 1e559b60535bfd61e64319d98b275ed3f7f52ab6 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 30 Mar 2021 16:01:31 -0400 Subject: [PATCH] [Mono.Android-Tests] Update ignored .NET 6 tests A few tests which were previously failing have been fixed and can now be enabled. Additionally, now that dotnet/runtime has removed the incomplete (non-existant?) OpenSSL support on Android, we can enable more tests that used various crypto APIs. There are still some SSL related test failures that are being ignored that require further investigation, though I believe that some of these cases may never be supported. --- .../Android.Runtime/XmlReaderPullParserTest.cs | 1 - .../Android.Runtime/XmlReaderResourceParserTest.cs | 1 - tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs | 3 --- .../Mono.Android.NET-Tests.csproj | 2 +- tests/Mono.Android-Tests/System.Drawing/TypeConverterTest.cs | 1 - tests/Mono.Android-Tests/System.Net/SslTest.cs | 2 +- tests/Mono.Android-Tests/System.Net/WebSocketTests.cs | 2 +- tests/Mono.Android-Tests/System/TimeZoneTest.cs | 1 - .../Xamarin.Android.Net/AndroidClientHandlerTests.cs | 2 +- 9 files changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/Mono.Android-Tests/Android.Runtime/XmlReaderPullParserTest.cs b/tests/Mono.Android-Tests/Android.Runtime/XmlReaderPullParserTest.cs index 4720cf2c6e7..0ed7315f60e 100644 --- a/tests/Mono.Android-Tests/Android.Runtime/XmlReaderPullParserTest.cs +++ b/tests/Mono.Android-Tests/Android.Runtime/XmlReaderPullParserTest.cs @@ -13,7 +13,6 @@ namespace Android.RuntimeTests { public class XmlReaderPullParserTest { [Test] - [Category ("DotNetIgnore")] // Missing crypto / networking support. public void ToLocalJniHandle () { var p = Application.Context.Resources.GetXml (MyResource.Xml.XmlReaderResourceParser); diff --git a/tests/Mono.Android-Tests/Android.Runtime/XmlReaderResourceParserTest.cs b/tests/Mono.Android-Tests/Android.Runtime/XmlReaderResourceParserTest.cs index 910bc566ef8..2fc6e740c67 100644 --- a/tests/Mono.Android-Tests/Android.Runtime/XmlReaderResourceParserTest.cs +++ b/tests/Mono.Android-Tests/Android.Runtime/XmlReaderResourceParserTest.cs @@ -13,7 +13,6 @@ namespace Android.RuntimeTests { public class XmlReaderResourceParserTest { [Test] - [Category ("DotNetIgnore")] // Missing crypto / networking support. public void ToLocalJniHandle () { var p = Application.Context.Resources.GetXml (MyResource.Xml.XmlReaderResourceParser); diff --git a/tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs b/tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs index 2263538a0b4..11ac6e04b18 100644 --- a/tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs +++ b/tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs @@ -219,7 +219,6 @@ public void SetField_PermitNullValues () } [Test] - [Category ("DotNetIgnore")] // https://github.com/xamarin/xamarin-android/issues/5265 public void CreateTypeWithExportedMethods () { using (var e = new ContainsExportedMethods ()) { @@ -454,9 +453,7 @@ public ContainsExportedMethods () Constructed = true; } -#if !NET // https://github.com/xamarin/xamarin-android/issues/5265 [Export] -#endif public void Exported () { Count++; diff --git a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj index 319ad13de79..6414a76aeb2 100644 --- a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj +++ b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj @@ -20,7 +20,7 @@ <_MonoAndroidTestPackage>Mono.Android.NET_Tests -NET6 - DotNetIgnore:InetAccess + DotNetIgnore diff --git a/tests/Mono.Android-Tests/System.Drawing/TypeConverterTest.cs b/tests/Mono.Android-Tests/System.Drawing/TypeConverterTest.cs index a7d6a12450f..18c164a3d6d 100644 --- a/tests/Mono.Android-Tests/System.Drawing/TypeConverterTest.cs +++ b/tests/Mono.Android-Tests/System.Drawing/TypeConverterTest.cs @@ -7,7 +7,6 @@ namespace System.Drawing { [TestFixture] - [NUnit.Framework.Category ("DotNetIgnore")] // https://github.com/xamarin/xamarin-android/issues/5275 public class TypeConverterTest { [Test] diff --git a/tests/Mono.Android-Tests/System.Net/SslTest.cs b/tests/Mono.Android-Tests/System.Net/SslTest.cs index be0842ebc57..d6f94d3e389 100644 --- a/tests/Mono.Android-Tests/System.Net/SslTest.cs +++ b/tests/Mono.Android-Tests/System.Net/SslTest.cs @@ -10,7 +10,7 @@ namespace System.NetTests { - [TestFixture, Category ("InetAccess")] + [TestFixture, Category ("InetAccess"), Category ("DotNetIgnore")] public class SslTest { bool ShouldIgnoreException (WebException wex) diff --git a/tests/Mono.Android-Tests/System.Net/WebSocketTests.cs b/tests/Mono.Android-Tests/System.Net/WebSocketTests.cs index 3fd25c58144..fbf04359780 100644 --- a/tests/Mono.Android-Tests/System.Net/WebSocketTests.cs +++ b/tests/Mono.Android-Tests/System.Net/WebSocketTests.cs @@ -9,7 +9,7 @@ namespace System.NetTests [TestFixture] public class WebSocketTests { - [Test, Category ("InetAccess")] + [Test, Category ("InetAccess"), Category ("DotNetIgnore")] // https://github.com/xamarin/xamarin-android/issues/5801 public void TestSocketConnection() { string testMessage = "This is a test!"; diff --git a/tests/Mono.Android-Tests/System/TimeZoneTest.cs b/tests/Mono.Android-Tests/System/TimeZoneTest.cs index 8a38ef56a99..2e9e8b90f49 100644 --- a/tests/Mono.Android-Tests/System/TimeZoneTest.cs +++ b/tests/Mono.Android-Tests/System/TimeZoneTest.cs @@ -12,7 +12,6 @@ namespace Xamarin.Android.RuntimeTests public class TimeZoneTest { [Test] - [Category ("DotNetIgnore")] // https://github.com/dotnet/runtime/issues/44358 public void TestDaylightSavingsTime () { using (var jtz = Java.Util.TimeZone.Default) { diff --git a/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs b/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs index daa0acaf864..c249382a315 100644 --- a/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs +++ b/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs @@ -249,7 +249,7 @@ static Type GetInnerHandlerType (HttpClient httpClient) return innerHandler.GetType (); } - [Test] + [Test, Category ("DotNetIgnore")] public void Sanity_Tls_1_2_Url_WithMonoClientHandlerFails () { var tlsProvider = global::System.Environment.GetEnvironmentVariable ("XA_TLS_PROVIDER");