Fix ThreadPool tests for uapaot. (dotnet#21049)

Fix ThreadPool tests for uapaot.
dotnet-bot · Jun 14, 2017 · 7208a27 · 7208a27
1 parent d9df3ed
commit 7208a27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
@@ -11,6 +11,9 @@
     <Compile Include="ThreadPoolTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs">
+      <Link>CommonTest\System\PlatformDetection.cs</Link>
+    </Compile>
     <Compile Include="$(CommonTestPath)\System\Threading\ThreadTestHelpers.cs">
       <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
     </Compile>

diff --git a/src/System.Threading.ThreadPool/tests/ThreadPoolTests.cs b/src/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
@@ -17,10 +17,15 @@ public static class ThreadPoolTests
         static ThreadPoolTests()
         {
             // Run the following tests before any others
-            ConcurrentInitializeTest();
+            if (!PlatformDetection.IsNetNative)
+            {
+                ConcurrentInitializeTest();
+            }
         }
 
+        // Tests concurrent calls to ThreadPool.SetMinThreads
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "ThreadPool.SetMinThreads is not supported on UapAot.")]
         public static void ConcurrentInitializeTest()
         {
             int processorCount = Environment.ProcessorCount;
@@ -52,8 +57,8 @@ public static void GetMinMaxThreadsTest()
         {
             int minw, minc;
             ThreadPool.GetMinThreads(out minw, out minc);
-            Assert.True(minw > 0);
-            Assert.True(minc > 0);
+            Assert.True(minw >= 0);
+            Assert.True(minc >= 0);
 
             int maxw, maxc;
             ThreadPool.GetMaxThreads(out maxw, out maxc);
@@ -76,6 +81,7 @@ public static void GetAvailableThreadsTest()
         }
 
         [Fact]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "ThreadPool.SetMinThreads and SetMaxThreads are not supported on UapAot.")]
         public static void SetMinMaxThreadsTest()
         {
             int minw, minc, maxw, maxc;
@@ -144,6 +150,7 @@ public static void SetMinMaxThreadsTest()
         [Fact]
         // Desktop framework doesn't check for this and instead, hits an assertion failure
         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+        [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "ThreadPool.SetMinThreads and SetMaxThreads are not supported on UapAot.")]
         public static void SetMinMaxThreadsTest_ChangedInDotNetCore()
         {
             int minw, minc, maxw, maxc;