Fix native aot test failures (#76114)

jkotas · filipnavara · web-flow · commit e823a080eacd · 2022-09-24T06:05:07.000-07:00
* Fix native aot test failures * Fix test failure on NativeAOT with non-English locale * Delete duplicate and dead files Fixes #75699 Co-authored-by: Filip Navara <filip.navara@gmail.com>
diff --git a/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertCreateCertificateContext.cs b/src/libraries/Common/src/Interop/Windows/Crypt32/Interop.CertCreateCertificateContext.cs
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -9,6 +9,7 @@
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
     <IncludeNetworkSecurityConfig Condition="'$(TargetOS)' == 'Android'">true</IncludeNetworkSecurityConfig>
+    <EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
   </PropertyGroup>
 
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
+    <EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -8,6 +8,7 @@
     <!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
     <IncludeNetworkSecurityConfig Condition="'$(TargetOS)' == 'Android'">true</IncludeNetworkSecurityConfig>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
+    <EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/libraries/System.Private.Xml/src/Utils/System.Xml.Utils.txt b/src/libraries/System.Private.Xml/src/Utils/System.Xml.Utils.txt
diff --git a/src/libraries/System.Private.Xml/src/Utils/native.rc b/src/libraries/System.Private.Xml/src/Utils/native.rc
diff --git a/src/libraries/System.Private.Xml/tests/ExceptionVerifier.cs b/src/libraries/System.Private.Xml/tests/ExceptionVerifier.cs
@@ -10,7 +10,7 @@
 using System.Text.RegularExpressions;
 using Xunit.Abstractions;
 
-namespace System.Xml.XmlSchemaValidatorApiTests
+namespace System.Xml.Tests
 {
     public class LineInfo
     {
@@ -134,13 +134,18 @@ public ExceptionVerifier(string assemblyName, ExceptionVerificationFlags flags,
                     {
                         _output.WriteLine(e2.ToString());
                     }
+                    catch (PlatformNotSupportedException e3)
+                    {
+                        // NativeAOT doesn't support assembly loading
+                        _output.WriteLine(e3.ToString());
+                    }
                 }
             }
             catch (Exception e)
             {
                 _output.WriteLine("Exception: " + e.Message);
                 _output.WriteLine("Stack: " + e.StackTrace);
-                throw new VerifyException("Error while loading assembly");
+                throw new VerifyException("Error while loading assembly", e);
             }
 
             string[] resArray;
@@ -175,7 +180,6 @@ public ExceptionVerifier(string assemblyName, ExceptionVerificationFlags flags,
                         }
                         resReader.Dispose();
                     }
-                    //break;
                 }
             }
 
@@ -209,8 +213,7 @@ private void ExceptionInfoOutput()
                             "\n===== Original Exception Message =====\n" + _ex.Message +
                             "\n===== Resource Id =====\n" + fInfo.GetValue(_ex) +
                             "\n===== HelpLink =====\n" + _ex.HelpLink +
-                            "\n===== Source =====\n" + _ex.Source /*+
-                            "\n===== TargetSite =====\n" + ex.TargetSite + "\n"*/);
+                            "\n===== Source =====\n" + _ex.Source);
 
             _output.WriteLine(
                             "\n===== InnerException =====\n" + _ex.InnerException +
@@ -395,5 +398,9 @@ public class VerifyException : Exception
         public VerifyException(string msg)
             : base(msg)
         { }
+
+        public VerifyException(string msg, Exception innerException)
+            : base(msg, innerException)
+        { }
     }
 }
diff --git a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <Compile Include="AllowDefaultResolverContext.cs" />
+    <Compile Include="ExceptionVerifier.cs" />
     <Compile Include="$(CommonTestPath)\TestUtilities\System\DisableParallelizationPerAssembly.cs" Link="Common\TestUtilities\System\DisableParallelizationPerAssembly.cs" />
   </ItemGroup>
 
@@ -401,7 +402,6 @@
   <ItemGroup>
     <Compile Include="XmlSchema\XmlSchemaValidatorApi\Constructor_AddSchema.cs" />
     <Compile Include="XmlSchema\XmlSchemaValidatorApi\CustomImplementations.cs" />
