Skip to content

Commit 4b926bf

Browse files
authored
#14 Fix sonar issues (#28)
* #14 Fix sonar issues * #14 Fix issues with default public constructor * #14 Add special language file * #14 Remove ServiceProviderContainer
1 parent cc45095 commit 4b926bf

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/ApplicationManager.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@
44

55
namespace Aquality.Selenium.Core.Applications
66
{
7-
public abstract class ApplicationManager<TManager, TApplication>
8-
where TManager : ApplicationManager<TManager, TApplication>
7+
public abstract class ApplicationManager<TApplication>
98
where TApplication : class, IApplication
109
{
1110
private static readonly ThreadLocal<TApplication> AppContainer = new ThreadLocal<TApplication>();
1211
private static readonly ThreadLocal<IServiceProvider> ServiceProviderContainer = new ThreadLocal<IServiceProvider>();
1312

14-
public static bool IsStarted => AppContainer.IsValueCreated && AppContainer.Value.Driver.SessionId != null;
13+
protected ApplicationManager()
14+
{
15+
}
16+
17+
public static bool IsApplicationStarted()
18+
{
19+
return AppContainer.IsValueCreated && AppContainer.Value.Driver.SessionId != null;
20+
}
1521

1622
protected static TApplication GetApplication(Func<IServiceProvider, TApplication> startApplicationFunction, Func<IServiceCollection> serviceCollectionProvider = null)
1723
{
18-
if (!IsStarted)
24+
if (!IsApplicationStarted())
1925
{
2026
AppContainer.Value = startApplicationFunction(
2127
GetServiceProvider(service => GetApplication(startApplicationFunction, serviceCollectionProvider), serviceCollectionProvider));

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/ApplicationManagerTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public void Should_BePossibleTo_RegisterCustomServices_WithCustomSettingsFile()
3333
Assert.AreEqual(SpecialLanguageValue, ApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>().Language);
3434
}
3535

36-
37-
private class ApplicationManager : ApplicationManager<ApplicationManager, IApplication>
36+
private class ApplicationManager : ApplicationManager<IApplication>
3837
{
3938
public static IApplication Application => GetApplication(StartApplicationFunction, () => RegisterServices(services => Application));
4039

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ApplicationManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Aquality.Selenium.Core.Tests.Applications.Browser
1010
{
11-
public class ApplicationManager : ApplicationManager<ApplicationManager, ChromeApplication>
11+
public class ApplicationManager : ApplicationManager<ChromeApplication>
1212
{
1313
private static readonly object downloadDriverLock = new object();
1414

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ApplicationNotStartedTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class ApplicationNotStartedTests : TestWithBrowser
3030
public void Should_NotStartApplication_ForServiceResolving(Type type)
3131
{
3232
Assert.IsNotNull(ServiceProvider.GetRequiredService(type));
33-
Assert.IsFalse(ApplicationManager.IsStarted);
33+
Assert.IsFalse(ApplicationManager.IsApplicationStarted());
3434
}
3535
}
3636
}

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/TestWithBrowser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void SetUp()
2222
[TearDown]
2323
public void CleanUp()
2424
{
25-
if (ApplicationManager.IsStarted)
25+
if (ApplicationManager.IsApplicationStarted())
2626
{
2727
ApplicationManager.Application.Quit();
2828
}

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ApplicationManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp
1111
{
12-
public class ApplicationManager : ApplicationManager<ApplicationManager, WindowsApplication>
12+
public class ApplicationManager : ApplicationManager<WindowsApplication>
1313
{
1414
private const string SupportedApplication = "./Resources/WindowsApp/Day Maxi Calc.exe";
1515
private const string DefaultDriverServer = "http://127.0.0.1:4723/";

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/TestWithApplication.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class TestWithApplication
88
[TearDown]
99
public void CleanUp()
1010
{
11-
if (ApplicationManager.IsStarted)
11+
if (ApplicationManager.IsApplicationStarted())
1212
{
1313
ApplicationManager.Application.Driver.Quit();
1414
}

0 commit comments

Comments
 (0)