Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SettingsService #907

Merged
merged 4 commits into from
Mar 1, 2021
Merged

Remove SettingsService #907

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2157a3
Remove SettingsService
CharliePoole Mar 1, 2021
c3ccd75
Update service-related tests
CharliePoole Mar 1, 2021
104dbca
Update EngineApiVersion.cs
CharliePoole Mar 1, 2021
8f618c5
Remove property no longer in use
CharliePoole Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/NUnitConsole/ConsoleVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion src/NUnitEngine/EngineApiVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

[assembly: AssemblyProduct("NUnit Engine API")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyInformationalVersion("3.13.0")]
[assembly: AssemblyInformationalVersion("4.0.0")]
[assembly: AssemblyFileVersion("3.13.0")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think you've missed a version here. 🙂

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there's also a version stored in the Cake file, which should be updated in sync with these?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your right that I missed one. I'll fix.

However, the cake file was updated when I created dev-4.0 so doesn't need to be changed here.

4 changes: 2 additions & 2 deletions src/NUnitEngine/EngineVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
79 changes: 0 additions & 79 deletions src/NUnitEngine/nunit.engine.api/ISettings.cs
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions src/NUnitEngine/nunit.engine.tests/Api/ServiceLocatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;
Expand Down
99 changes: 0 additions & 99 deletions src/NUnitEngine/nunit.engine.tests/Internal/SettingsGroupTests.cs
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions src/NUnitEngine/nunit.engine.tests/Internal/SettingsStoreTests.cs
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
36 changes: 0 additions & 36 deletions src/NUnitEngine/nunit.engine.tests/Services/Fakes/FakeSettingsService.cs
View file
Open in desktop

This file was deleted.

Loading