Enabling 9 new libraries tests for NativeAOT (#72167)

dotnet · Jul 15, 2022 · c670547 · c670547
1 parent 91dda98
commit c670547
Show file tree

Hide file tree

Showing 27 changed files with 196 additions and 58 deletions.
diff --git a/...coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs b/...coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs
@@ -86,6 +86,8 @@ public static object NewObject(RuntimeTypeHandle typeHandle)
                 || eeType == EETypePtr.EETypePtrOf<string>()
                )
                 return null;
+            if (eeType.IsByRefLike)
+                throw new System.Reflection.TargetException();
             return RuntimeImports.RhNewObject(eeType);
         }
 

diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -152,6 +152,8 @@ private static bool GetLinqExpressionsBuiltWithIsInterpretingOnly()
         public static bool IsAssemblyLoadingSupported => !IsNativeAot;
         public static bool IsMethodBodySupported => !IsNativeAot;
         public static bool IsDebuggerTypeProxyAttributeSupported => !IsNativeAot;
+        public static bool HasAssemblyFiles => !string.IsNullOrEmpty(typeof(PlatformDetection).Assembly.Location);
+        public static bool HasHostExecutable => HasAssemblyFiles; // single-file don't have a host
 
         private static volatile Tuple<bool> s_lazyNonZeroLowerBoundArraySupported;
         public static bool IsNonZeroLowerBoundArraySupported

diff --git a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs b/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs
@@ -345,7 +345,9 @@ public static void RentingSpecificLengthsYieldsExpectedLengths(int requestedMini
             }
         }
 
-        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.Is64BitProcess))]
+        public static bool Is64BitProcessAndRemoteExecutorSupported => PlatformDetection.Is64BitProcess && RemoteExecutor.IsSupported;
+
+        [ConditionalTheory(nameof(Is64BitProcessAndRemoteExecutorSupported))]
         [InlineData(1024 * 1024 * 1024 - 1, true)]
         [InlineData(1024 * 1024 * 1024, true)]
         [InlineData(1024 * 1024 * 1024 + 1, false)]

diff --git a/src/libraries/System.Collections.Concurrent/tests/BlockingCollectionTests.cs b/src/libraries/System.Collections.Concurrent/tests/BlockingCollectionTests.cs
@@ -170,7 +170,7 @@ public static void TestBugFix914998()
             Assert.Equal(1, BlockingCollection<int>.TryTakeFromAny(producerArray, out ignored, -1));
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         public static void TestDebuggerAttributes()
         {
             DebuggerAttributes.ValidateDebuggerDisplayReferences(new BlockingCollection<int>());
@@ -181,7 +181,7 @@ public static void TestDebuggerAttributes()
             Assert.Equal(col, items);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         public static void TestDebuggerAttributes_Null()
         {
             Type proxyType = DebuggerAttributes.GetProxyType(new BlockingCollection<int>());

diff --git a/...ies/System.Collections.Concurrent/tests/ConcurrentDictionary/ConcurrentDictionaryTests.cs b/...ies/System.Collections.Concurrent/tests/ConcurrentDictionary/ConcurrentDictionaryTests.cs
@@ -622,7 +622,7 @@ public static void TestConstructor()
             Assert.Equal(1, dictionary.Values.Count);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         public static void TestDebuggerAttributes()
         {
             DebuggerAttributes.ValidateDebuggerDisplayReferences(new ConcurrentDictionary<string, int>());
@@ -635,7 +635,7 @@ public static void TestDebuggerAttributes()
             Assert.Equal(dict, items);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         public static void TestDebuggerAttributes_Null()
         {
             Type proxyType = DebuggerAttributes.GetProxyType(new ConcurrentDictionary<string, int>());

diff --git a/src/libraries/System.Collections.Concurrent/tests/ProducerConsumerCollectionTests.cs b/src/libraries/System.Collections.Concurrent/tests/ProducerConsumerCollectionTests.cs
@@ -953,7 +953,7 @@ public void ManyConcurrentAddsTakes_ForceContentionWithGetEnumerator(int initial
             Assert.Equal(initialCount, c.Count);
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         [InlineData(0)]
         [InlineData(10)]
         public void DebuggerAttributes_Success(int count)
@@ -966,7 +966,7 @@ public void DebuggerAttributes_Success(int count)
             Assert.Equal(c, items.Cast<int>());
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDebuggerTypeProxyAttributeSupported))]
         public void DebuggerTypeProxy_Ctor_NullArgument_Throws()
         {
             IProducerConsumerCollection<int> c = CreateProducerConsumerCollection();

diff --git a/src/libraries/System.Drawing.Common/tests/BitmapTests.cs b/src/libraries/System.Drawing.Common/tests/BitmapTests.cs
@@ -790,6 +790,7 @@ public void GetHicon_Disposed_ThrowsArgumentException()
 
         [ConditionalFact(Helpers.IsDrawingSupported)]
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "In .NET Framework we use GDI 1.0")]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/72165", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))]
         public void SaveWmfAsPngDoesntChangeImageBoundaries()
         {
             if (PlatformDetection.IsWindows7)

diff --git a/src/libraries/System.Drawing.Common/tests/IconTests.cs b/src/libraries/System.Drawing.Common/tests/IconTests.cs
@@ -647,7 +647,8 @@ void VerifyPngNotSupported()
             }
             else
             {
-                VerifyPngNotSupported();
+                if (AppContext.TryGetSwitch(DontSupportPngFramesInIcons, out bool enabled) && enabled)
+                    VerifyPngNotSupported();
             }
         }
 

diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
@@ -5,6 +5,9 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;net48</TargetFrameworks>
     <IgnoreForCI Condition="'$(TargetsMobile)' == 'true'">true</IgnoreForCI>
   </PropertyGroup>
+  <ItemGroup>
+    <RdXmlFile Include="default.rd.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="BitmapTests.cs" />

diff --git a/src/libraries/System.Drawing.Common/tests/System/Drawing/FontConverterTests.cs b/src/libraries/System.Drawing.Common/tests/System/Drawing/FontConverterTests.cs
@@ -81,7 +81,7 @@ public void EmptyStringInput()
             Assert.Null(font);
         }
 
-        [ConditionalFact(Helpers.IsDrawingSupported)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
         public void GetFontPropsSorted()
         {
             // The order provided since .NET Framework

diff --git a/src/libraries/System.Drawing.Common/tests/default.rd.xml b/src/libraries/System.Drawing.Common/tests/default.rd.xml
@@ -0,0 +1,14 @@
+<Directives>
+  <Application>
+    <Assembly Name="System.Private.CoreLib">
+      <!-- called by xUnit's Assert.Equal -->
+      <Type Name="System.IEquatable`1[[System.Drawing.Color,System.Drawing.Primitives]]" Dynamic="Required All" />
+      <Type Name="System.IEquatable`1[[System.Drawing.RectangleF,System.Drawing.Primitives]]" Dynamic="Required All" />
+      <Type Name="System.IEquatable`1[[System.Drawing.PointF,System.Drawing.Primitives]]" Dynamic="Required All" />
+    </Assembly>
+    <Assembly Name="System.Drawing.Common.Tests">
+      <Type Name="System.Drawing.Tests.FontTests+LOGFONT" MarshalStructure="Required All" />
+      <Type Name="System.Drawing.Tests.FontTests+UnblittableLOGFONT" MarshalStructure="Required All" />
+    </Assembly>
+  </Application>
+</Directives>
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -5,6 +5,9 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
     <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
   </PropertyGroup>
+  <ItemGroup>
+    <RdXmlFile Include="default.rd.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" />
     <Compile Include="MemoryMappedFile.CreateOrOpen.Tests.cs" />

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/default.rd.xml b/src/libraries/System.IO.MemoryMappedFiles/tests/default.rd.xml
@@ -0,0 +1,51 @@
+<Directives>
+  <Application>
+    <Assembly Name="System.Linq">
+      <!-- called by xUnit in obscure MemberData scenarios -->
+      <Type Name="System.Linq.Enumerable">
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.MemoryMappedFiles" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.IO.MemoryMappedFiles.MemoryMappedFileAccess,System.IO.MemoryMappedFiles" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.IO.MemoryMappedFiles.MemoryMappedFileOptions,System.IO.MemoryMappedFiles" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.IO.MemoryMappedFiles.MemoryMappedFileOptions,System.IO.MemoryMappedFiles" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.String,System.Private.CoreLib" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.String,System.Private.CoreLib" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.Int64,System.Private.CoreLib" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.Int64,System.Private.CoreLib" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.Boolean,System.Private.CoreLib" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.Boolean,System.Private.CoreLib" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.IO.HandleInheritability,System.Private.CoreLib" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.IO.HandleInheritability,System.Private.CoreLib" />
+        </Method>
+        <Method Name="Cast" Dynamic="Required All">
+          <GenericArgument Name="System.IO.FileMode,System.Private.CoreLib" />
+        </Method>
+        <Method Name="ToArray" Dynamic="Required All">
+          <GenericArgument Name="System.IO.FileMode,System.Private.CoreLib" />
+        </Method>
+      </Type>
+    </Assembly>
+  </Application>
+</Directives>
diff --git a/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs b/src/libraries/System.Memory.Data/tests/BinaryDataTests.cs
@@ -316,7 +316,7 @@ public void MaxStreamLengthRespected()
             var data = BinaryData.FromStream(new OverFlowStream(offset: int.MaxValue - 1000));
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
         public void CanCreateBinaryDataFromCustomType()
         {
             TestModel payload = new TestModel { A = "value", B = 5, C = true, D = null };
@@ -342,7 +342,7 @@ void AssertData(BinaryData data)
             }
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
         public void CanSerializeNullData()
         {
             BinaryData data = new BinaryData(jsonSerializable: null);
@@ -399,7 +399,7 @@ public void CreateThrowsOnNullArray()
             Assert.Contains("data", ex.Message);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
         public void ToObjectHandlesBOM()
         {
             TestModel payload = new TestModel { A = "string", B = 42, C = true };
@@ -415,7 +415,7 @@ public void ToObjectHandlesBOM()
             Assert.Equal(payload.C, model.C);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBuiltWithAggressiveTrimming))]
         public void ToObjectThrowsExceptionOnIncompatibleType()
         {
             TestModel payload = new TestModel { A = "value", B = 5, C = true };

diff --git a/src/libraries/System.Memory/tests/MemoryMarshal/GetArrayDataReference.cs b/src/libraries/System.Memory/tests/MemoryMarshal/GetArrayDataReference.cs
@@ -17,7 +17,7 @@ public static void GetArrayDataReference_NullInput_ThrowsNullRef()
             Assert.Throws<NullReferenceException>(() => MemoryMarshal.GetArrayDataReference((Array)null));
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNonZeroLowerBoundArraySupported))]
         public static void GetArrayDataReference_NonEmptyInput_ReturnsRefToFirstElement()
         {
             // szarray
@@ -50,7 +50,7 @@ public static unsafe void GetArrayDataReference_EmptyInput_ReturnsRefToWhereFirs
             Assert.True(Unsafe.AreSame(ref theRef, ref theMdArrayRef));
         }
 
