Add test coverage to System.Diagnostics.Process.

In this commit, removed HandleCount implementation, as it's not exposed in
contract. Added some more functional tests. Reorganized the test structure
to inherit from a TestBase. Renamed the tests to match the Given When Then
naming scheme.

Author: Lakshmi Priya Sekar

src/Common/src/Interop/OSX/Interop.libproc.cs

@@ -18,12 +18,10 @@ internal static partial class libproc
 
         // Constants from proc_info.h
         private const int MAXTHREADNAMESIZE = 64;
-        private const int PROC_PIDLISTFDS = 1;
         private const int PROC_PIDTASKALLINFO = 2;
         private const int PROC_PIDTHREADINFO = 5;
         private const int PROC_PIDLISTTHREADS = 6;
         private const int PROC_PIDPATHINFO_MAXSIZE = 4 * MAXPATHLEN;
-        private static int PROC_PIDLISTFD_SIZE = Marshal.SizeOf<proc_fdinfo>();
         private static int PROC_PIDLISTTHREADS_SIZE = (Marshal.SizeOf<uint>() * 2);
 
         // Constants from sys\resource.h
@@ -407,70 +405,6 @@ private static unsafe extern int proc_pidinfo(
             return threads;
         }
 
-        /// <summary>
-        /// Retrieves the number of open file descriptors for the specified pid
-        /// </summary>
-        /// <returns>A count of file descriptors for this process.</returns>
-        /// <remarks>
-        /// This function doesn't use the helper since it seems to allow passing NULL
-        /// values in to the buffer and length parameters to get back an estimation 
-        /// of how much data we will need to allocate; the other flavors don't seem
-        /// to support doing that.
-        /// </remarks>
-        internal static unsafe int GetFileDescriptorCountForPid(int pid)
-        {
-            // Negative PIDs are invalid
-            if (pid < 0)
-            {
-                throw new ArgumentOutOfRangeException("pid");
-            }
-
-            // Query for an estimation about the size of the buffer we will need. This seems
-            // to add some padding from the real number, so we don't need to do that
-            int result = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, (proc_fdinfo*)null, 0);
-            if (result <= 0)
-            {
-                // If we were unable to access the information, just return the empty list.  
-                // This is likely to happen for privileged processes, if the process went away
-                // by the time we tried to query it, etc.
-                return 0;
-            }
-
-            proc_fdinfo[] fds;
-            int size = (int)(result / Marshal.SizeOf<proc_fdinfo>()) + 1;
-
-            // Just in case the app opened a ton of handles between when we asked and now,
-            // make sure we retry if our buffer is filled
-            do
-            {
-                fds = new proc_fdinfo[size];
-                fixed (proc_fdinfo* pFds = fds)
-                {
-                    result = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, pFds, Marshal.SizeOf<proc_fdinfo>() * fds.Length);
-                }
-
-                if (result <= 0)
-                {
-                    // If we were unable to access the information, just return the empty list.  
-                    // This is likely to happen for privileged processes, if the process went away
-                    // by the time we tried to query it, etc.
-                    return 0;
-                }
-                else
-                {
-                    checked
-                    {
-                        size *= 2;
-                    }
-                }
-            }
-            while (result == (fds.Length * Marshal.SizeOf<proc_fdinfo>()));
-
-            Debug.Assert((result % Marshal.SizeOf<proc_fdinfo>()) == 0);
-
-            return (int)(result / Marshal.SizeOf<proc_fdinfo>());
-        }
-
         /// <summary>
         /// Gets the full path to the executable file identified by the specified PID
         /// </summary>

src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs

@@ -199,21 +199,6 @@ public DateTime ExitTime
             }
         }
 
-        /// <devdoc>
-        ///    <para>
-        ///       Gets the number of handles that are associated
-        ///       with the process.
-        ///    </para>
-        /// </devdoc>
-        public int HandleCount
-        {
-            get
-            {
-                EnsureState(State.HaveProcessInfo);
-                return _processInfo.HandleCount;
-            }
-        }
-
         /// <devdoc>
         ///    <para>
         ///       Gets

src/System.Diagnostics.Process/src/System/Diagnostics/ProcessInfo.cs

@@ -18,7 +18,6 @@ internal sealed class ProcessInfo
         internal int BasePriority { get; set; }
         internal string ProcessName { get; set; }
         internal int ProcessId { get; set; }
-        internal int HandleCount { get; set; }
         internal long PoolPagedBytes { get; set; }
         internal long PoolNonPagedBytes { get; set; }
         internal long VirtualBytes { get; set; }
