Remove unused locals in System.ServiceProcess.ServiceController (#39640)
authorMatt Kotsenas <mattkot@microsoft.com>
Tue, 11 Aug 2020 00:02:26 +0000 (17:02 -0700)
committerGitHub <noreply@github.com>
Tue, 11 Aug 2020 00:02:26 +0000 (17:02 -0700)
Remove unused locals and private methods in
System.ServiceProcess.ServiceController.

This fixes a part of #30457.

src/libraries/System.ServiceProcess.ServiceController/tests/ServiceControllerTests.cs
src/libraries/System.ServiceProcess.ServiceController/tests/TestServiceProvider.cs

index 3638b80..f03e424 100644 (file)
@@ -15,7 +15,6 @@ namespace System.ServiceProcess.Tests
         private static readonly Lazy<bool> s_isElevated = new Lazy<bool>(() => AdminHelpers.IsProcessElevated());
         protected static bool IsProcessElevated => s_isElevated.Value;
 
-        private const int ExpectedDependentServiceCount = 3;
         private bool _disposed;
 
         public ServiceControllerTests()
@@ -58,7 +57,7 @@ namespace System.ServiceProcess.Tests
             var controller = new ServiceController(_testService.TestServiceName, _testService.TestMachineName);
             AssertExpectedProperties(controller);
 
-            AssertExtensions.Throws<ArgumentException>(null, () => { var c = new ServiceController(_testService.TestServiceName, ""); });
+            AssertExtensions.Throws<ArgumentException>(null, () => { new ServiceController(_testService.TestServiceName, ""); });
         }
 
         [ConditionalFact(nameof(IsProcessElevated))]
@@ -184,34 +183,5 @@ namespace System.ServiceProcess.Tests
                 _disposed = true;
             }
         }
-
-        private static ServiceController AssertHasDependent(ServiceController controller, string serviceName, string displayName)
-        {
-            var dependent = FindService(controller.DependentServices, serviceName, displayName);
-            Assert.NotNull(dependent);
-
-            return dependent;
-        }
-
-        private static ServiceController AssertDependsOn(ServiceController controller, string serviceName, string displayName)
-        {
-            var dependency = FindService(controller.ServicesDependedOn, serviceName, displayName);
-            Assert.NotNull(dependency);
-
-            return dependency;
-        }
-
-        private static ServiceController FindService(ServiceController[] services, string serviceName, string displayName)
-        {
-            foreach (ServiceController service in services)
-            {
-                if (service.ServiceName == serviceName && service.DisplayName == displayName)
-                {
-                    return service;
-                }
-            }
-
-            return null;
-        }
     }
 }
index 1be86a6..54e6ee3 100644 (file)
@@ -106,7 +106,6 @@ namespace System.ServiceProcess.Tests
                 testServiceInstaller.ServicesDependedOn = new string[] { _dependentServices.TestServiceName };
             }
 
-            var comparer = PlatformDetection.IsNetFramework ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; // .NET Framework upper cases the name
             string processName = Process.GetCurrentProcess().MainModule.FileName;
             string entryPointName = typeof(TestService).Assembly.Location;
             string arguments = TestServiceName;