-    <Compile Include="XmlSchema\XmlSchemaValidatorApi\ExceptionVerifier.cs" />
     <Compile Include="XmlSchema\XmlSchemaValidatorApi\GetExpectedAttributes.cs" />
     <Compile Include="XmlSchema\XmlSchemaValidatorApi\GetExpectedParticles.cs" />
     <Compile Include="XmlSchema\XmlSchemaValidatorApi\Initialize_EndValidation.cs" />
@@ -641,7 +641,6 @@
     <Compile Include="Xslt\XslTransformApi\CThreads.cs" />
     <Compile Include="Xslt\XslTransformApi\CXmlCache.cs" />
     <Compile Include="Xslt\XslTransformApi\DataHelper.cs" />
-    <Compile Include="Xslt\XslTransformApi\ExceptionVerifier.cs" />
     <Compile Include="Xslt\XslTransformApi\MyNavigator.cs" />
     <Compile Include="Xslt\XslTransformApi\ReaderType.cs" />
     <Compile Include="Xslt\XslTransformApi\ThreadFunc.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.IO;
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.IO;
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.IO;
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Xml.Schema;
+using System.Xml.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs
@@ -1059,7 +1059,7 @@ public static void Xml_ConstructorWithXmlAttributeOverrides()
         });
     }
 