@@ -35,7 +34,6 @@ internal ProcessInfo()
             BasePriority = 0;
             ProcessName = "";
             ProcessId = 0;
-            HandleCount = 0;
             PoolPagedBytes = 0;
             PoolNonPagedBytes = 0;
             VirtualBytes = 0;

src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs

@@ -94,7 +94,6 @@ private static ProcessInfo CreateProcessInfo(int pid)
                     VirtualBytes = (long)procFsStat.vsize,
                     WorkingSet = procFsStat.rss,
                     SessionId = procFsStat.session,
-                    HandleCount = 0, // not a Unix concept
 
                     // We don't currently fill in the other values.
                     // A few of these could probably be filled in from getrusage,

src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.OSX.cs

@@ -40,7 +40,6 @@ private static ProcessInfo CreateProcessInfo(int pid)
                 Interop.libproc.proc_taskallinfo temp = info.Value;
                 unsafe { procInfo.ProcessName = Marshal.PtrToStringAnsi(new IntPtr(temp.pbsd.pbi_comm)); }
                 procInfo.BasePriority = temp.pbsd.pbi_nice;
-                procInfo.HandleCount = Interop.libproc.GetFileDescriptorCountForPid(pid);
                 procInfo.VirtualBytes = (long)temp.ptinfo.pti_virtual_size;
                 procInfo.WorkingSet = (long)temp.ptinfo.pti_resident_size;
             }

src/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs

