Merge pull request #907 from nunit/issue-873

Remove SettingsService
nunit · Mar 1, 2021 · 326ca5b · 326ca5b
2 parents fc27cf7 + 8f618c5
commit 326ca5b
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 678 deletions.
diff --git a/src/NUnitConsole/ConsoleVersion.cs b/src/NUnitConsole/ConsoleVersion.cs
@@ -3,5 +3,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("NUnit Console Runner")]
-[assembly: AssemblyVersion("3.13.0")]
-[assembly: AssemblyInformationalVersion("3.13.0")]
+[assembly: AssemblyVersion("4.0.0")]
+[assembly: AssemblyInformationalVersion("4.0.0")]
diff --git a/src/NUnitEngine/EngineApiVersion.cs b/src/NUnitEngine/EngineApiVersion.cs
@@ -4,5 +4,5 @@
 
 [assembly: AssemblyProduct("NUnit Engine API")]
 [assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyInformationalVersion("3.13.0")]
-[assembly: AssemblyFileVersion("3.13.0")]
+[assembly: AssemblyInformationalVersion("4.0.0")]
+[assembly: AssemblyFileVersion("4.0.0")]
diff --git a/src/NUnitEngine/EngineVersion.cs b/src/NUnitEngine/EngineVersion.cs
@@ -3,5 +3,5 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("NUnit Engine")]
-[assembly: AssemblyVersion("3.13.0")]
-[assembly: AssemblyInformationalVersion("3.13.0")]
+[assembly: AssemblyVersion("4.0.0")]
+[assembly: AssemblyInformationalVersion("4.0.0")]
diff --git a/src/NUnitEngine/nunit.engine.api/ISettings.cs b/src/NUnitEngine/nunit.engine.api/ISettings.cs
diff --git a/src/NUnitEngine/nunit.engine.core/Internal/NUnitConfiguration.cs b/src/NUnitEngine/nunit.engine.core/Internal/NUnitConfiguration.cs
@@ -25,21 +25,5 @@ public static string EngineDirectory
                 return _engineDirectory;
             }
         }
-
-        private static string _applicationDirectory;
-        public static string ApplicationDirectory
-        {
-            get
-            {
-                if (_applicationDirectory == null)
-                {
-                    _applicationDirectory = Path.Combine(
-                        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                        "NUnit");
-                }
-
-                return _applicationDirectory;
-            }
-        }
     }
 }
diff --git a/src/NUnitEngine/nunit.engine.tests/Api/ServiceLocatorTests.cs b/src/NUnitEngine/nunit.engine.tests/Api/ServiceLocatorTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NUnit.Framework;
 
 namespace NUnit.Engine.Api.Tests
@@ -18,8 +16,17 @@ public void CreateEngine()
             _testEngine.InternalTraceLevel = InternalTraceLevel.Off;
         }
 
-        [TestCase(typeof(ISettings))]
+        [TestCase(typeof(ITestFilterService))]
+        [TestCase(typeof(IExtensionService))]
+        [TestCase(typeof(Services.ProjectService))]
+#if NETFRAMEWORK
+        [TestCase(typeof(Services.DomainManager))]
+        [TestCase(typeof(IRuntimeFrameworkService))]
+        [TestCase(typeof(ITestAgency))]
+#endif
         [TestCase(typeof(IDriverService))]
+        [TestCase(typeof(IResultService))]
+        [TestCase(typeof(ITestRunnerFactory))]
         public void CanAccessService(Type serviceType)
         {
             IService service = _testEngine.Services.GetService(serviceType) as IService;

diff --git a/src/NUnitEngine/nunit.engine.tests/Internal/SettingsGroupTests.cs b/src/NUnitEngine/nunit.engine.tests/Internal/SettingsGroupTests.cs
diff --git a/src/NUnitEngine/nunit.engine.tests/Internal/SettingsStoreTests.cs b/src/NUnitEngine/nunit.engine.tests/Internal/SettingsStoreTests.cs
diff --git a/src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeService.cs b/src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeService.cs
@@ -21,11 +21,17 @@ void IService.StartService()
 
         void IService.StopService()
         {
-            _status = ServiceStatus.Stopped;
+            _status = FailToStop
+                ? ServiceStatus.Error
+                : ServiceStatus.Stopped;
         }
 
         // Set to true to cause the service to give
         // an error result when started
         public bool FailToStart { get; set; }
+
+        // Set to true to cause the service to give
+        // an error result when stopped
+        public bool FailToStop { get; set; }
     }
 }
diff --git a/src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeSettingsService.cs b/src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeSettingsService.cs