-        [Theory]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNonZeroLowerBoundArraySupported))]
         [InlineData(1)]
         [InlineData(2)]
         [InlineData(3)]

diff --git a/src/libraries/System.Memory/tests/Span/Reflection.cs b/src/libraries/System.Memory/tests/Span/Reflection.cs
@@ -51,13 +51,21 @@ public static void BinaryPrimitives_StaticWithSpanArgument()
         [Fact]
         public static void MemoryMarshal_GenericStaticReturningSpan()
         {
-            Type type = typeof(MemoryMarshal);
+            MethodInfo createSpanMethod = typeof(MemoryMarshal).GetMethod(nameof(MemoryMarshal.CreateSpan));
 
             int value = 0;
             ref int refInt = ref value;
-
-            MethodInfo method = type.GetMethod(nameof(MemoryMarshal.CreateSpan)).MakeGenericMethod((refInt.GetType()));
-            Assert.Throws<NotSupportedException>(() => method.Invoke(null, new object[] { null, 0 }));
+            Type refIntType = refInt.GetType();
+
+            if (PlatformDetection.IsNativeAot)
+            {
+                Assert.Throws<NotSupportedException>(() => createSpanMethod.MakeGenericMethod(refIntType));
+            }
+            else
+            {
+                MethodInfo method = createSpanMethod.MakeGenericMethod(refIntType);
+                Assert.Throws<NotSupportedException>(() => method.Invoke(null, new object[] { null, 0 }));
+            }
         }
 
         [Fact]

diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
@@ -5,6 +5,9 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <RdXmlFile Include="default.rd.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="ArrayBufferWriter\ArrayBufferWriterTests.Byte.cs" />
     <Compile Include="ArrayBufferWriter\ArrayBufferWriterTests.Char.cs" />

diff --git a/src/libraries/System.Memory/tests/TestHelpers.cs b/src/libraries/System.Memory/tests/TestHelpers.cs
@@ -48,14 +48,11 @@ public static void AssertThrows<E, T>(Span<T> span, AssertThrowsAction<T> action
             try
             {
                 action(span);
-                Assert.False(true, "Expected exception: " + typeof(E).GetType());
+                Assert.False(true, $"Expected exception: {typeof(E)}");
             }
-            catch (E)
+            catch (Exception ex)
             {
-            }
-            catch (Exception wrongException)
-            {
-                Assert.False(true, "Wrong exception thrown: Expected " + typeof(E).GetType() + ": Actual: " + wrongException.GetType());
+                Assert.True(ex is E, $"Wrong exception thrown. Expected: {typeof(E)} Actual: {ex.GetType()}");
             }
         }
 
@@ -112,14 +109,11 @@ public static void AssertThrows<E, T>(ReadOnlySpan<T> span, AssertThrowsActionRe
             try
             {
                 action(span);
-                Assert.False(true, "Expected exception: " + typeof(E).GetType());
-            }
-            catch (E)
-            {
+                Assert.False(true, $"Expected exception: {typeof(E)}");
             }
-            catch (Exception wrongException)
+            catch (Exception ex)
             {
-                Assert.False(true, "Wrong exception thrown: Expected " + typeof(E).GetType() + ": Actual: " + wrongException.GetType());
+                Assert.True(ex is E, $"Wrong exception thrown. Expected: {typeof(E)} Actual: {ex.GetType()}");
             }
         }
 

diff --git a/src/libraries/System.Memory/tests/default.rd.xml b/src/libraries/System.Memory/tests/default.rd.xml
@@ -0,0 +1,55 @@
+<Directives>
+  <Application>
+    <Assembly Name="System.Private.CoreLib">
+      <!-- xUnit needs for Assert.Equals -->
+      <Type Name="System.IEquatable`1[[System.Range,System.Private.CoreLib]]" Dynamic="Required All" />
+    </Assembly>
+
+    <Assembly Name="System.Memory.Tests">
+      <Type Name="System.SpanTests.SpanTests">
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Byte, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.SByte, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.UInt16, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Int16, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.UInt32, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Int32, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.UInt64, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Int64, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.IntPtr, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.UIntPtr, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Char, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Boolean, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Single, System.Private.CoreLib" />
+        </Method>
+        <Method Name="Sort" Dynamic="Required All">
+          <GenericArgument Name="System.Double, System.Private.CoreLib" />
+        </Method>
+      </Type>
+    </Assembly>
+  </Application>
+</Directives>
diff --git a/...braries/System.Reflection.Metadata/tests/Metadata/Decoding/CustomAttributeDecoderTests.cs b/...braries/System.Reflection.Metadata/tests/Metadata/Decoding/CustomAttributeDecoderTests.cs
@@ -12,7 +12,7 @@ namespace System.Reflection.Metadata.Decoding.Tests
 {
     public class CustomAttributeDecoderTests
     {
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasAssemblyFiles))]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/60579", TestPlatforms.iOS | TestPlatforms.tvOS)]
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Type assembly name is different on .NET Framework.")]
         public void TestCustomAttributeDecoder()