@@ -229,7 +229,6 @@ internal static class NtProcessManager
         static NtProcessManager()
         {
             s_valueIds = new Dictionary<String, ValueId>();
-            s_valueIds.Add("Handle Count", ValueId.HandleCount);
             s_valueIds.Add("Pool Paged Bytes", ValueId.PoolPagedBytes);
             s_valueIds.Add("Pool Nonpaged Bytes", ValueId.PoolNonpagedBytes);
             s_valueIds.Add("Elapsed Time", ValueId.ElapsedTime);
@@ -741,9 +740,6 @@ static ProcessInfo GetProcessInfo(Interop.mincore.PERF_OBJECT_TYPE type, IntPtr
                     case ValueId.ProcessId:
                         processInfo.ProcessId = (int)value;
                         break;
-                    case ValueId.HandleCount:
-                        processInfo.HandleCount = (int)value;
-                        break;
                     case ValueId.PoolPagedBytes:
                         processInfo.PoolPagedBytes = value;
                         break;
@@ -802,7 +798,6 @@ static long ReadCounterValue(int counterType, IntPtr dataPtr)
         enum ValueId
         {
             Unknown = -1,
-            HandleCount,
             PoolPagedBytes,
             PoolNonpagedBytes,
             ElapsedTime,
@@ -950,7 +945,6 @@ static ProcessInfo[] GetProcessInfos(IntPtr dataPtr)
                 ProcessInfo processInfo = new ProcessInfo();
                 // Process ID shouldn't overflow. OS API GetCurrentProcessID returns DWORD.
                 processInfo.ProcessId = pi.UniqueProcessId.ToInt32();
-                processInfo.HandleCount = (int)pi.HandleCount;
                 processInfo.SessionId = (int)pi.SessionId;
                 processInfo.PoolPagedBytes = (long)pi.QuotaPagedPoolUsage; ;
                 processInfo.PoolNonPagedBytes = (long)pi.QuotaNonPagedPoolUsage;

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/Interop.cs

@@ -1,17 +1,13 @@
-using Microsoft.Win32.SafeHandles;
-using System;
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Win32.SafeHandles;
 using System.Runtime.InteropServices;
 
 namespace System.Diagnostics.ProcessTests
 {
-    class Interop
+    internal class Interop
     {
-        [DllImport("api-ms-win-core-processthreads-l1-1-0.dll")]
-        public static extern int GetProcessId(SafeProcessHandle nativeHandle);
-
-        [DllImport("psapi.dll", SetLastError = true)]
-        public static extern bool GetProcessMemoryInfo(IntPtr hProcess, out PROCESS_MEMORY_COUNTERS counters, uint size);
-
         [StructLayout(LayoutKind.Sequential, Size = 40)]
         public struct PROCESS_MEMORY_COUNTERS
         {
@@ -30,11 +26,37 @@ public struct PROCESS_MEMORY_COUNTERS
         [DllImport("api-ms-win-core-memory-l1-1-1.dll")]
         public static extern bool GetProcessWorkingSetSizeEx(SafeProcessHandle hProcess, out IntPtr lpMinimumWorkingSetSize, out IntPtr lpMaximumWorkingSetSize, out uint flags);
 
-
         [DllImport("api-ms-win-core-processthreads-l1-1-0", CharSet = System.Runtime.InteropServices.CharSet.Unicode, SetLastError = true)]
         public static extern int GetPriorityClass(SafeProcessHandle handle);
 
         [DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Ansi, SetLastError = true)]
         public static extern SafeProcessHandle GetCurrentProcess();
+
+        [DllImport("api-ms-win-core-processthreads-l1-1-0.dll")]
+        internal static extern int GetCurrentProcessId();
+
+        [DllImport("libc")]
+        internal static extern int getpid();
+
+        [DllImport("libc")]
+        internal static extern int getsid(int pid);
+
+        [DllImport("api-ms-win-core-processthreads-l1-1-2.dll")]
+        internal static extern bool ProcessIdToSessionId(uint dwProcessId, out uint pSessionId);
+
+        [DllImport("api-ms-win-core-processthreads-l1-1-0.dll")]
+        public static extern int GetProcessId(SafeProcessHandle nativeHandle);
+
+        [DllImport("api-ms-win-core-console-l1-1-0.dll")]
+        internal extern static int GetConsoleCP();
+
+        [DllImport("api-ms-win-core-console-l1-1-0.dll")]
+        internal extern static int GetConsoleOutputCP();
+
+        [DllImport("api-ms-win-core-console-l1-1-0.dll")]
+        internal extern static int SetConsoleCP(int codePage);
+
+        [DllImport("api-ms-win-core-console-l1-1-0.dll")]
+        internal extern static int SetConsoleOutputCP(int codePage);
     }
 }

src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/Process_EncodingTest.cs renamed to src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/ProcessStandardConsoleTests.cs

@@ -6,24 +6,12 @@
 
 namespace System.Diagnostics.ProcessTests
 {
-    public partial class ProcessTest
+    public class ProcessStandardConsoleTests : ProcessTestBase
     {
-        [System.Runtime.InteropServices.DllImport("api-ms-win-core-console-l1-1-0.dll")]
-        private extern static int GetConsoleCP();
-
-        [System.Runtime.InteropServices.DllImport("api-ms-win-core-console-l1-1-0.dll")]
-        private extern static int GetConsoleOutputCP();
-
-        [System.Runtime.InteropServices.DllImport("api-ms-win-core-console-l1-1-0.dll")]
-        private extern static int SetConsoleCP(int codePage);
-
-        [System.Runtime.InteropServices.DllImport("api-ms-win-core-console-l1-1-0.dll")]
-        private extern static int SetConsoleOutputCP(int codePage);
-
         private const int s_ConsoleEncoding = 437;
 
         [Fact]
-        public void Process_EncodingBeforeProvider()
+        public void TestChangesInConsoleEncoding()
         {
             Action<int> run = expectedCodePage =>
             {
@@ -47,21 +35,21 @@ public void Process_EncodingBeforeProvider()
                 return;
             }
 
-            int inputEncoding = GetConsoleCP();
-            int outputEncoding = GetConsoleOutputCP();
+            int inputEncoding = Interop.GetConsoleCP();
+            int outputEncoding = Interop.GetConsoleOutputCP();
 
             try
             {
                 {
-                    SetConsoleCP(s_ConsoleEncoding);
-                    SetConsoleOutputCP(s_ConsoleEncoding);
+                    Interop.SetConsoleCP(s_ConsoleEncoding);
+                    Interop.SetConsoleOutputCP(s_ConsoleEncoding);
 
                     run(Encoding.UTF8.CodePage);
                 }
 
                 {
-                    SetConsoleCP(s_ConsoleEncoding);
-                    SetConsoleOutputCP(s_ConsoleEncoding);
+                    Interop.SetConsoleCP(s_ConsoleEncoding);
+                    Interop.SetConsoleOutputCP(s_ConsoleEncoding);
 
                     // Register the codeprovider which will ensure 437 is enabled.
                     Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@@ -71,10 +59,9 @@ public void Process_EncodingBeforeProvider()
             }
             finally
             {
-                SetConsoleCP(inputEncoding);
-                SetConsoleOutputCP(outputEncoding);
+                Interop.SetConsoleCP(inputEncoding);
+                Interop.SetConsoleOutputCP(outputEncoding);
             }
         }
-
     }
 }