Address code review feedback for System.Environment tests.

Author: Sridhar-MS

src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj

@@ -18,9 +18,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Diagnostics\Stopwatch.cs" />
-    <Compile Include="System\Environment.NewLine.cs" />
-    <Compile Include="System\Environment.ProcessorCount.cs" />
-    <Compile Include="System\Environment.StackTrace.cs" />
     <Compile Include="System\Runtime\Versioning\FrameworkName.cs" />
     <Compile Include="System\IO\Path.cs" />
     <Compile Include="System\IO\Path.Combine.cs" />
@@ -48,7 +45,11 @@
     <Compile Include="System\Convert.ToUInt64.cs" />
     <Compile Include="System\Environment.ExpandEnvironmentVariables.cs" />
     <Compile Include="System\Environment.GetEnvironmentVariable.cs" />
+    <Compile Include="System\Environment.NewLine.cs" />
+    <Compile Include="System\Environment.ProcessorCount.cs" />
     <Compile Include="System\Environment.SetEnvironmentVariable.cs" />
+    <Compile Include="System\Environment.StackTrace.cs" />
+    <Compile Include="System\Environment.TickCount.cs" />
     <Compile Include="System\Math.cs" />
     <Compile Include="System\Progress.cs" />
     <Compile Include="System\Random.cs" />
@@ -59,7 +60,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
-    <Compile Include="System\Environment.TickCount.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\System.Runtime.Extensions.CoreCLR.csproj">

src/System.Runtime.Extensions/tests/System/Environment.NewLine.cs

@@ -9,21 +9,18 @@ namespace System.Runtime.Extensions.Tests
 {
     public class EnvironmentNewLine
     {
+        [PlatformSpecific(PlatformID.Windows)]
         [Fact]
-        public void NewLineTest()
+        public void Windows_NewLineTest()
         {
-            //arrange
-            string expectedNewLine = Interop.IsWindows ? "\r\n" : "\n";
-
-            //act
-            string actualNewLine = Environment.NewLine;
+            Assert.Equal("\r\n", Environment.NewLine);
+        }
 
-            //assert
-            Assert.Equal(expectedNewLine, actualNewLine);
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Fact]
+        public void Unix_NewLineTest()
+        {
+            Assert.Equal("\n", Environment.NewLine);
         }
     }
-
-
-
-
 }

src/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs

@@ -9,23 +9,30 @@ namespace System.Runtime.Extensions.Tests
 {
     public class EnvironmentProcessorCount
     {
+        [PlatformSpecific(PlatformID.Windows)]
         [Fact]
-        public void ProcessorCountTest()
+        public void Windows_ProcessorCountTest()
         {
             //arrange
-            int expected;
+            SYSTEM_INFO sysInfo = new SYSTEM_INFO();
+            GetSystemInfo(ref sysInfo);
+            int expected = sysInfo.dwNumberOfProcessors;
 
-            if(Interop.IsWindows)
-            {
-                SYSTEM_INFO sysInfo = new SYSTEM_INFO();
-                SYSTEM_INFO.GetSystemInfo(ref sysInfo);
-                expected = sysInfo.dwNumberOfProcessors;
-            }
-            else
-            {
-                int _SC_NPROCESSORS_ONLN = Interop.IsOSX ? 58 : 84;
-                expected = (int)sysconf(_SC_NPROCESSORS_ONLN);                
-            }
+            //act
+            int actual = Environment.ProcessorCount;
+
+            //assert
+            Assert.True(actual > 0);
+            Assert.Equal(expected, actual);
+        }
+
+        [PlatformSpecific(PlatformID.AnyUnix)]
+        [Fact]
+        public void Unix_ProcessorCountTest()
+        {
+            //arrange
+            int _SC_NPROCESSORS_ONLN = Interop.IsOSX || Interop.IsFreeBSD ? 58 : 84;
+            int expected = (int)sysconf(_SC_NPROCESSORS_ONLN);
 
             //act
             int actual = Environment.ProcessorCount;
@@ -38,6 +45,9 @@ public void ProcessorCountTest()
         [DllImport("libc")]
         private static extern long sysconf(int name);
 
+        [DllImport("api-ms-win-core-sysinfo-l1-1-0.dll", SetLastError = true)]
+        internal static extern void GetSystemInfo(ref SYSTEM_INFO lpSystemInfo);
+
         [StructLayout(LayoutKind.Sequential)]
         internal struct SYSTEM_INFO
         {
@@ -51,14 +61,6 @@ internal struct SYSTEM_INFO
             internal int dwAllocationGranularity;
             internal short wProcessorLevel;
             internal short wProcessorRevision;
-            [DllImport("api-ms-win-core-sysinfo-l1-1-0.dll", SetLastError = true)]
-            internal static extern void GetSystemInfo(ref SYSTEM_INFO lpSystemInfo);
         }
-
-
     }
-
-    
-
-    
 }

src/System.Runtime.Extensions/tests/System/Environment.TickCount.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
-using System.Threading.Tasks;
+using System.Threading;
 using Xunit;
 
 namespace System.Runtime.Extensions.Tests
@@ -13,18 +13,8 @@ public class EnvironmentTickCount
         [Fact]
         public void TickCountTest()
         {
-            //arrange
-            const int milliSeconds = 1000;
             int start = Environment.TickCount;
-
-            //act
-            Task.Delay(milliSeconds).Wait();
-            int end = Environment.TickCount;
-
-            //assert
-            Console.WriteLine("Start - " + start);
-            Console.WriteLine("End - " + end);
-            Assert.True(end - start >= milliSeconds);
+            Assert.True(SpinWait.SpinUntil(() => Environment.TickCount > start, TimeSpan.FromSeconds(1)));
         }
     }
 }