-    [ConditionalFact(nameof(IsTimeSpanSerializationAvailable))]
+    [Fact]
     public static void Xml_TimeSpanAsRoot()
     {
         Assert.StrictEqual(new TimeSpan(1, 2, 3), SerializeAndDeserialize<TimeSpan>(new TimeSpan(1, 2, 3),
@@ -3013,7 +3013,7 @@ public static void Xml_DefaultNamespaceChange_ObjectAsRoot()
         Assert.StrictEqual(value, actual);
     }
 
-    [ConditionalFact(nameof(IsTimeSpanSerializationAvailable))]
+    [Fact]
     public static void VerifyRestrictionElementForTimeSpanTest()
     {
         var schemas = new XmlSchemas();
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs
@@ -21,9 +21,13 @@
 using SerializationTypes;
 using Xunit;
 
+#if !ReflectionOnly && !XMLSERIALIZERGENERATORTESTS
+// Many test failures due to trimming and MakeGeneric. XmlSerializer is not currently supported with NativeAOT.
+[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
+#endif
 public static partial class XmlSerializerTests
 {
-#if ReflectionOnly|| XMLSERIALIZERGENERATORTESTS
+#if ReflectionOnly || XMLSERIALIZERGENERATORTESTS
     private static readonly string SerializationModeSetterName = "set_Mode";
 
     static XmlSerializerTests()
@@ -39,8 +43,6 @@ static XmlSerializerTests()
     }
 #endif
 
-    private static bool IsTimeSpanSerializationAvailable => true;
-
     [Fact]
     public static void Xml_TypeWithDateTimePropertyAsXmlTime()
     {
@@ -64,14 +66,11 @@ public static void Xml_TypeWithDateTimePropertyAsXmlTime()
             Value = new DateTime(549269870000L, DateTimeKind.Utc)
         };
 
-        if (IsTimeSpanSerializationAvailable)
-        {
-            TypeWithDateTimePropertyAsXmlTime utcTimeRoundTrip = SerializeAndDeserialize(utcTimeObject,
-    @"<?xml version=""1.0"" encoding=""utf-8""?>
+        TypeWithDateTimePropertyAsXmlTime utcTimeRoundTrip = SerializeAndDeserialize(utcTimeObject,
+@"<?xml version=""1.0"" encoding=""utf-8""?>
 <TypeWithDateTimePropertyAsXmlTime xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">15:15:26.9870000Z</TypeWithDateTimePropertyAsXmlTime>");
 
-            Assert.StrictEqual(utcTimeObject.Value, utcTimeRoundTrip.Value);
-        }
+        Assert.StrictEqual(utcTimeObject.Value, utcTimeRoundTrip.Value);
     }
 
     [Fact]
@@ -812,7 +811,7 @@ public static void Xml_DifferentSerializeDeserializeOverloads()
         }
     }
 
-    [ConditionalFact(nameof(IsTimeSpanSerializationAvailable))]
+    [Fact]
     public static void Xml_TypeWithTimeSpanProperty()
     {
         var obj = new TypeWithTimeSpanProperty { TimeSpanProperty = TimeSpan.FromMilliseconds(1) };
@@ -824,7 +823,7 @@ public static void Xml_TypeWithTimeSpanProperty()
         Assert.StrictEqual(obj.TimeSpanProperty, deserializedObj.TimeSpanProperty);
     }
 
-    [ConditionalFact(nameof(IsTimeSpanSerializationAvailable))]
+    [Fact]
     public static void Xml_TypeWithDefaultTimeSpanProperty()
     {
         var obj = new TypeWithDefaultTimeSpanProperty { TimeSpanProperty2 = new TimeSpan(0, 1, 0) };
diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/ExceptionVerifier.cs b/src/libraries/System.Private.Xml/tests/Xslt/XslTransformApi/ExceptionVerifier.cs
diff --git a/src/libraries/System.Reflection.Context/tests/CustomReflectionContextTests.cs b/src/libraries/System.Reflection.Context/tests/CustomReflectionContextTests.cs
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using System.Text.RegularExpressions;`
`11`	`11`	`using Xunit.Abstractions;`
`12`	`12`
`13`		`-namespace System.Xml.XmlSchemaValidatorApiTests`
	`13`	`+namespace System.Xml.Tests`
`14`	`14`	`{`
`15`	`15`	`public class LineInfo`
`16`	`16`	`{`
`@@ -134,13 +134,18 @@ public ExceptionVerifier(string assemblyName, ExceptionVerificationFlags flags,`
`134`	`134`	`{`
`135`	`135`	`_output.WriteLine(e2.ToString());`
`136`	`136`	`}`
	`137`	`+ catch (PlatformNotSupportedException e3)`
	`138`	`+ {`
	`139`	`+ // NativeAOT doesn't support assembly loading`
	`140`	`+ _output.WriteLine(e3.ToString());`
	`141`	`+ }`
`137`	`142`	`}`
`138`	`143`	`}`
`139`	`144`	`catch (Exception e)`
`140`	`145`	`{`
`141`	`146`	`_output.WriteLine("Exception: " + e.Message);`
`142`	`147`	`_output.WriteLine("Stack: " + e.StackTrace);`
`143`		`- throw new VerifyException("Error while loading assembly");`
	`148`	`+ throw new VerifyException("Error while loading assembly", e);`
`144`	`149`	`}`
`145`	`150`
`146`	`151`	`string[] resArray;`
`@@ -175,7 +180,6 @@ public ExceptionVerifier(string assemblyName, ExceptionVerificationFlags flags,`
`175`	`180`	`}`
`176`	`181`	`resReader.Dispose();`
`177`	`182`	`}`
`178`		`- //break;`
`179`	`183`	`}`
`180`	`184`	`}`
`181`	`185`
`@@ -209,8 +213,7 @@ private void ExceptionInfoOutput()`
`209`	`213`	`"\n===== Original Exception Message =====\n" + _ex.Message +`
`210`	`214`	`"\n===== Resource Id =====\n" + fInfo.GetValue(_ex) +`
`211`	`215`	`"\n===== HelpLink =====\n" + _ex.HelpLink +`
`212`		`- "\n===== Source =====\n" + _ex.Source /*+`
`213`		`- "\n===== TargetSite =====\n" + ex.TargetSite + "\n"*/);`
	`216`	`+ "\n===== Source =====\n" + _ex.Source);`
`214`	`217`
`215`	`218`	`_output.WriteLine(`
`216`	`219`	`"\n===== InnerException =====\n" + _ex.InnerException +`
`@@ -395,5 +398,9 @@ public class VerifyException : Exception`
`395`	`398`	`public VerifyException(string msg)`
`396`	`399`	`: base(msg)`
`397`	`400`	`{ }`
	`401`	`+`
	`402`	`+ public VerifyException(string msg, Exception innerException)`
	`403`	`+ : base(msg, innerException)`
	`404`	`+ { }`
`398`	`405`	`}`
`399`	`406`	`}`