#37 renamed ApplicationManager to AqualityServices (#39)

knysh · web-flow · commit 8c2ce82f742e · 2019-12-12T16:42:14.000+03:00
+semver: minor * #37 renamed ApplicationManager to AqualityServices * made IsApplicationStarted protected * #37 fixed build * fix build
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/AqualityServices.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/AqualityServices.cs
@@ -4,17 +4,17 @@
 
 namespace Aquality.Selenium.Core.Applications
 {
-    public abstract class ApplicationManager<TApplication>
+    public abstract class AqualityServices<TApplication>
         where TApplication : class, IApplication
     {
         private static readonly ThreadLocal<TApplication> AppContainer = new ThreadLocal<TApplication>();
         private static readonly ThreadLocal<IServiceProvider> ServiceProviderContainer = new ThreadLocal<IServiceProvider>();
 
-        protected ApplicationManager()
+        protected AqualityServices()
         {
         }
 
-        public static bool IsApplicationStarted()
+        protected static bool IsApplicationStarted()
         {
             return AppContainer.IsValueCreated && AppContainer.Value.Driver.SessionId != null;
         }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/AqualityServicesTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/AqualityServicesTests.cs
@@ -9,7 +9,7 @@
 
 namespace Aquality.Selenium.Core.Tests.Applications
 {
-    public class ApplicationManagerTests
+    public class AqualityServicesTests
     {
         private const string SpecialSettingsFile = "special";
         private const string SpecialLanguageValue = "special";
@@ -19,31 +19,31 @@ public class ApplicationManagerTests
         [Test]
         public void Should_BePossibleTo_RegisterCustomServices()
         {
-            Assert.IsInstanceOf<TestTimeoutConfiguration>(TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>());
+            Assert.IsInstanceOf<TestTimeoutConfiguration>(TestAqualityServices.ServiceProvider.GetService<ITimeoutConfiguration>());
         }
 
         [Test]
         public void Should_BePossibleTo_GetCustomValues()
         {
-            var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>() as TestTimeoutConfiguration;
+            var timeoutConfiguration = TestAqualityServices.ServiceProvider.GetService<ITimeoutConfiguration>() as TestTimeoutConfiguration;
             Assert.AreEqual(SpecialTimeoutValue,  timeoutConfiguration.CustomTimeout);
         }
 
         [Test]
         public void Should_BePossibleTo_GetCustomLoggerValues()
         {
-            TestApplicationManager.SetStartup(new CustomStartup());
-            var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>() as CustomLoggerConfiguration;
+            TestAqualityServices.SetStartup(new CustomStartup());
+            var timeoutConfiguration = TestAqualityServices.ServiceProvider.GetService<ILoggerConfiguration>() as CustomLoggerConfiguration;
             Assert.AreEqual(SpecialLogger, timeoutConfiguration.CustomLogger);
         }
 
         [Test]
         public void Should_BePossibleTo_RegisterCustomServices_WithCustomSettingsFile()
         {
-            Assert.AreEqual(SpecialLanguageValue, TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>().Language);
+            Assert.AreEqual(SpecialLanguageValue, TestAqualityServices.ServiceProvider.GetService<ILoggerConfiguration>().Language);
         }
 
-        private class TestApplicationManager : ApplicationManager<IApplication>
+        private class TestAqualityServices : AqualityServices<IApplication>
         {
             private static ThreadLocal<TestStartup> startup = new ThreadLocal<TestStartup>();
 
@@ -56,7 +56,7 @@ public static void SetStartup(Startup startup)
             {
                 if (startup != null)
                 {
-                    TestApplicationManager.startup.Value = (TestStartup)startup;
+                    TestAqualityServices.startup.Value = (TestStartup)startup;
                 }
             }
 
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ApplicationNotStartedTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ApplicationNotStartedTests.cs
@@ -30,7 +30,7 @@ public class ApplicationNotStartedTests : TestWithBrowser
         public void Should_NotStartApplication_ForServiceResolving(Type type)
         {
             Assert.IsNotNull(ServiceProvider.GetRequiredService(type));
-            Assert.IsFalse(ApplicationManager.IsApplicationStarted());
+            Assert.IsFalse(AqualityServices.IsApplicationStarted);
         }
     }
 }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/AqualityServices.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/AqualityServices.cs
@@ -8,10 +8,12 @@
 
 namespace Aquality.Selenium.Core.Tests.Applications.Browser
 {
-    public class ApplicationManager : ApplicationManager<ChromeApplication>
+    public class AqualityServices : AqualityServices<ChromeApplication>
     {
         private static readonly object downloadDriverLock = new object();
 
+        public new static bool IsApplicationStarted => IsApplicationStarted();
+
         public static ChromeApplication Application => GetApplication(services => StartChrome(services));
 
         public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application);
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/Elements/WebElement.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/Elements/WebElement.cs
@@ -15,16 +15,16 @@ protected WebElement(By locator, string name, ElementState state) : base(locator
         {
         }
 
-        protected override ElementActionRetrier ActionRetrier => ApplicationManager.ServiceProvider.GetRequiredService<ElementActionRetrier>();
+        protected override ElementActionRetrier ActionRetrier => AqualityServices.ServiceProvider.GetRequiredService<ElementActionRetrier>();
 
-        protected override IApplication Application => ApplicationManager.Application;
+        protected override IApplication Application => AqualityServices.Application;
 
-        protected override ConditionalWait ConditionalWait => ApplicationManager.ServiceProvider.GetRequiredService<ConditionalWait>();
+        protected override ConditionalWait ConditionalWait => AqualityServices.ServiceProvider.GetRequiredService<ConditionalWait>();
 
-        protected override IElementFactory Factory => ApplicationManager.ServiceProvider.GetRequiredService<IElementFactory>();
+        protected override IElementFactory Factory => AqualityServices.ServiceProvider.GetRequiredService<IElementFactory>();
 
-        protected override IElementFinder Finder => ApplicationManager.ServiceProvider.GetRequiredService<IElementFinder>();
+        protected override IElementFinder Finder => AqualityServices.ServiceProvider.GetRequiredService<IElementFinder>();
 
-        protected override ILocalizedLogger LocalizedLogger => ApplicationManager.ServiceProvider.GetRequiredService<ILocalizedLogger>();
+        protected override ILocalizedLogger LocalizedLogger => AqualityServices.ServiceProvider.GetRequiredService<ILocalizedLogger>();
     }
 }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/FindElementsTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/FindElementsTests.cs
@@ -21,7 +21,7 @@ public class FindElementsTests : TestWithBrowser
         public new void SetUp()
         {
             elementFactory = ServiceProvider.GetRequiredService<IElementFactory>();
-            ApplicationManager.Application.Driver.Navigate().GoToUrl(HoversURL);
+            AqualityServices.Application.Driver.Navigate().GoToUrl(HoversURL);
             var example = new Label(ContentLoc, "Example", ElementState.Displayed);
             example.Click();
         }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/TestWithBrowser.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/TestWithBrowser.cs
@@ -15,16 +15,16 @@ public void SetUp()
         {
             var services = new ServiceCollection();
 
-            new Startup().ConfigureServices(services, serviceCollection => ApplicationManager.Application);
+            new Startup().ConfigureServices(services, serviceCollection => AqualityServices.Application);
             ServiceProvider = services.BuildServiceProvider();
         }
 
         [TearDown]
         public void CleanUp()
         {
-            if (ApplicationManager.IsApplicationStarted())
+            if (AqualityServices.IsApplicationStarted)
             {
-                ApplicationManager.Application.Quit();
+                AqualityServices.Application.Quit();
             }
         }
     }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/AqualityServices.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/AqualityServices.cs
@@ -9,11 +9,13 @@
 
 namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp
 {
-    public class ApplicationManager : ApplicationManager<WindowsApplication>
+    public class AqualityServices : AqualityServices<WindowsApplication>
     {
         private const string SupportedApplication = "./Resources/WindowsApp/Day Maxi Calc.exe";
         private const string DefaultDriverServer = "http://127.0.0.1:4723/";
-        
+
+        public new static bool IsApplicationStarted => IsApplicationStarted();
+
         public static WindowsApplication Application => GetApplication(service => StartApplication(service));
 
         public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application);
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/CalculatorTest.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/CalculatorTest.cs
@@ -8,11 +8,11 @@ public class CalculatorTest : TestWithApplication
         [Test]
         public void Should_WorkWithCalculator()
         {
-            ApplicationManager.Application.Driver.FindElement(CalculatorWindow.OneButton).Click();
-            ApplicationManager.Application.Driver.FindElement(CalculatorWindow.PlusButton).Click();
-            ApplicationManager.Application.Driver.FindElement(CalculatorWindow.TwoButton).Click();
-            ApplicationManager.Application.Driver.FindElement(CalculatorWindow.EqualsButton).Click();
-            var result = ApplicationManager.Application.Driver.FindElement(CalculatorWindow.ResultsLabel).Text;
+            AqualityServices.Application.Driver.FindElement(CalculatorWindow.OneButton).Click();
+            AqualityServices.Application.Driver.FindElement(CalculatorWindow.PlusButton).Click();
+            AqualityServices.Application.Driver.FindElement(CalculatorWindow.TwoButton).Click();
+            AqualityServices.Application.Driver.FindElement(CalculatorWindow.EqualsButton).Click();
+            var result = AqualityServices.Application.Driver.FindElement(CalculatorWindow.ResultsLabel).Text;
             StringAssert.Contains("3", result);
         }
     }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ConditionalWaitTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ConditionalWaitTests.cs
@@ -15,7 +15,7 @@ public class ConditionalWaitTests : TestWithApplication
         [Test]
         public void Should_BePossibleTo_UseConditionalWait_WithDriver()
         {
-            Assert.DoesNotThrow(() => ApplicationManager.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>
+            Assert.DoesNotThrow(() => AqualityServices.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>
             {
                 return driver.FindElements(By.XPath("//*")).Count > 0;
             }));
@@ -24,10 +24,10 @@ public void Should_BePossibleTo_UseConditionalWait_WithDriver()
         [Test]
         public void Should_BePossibleTo_UseConditionalWait_WithElementFinder()
         {
-            bool elementFinderCondition() => ApplicationManager.ServiceProvider.GetRequiredService<IElementFinder>()
+            bool elementFinderCondition() => AqualityServices.ServiceProvider.GetRequiredService<IElementFinder>()
                 .FindElement(CalculatorWindow.ResultsLabel, timeout: LittleTimeout).Text.Contains("3");
             Assert.IsFalse(elementFinderCondition());
-            Assert.DoesNotThrow(() => ApplicationManager.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>
+            Assert.DoesNotThrow(() => AqualityServices.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>
             {
                 driver.FindElement(CalculatorWindow.TwoButton).Click();
                 driver.FindElement(CalculatorWindow.PlusButton).Click();
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ElementFactoryTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ElementFactoryTests.cs
@@ -10,7 +10,7 @@ namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp
 {
     public class ElementFactoryTests : TestWithApplication
     {
-        private IElementFactory Factory => ApplicationManager.ServiceProvider.GetRequiredService<IElementFactory>();
+        private IElementFactory Factory => AqualityServices.ServiceProvider.GetRequiredService<IElementFactory>();
 
         private IElement NumberPad => Factory.GetButton(CalculatorWindow.WindowLocator, "Number pad");
 
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/Elements/WindowElement.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/Elements/WindowElement.cs
@@ -15,16 +15,16 @@ protected WindowElement(By locator, string name) : base(locator, name, ElementSt
         {
         }
 
-        protected override ElementActionRetrier ActionRetrier => ApplicationManager.ServiceProvider.GetRequiredService<ElementActionRetrier>();
+        protected override ElementActionRetrier ActionRetrier => AqualityServices.ServiceProvider.GetRequiredService<ElementActionRetrier>();
 
-        protected override IApplication Application => ApplicationManager.Application;
+        protected override IApplication Application => AqualityServices.Application;
 
-        protected override ConditionalWait ConditionalWait => ApplicationManager.ServiceProvider.GetRequiredService<ConditionalWait>();
+        protected override ConditionalWait ConditionalWait => AqualityServices.ServiceProvider.GetRequiredService<ConditionalWait>();
 
-        protected override IElementFactory Factory => ApplicationManager.ServiceProvider.GetRequiredService<IElementFactory>();
+        protected override IElementFactory Factory => AqualityServices.ServiceProvider.GetRequiredService<IElementFactory>();
 
-        protected override IElementFinder Finder => ApplicationManager.ServiceProvider.GetRequiredService<IElementFinder>();
+        protected override IElementFinder Finder => AqualityServices.ServiceProvider.GetRequiredService<IElementFinder>();
 
-        protected override ILocalizedLogger LocalizedLogger => ApplicationManager.ServiceProvider.GetRequiredService<ILocalizedLogger>();
+        protected override ILocalizedLogger LocalizedLogger => AqualityServices.ServiceProvider.GetRequiredService<ILocalizedLogger>();
     }
 }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/TestWithApplication.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/TestWithApplication.cs
@@ -8,9 +8,9 @@ public class TestWithApplication
         [TearDown]
         public void CleanUp()
         {
-            if (ApplicationManager.IsApplicationStarted())
+            if (AqualityServices.IsApplicationStarted)
             {
-                ApplicationManager.Application.Driver.Quit();
+                AqualityServices.Application.Driver.Quit();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,17 +4,17 @@`
`4`	`4`
`5`	`5`	`namespace Aquality.Selenium.Core.Applications`
`6`	`6`	`{`
`7`		`- public abstract class ApplicationManager<TApplication>`
	`7`	`+ public abstract class AqualityServices<TApplication>`
`8`	`8`	`where TApplication : class, IApplication`
`9`	`9`	`{`
`10`	`10`	`private static readonly ThreadLocal<TApplication> AppContainer = new ThreadLocal<TApplication>();`
`11`	`11`	`private static readonly ThreadLocal<IServiceProvider> ServiceProviderContainer = new ThreadLocal<IServiceProvider>();`
`12`	`12`
`13`		`- protected ApplicationManager()`
	`13`	`+ protected AqualityServices()`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static bool IsApplicationStarted()`
	`17`	`+ protected static bool IsApplicationStarted()`
`18`	`18`	`{`
`19`	`19`	`return AppContainer.IsValueCreated && AppContainer.Value.Driver.SessionId != null;`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Aquality.Selenium.Core.Tests.Applications`
`11`	`11`	`{`
`12`		`- public class ApplicationManagerTests`
	`12`	`+ public class AqualityServicesTests`
`13`	`13`	`{`
`14`	`14`	`private const string SpecialSettingsFile = "special";`
`15`	`15`	`private const string SpecialLanguageValue = "special";`
`@@ -19,31 +19,31 @@ public class ApplicationManagerTests`
`19`	`19`	`[Test]`
`20`	`20`	`public void Should_BePossibleTo_RegisterCustomServices()`
`21`	`21`	`{`
`22`		`- Assert.IsInstanceOf<TestTimeoutConfiguration>(TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>());`
	`22`	`+ Assert.IsInstanceOf<TestTimeoutConfiguration>(TestAqualityServices.ServiceProvider.GetService<ITimeoutConfiguration>());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`[Test]`
`26`	`26`	`public void Should_BePossibleTo_GetCustomValues()`
`27`	`27`	`{`
`28`		`- var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>() as TestTimeoutConfiguration;`
	`28`	`+ var timeoutConfiguration = TestAqualityServices.ServiceProvider.GetService<ITimeoutConfiguration>() as TestTimeoutConfiguration;`
`29`	`29`	`Assert.AreEqual(SpecialTimeoutValue, timeoutConfiguration.CustomTimeout);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[Test]`
`33`	`33`	`public void Should_BePossibleTo_GetCustomLoggerValues()`
`34`	`34`	`{`
`35`		`- TestApplicationManager.SetStartup(new CustomStartup());`
`36`		`- var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>() as CustomLoggerConfiguration;`
	`35`	`+ TestAqualityServices.SetStartup(new CustomStartup());`
	`36`	`+ var timeoutConfiguration = TestAqualityServices.ServiceProvider.GetService<ILoggerConfiguration>() as CustomLoggerConfiguration;`
`37`	`37`	`Assert.AreEqual(SpecialLogger, timeoutConfiguration.CustomLogger);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Test]`
`41`	`41`	`public void Should_BePossibleTo_RegisterCustomServices_WithCustomSettingsFile()`
`42`	`42`	`{`
`43`		`- Assert.AreEqual(SpecialLanguageValue, TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>().Language);`
	`43`	`+ Assert.AreEqual(SpecialLanguageValue, TestAqualityServices.ServiceProvider.GetService<ILoggerConfiguration>().Language);`
`44`	`44`	`}`
`45`	`45`
`46`		`- private class TestApplicationManager : ApplicationManager<IApplication>`
	`46`	`+ private class TestAqualityServices : AqualityServices<IApplication>`
`47`	`47`	`{`
`48`	`48`	`private static ThreadLocal<TestStartup> startup = new ThreadLocal<TestStartup>();`
`49`	`49`
`@@ -56,7 +56,7 @@ public static void SetStartup(Startup startup)`
`56`	`56`	`{`
`57`	`57`	`if (startup != null)`
`58`	`58`	`{`
`59`		`- TestApplicationManager.startup.Value = (TestStartup)startup;`
	`59`	`+ TestAqualityServices.startup.Value = (TestStartup)startup;`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class ApplicationNotStartedTests : TestWithBrowser`
`30`	`30`	`public void Should_NotStartApplication_ForServiceResolving(Type type)`
`31`	`31`	`{`
`32`	`32`	`Assert.IsNotNull(ServiceProvider.GetRequiredService(type));`
`33`		`- Assert.IsFalse(ApplicationManager.IsApplicationStarted());`
	`33`	`+ Assert.IsFalse(AqualityServices.IsApplicationStarted);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@`
`8`	`8`
`9`	`9`	`namespace Aquality.Selenium.Core.Tests.Applications.Browser`
`10`	`10`	`{`
`11`		`- public class ApplicationManager : ApplicationManager<ChromeApplication>`
	`11`	`+ public class AqualityServices : AqualityServices<ChromeApplication>`
`12`	`12`	`{`
`13`	`13`	`private static readonly object downloadDriverLock = new object();`
`14`	`14`
	`15`	`+ public new static bool IsApplicationStarted => IsApplicationStarted();`
	`16`	`+`
`15`	`17`	`public static ChromeApplication Application => GetApplication(services => StartChrome(services));`
`16`	`18`
`17`	`19`	`public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application);`
Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,16 @@ protected WebElement(By locator, string name, ElementState state) : base(locator`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`- protected override ElementActionRetrier ActionRetrier => ApplicationManager.ServiceProvider.GetRequiredService<ElementActionRetrier>();`
	`18`	`+ protected override ElementActionRetrier ActionRetrier => AqualityServices.ServiceProvider.GetRequiredService<ElementActionRetrier>();`
`19`	`19`
`20`		`- protected override IApplication Application => ApplicationManager.Application;`
	`20`	`+ protected override IApplication Application => AqualityServices.Application;`
`21`	`21`
`22`		`- protected override ConditionalWait ConditionalWait => ApplicationManager.ServiceProvider.GetRequiredService<ConditionalWait>();`
	`22`	`+ protected override ConditionalWait ConditionalWait => AqualityServices.ServiceProvider.GetRequiredService<ConditionalWait>();`
`23`	`23`
`24`		`- protected override IElementFactory Factory => ApplicationManager.ServiceProvider.GetRequiredService<IElementFactory>();`
	`24`	`+ protected override IElementFactory Factory => AqualityServices.ServiceProvider.GetRequiredService<IElementFactory>();`
`25`	`25`
`26`		`- protected override IElementFinder Finder => ApplicationManager.ServiceProvider.GetRequiredService<IElementFinder>();`
	`26`	`+ protected override IElementFinder Finder => AqualityServices.ServiceProvider.GetRequiredService<IElementFinder>();`
`27`	`27`
`28`		`- protected override ILocalizedLogger LocalizedLogger => ApplicationManager.ServiceProvider.GetRequiredService<ILocalizedLogger>();`
	`28`	`+ protected override ILocalizedLogger LocalizedLogger => AqualityServices.ServiceProvider.GetRequiredService<ILocalizedLogger>();`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class FindElementsTests : TestWithBrowser`
`21`	`21`	`public new void SetUp()`
`22`	`22`	`{`
`23`	`23`	`elementFactory = ServiceProvider.GetRequiredService<IElementFactory>();`
`24`		`- ApplicationManager.Application.Driver.Navigate().GoToUrl(HoversURL);`
	`24`	`+ AqualityServices.Application.Driver.Navigate().GoToUrl(HoversURL);`
`25`	`25`	`var example = new Label(ContentLoc, "Example", ElementState.Displayed);`
`26`	`26`	`example.Click();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,16 @@ public void SetUp()`
`15`	`15`	`{`
`16`	`16`	`var services = new ServiceCollection();`
`17`	`17`
`18`		`- new Startup().ConfigureServices(services, serviceCollection => ApplicationManager.Application);`
	`18`	`+ new Startup().ConfigureServices(services, serviceCollection => AqualityServices.Application);`
`19`	`19`	`ServiceProvider = services.BuildServiceProvider();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[TearDown]`
`23`	`23`	`public void CleanUp()`
`24`	`24`	`{`
`25`		`- if (ApplicationManager.IsApplicationStarted())`
	`25`	`+ if (AqualityServices.IsApplicationStarted)`
`26`	`26`	`{`
`27`		`- ApplicationManager.Application.Quit();`
	`27`	`+ AqualityServices.Application.Quit();`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,13 @@`
`9`	`9`
`10`	`10`	`namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp`
`11`	`11`	`{`
`12`		`- public class ApplicationManager : ApplicationManager<WindowsApplication>`
	`12`	`+ public class AqualityServices : AqualityServices<WindowsApplication>`
`13`	`13`	`{`
`14`	`14`	`private const string SupportedApplication = "./Resources/WindowsApp/Day Maxi Calc.exe";`
`15`	`15`	`private const string DefaultDriverServer = "http://127.0.0.1:4723/";`
`16`		`-`
	`16`	`+`
	`17`	`+ public new static bool IsApplicationStarted => IsApplicationStarted();`
	`18`	`+`
`17`	`19`	`public static WindowsApplication Application => GetApplication(service => StartApplication(service));`
`18`	`20`
`19`	`21`	`public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application);`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ public class CalculatorTest : TestWithApplication`
`8`	`8`	`[Test]`
`9`	`9`	`public void Should_WorkWithCalculator()`
`10`	`10`	`{`
`11`		`- ApplicationManager.Application.Driver.FindElement(CalculatorWindow.OneButton).Click();`
`12`		`- ApplicationManager.Application.Driver.FindElement(CalculatorWindow.PlusButton).Click();`
`13`		`- ApplicationManager.Application.Driver.FindElement(CalculatorWindow.TwoButton).Click();`
`14`		`- ApplicationManager.Application.Driver.FindElement(CalculatorWindow.EqualsButton).Click();`
`15`		`- var result = ApplicationManager.Application.Driver.FindElement(CalculatorWindow.ResultsLabel).Text;`
	`11`	`+ AqualityServices.Application.Driver.FindElement(CalculatorWindow.OneButton).Click();`
	`12`	`+ AqualityServices.Application.Driver.FindElement(CalculatorWindow.PlusButton).Click();`
	`13`	`+ AqualityServices.Application.Driver.FindElement(CalculatorWindow.TwoButton).Click();`
	`14`	`+ AqualityServices.Application.Driver.FindElement(CalculatorWindow.EqualsButton).Click();`
	`15`	`+ var result = AqualityServices.Application.Driver.FindElement(CalculatorWindow.ResultsLabel).Text;`
`16`	`16`	`StringAssert.Contains("3", result);`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class ConditionalWaitTests : TestWithApplication`
`15`	`15`	`[Test]`
`16`	`16`	`public void Should_BePossibleTo_UseConditionalWait_WithDriver()`
`17`	`17`	`{`
`18`		`- Assert.DoesNotThrow(() => ApplicationManager.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>`
	`18`	`+ Assert.DoesNotThrow(() => AqualityServices.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>`
`19`	`19`	`{`
`20`	`20`	`return driver.FindElements(By.XPath("//*")).Count > 0;`
`21`	`21`	`}));`
`@@ -24,10 +24,10 @@ public void Should_BePossibleTo_UseConditionalWait_WithDriver()`
`24`	`24`	`[Test]`
`25`	`25`	`public void Should_BePossibleTo_UseConditionalWait_WithElementFinder()`
`26`	`26`	`{`
`27`		`- bool elementFinderCondition() => ApplicationManager.ServiceProvider.GetRequiredService<IElementFinder>()`
	`27`	`+ bool elementFinderCondition() => AqualityServices.ServiceProvider.GetRequiredService<IElementFinder>()`
`28`	`28`	`.FindElement(CalculatorWindow.ResultsLabel, timeout: LittleTimeout).Text.Contains("3");`
`29`	`29`	`Assert.IsFalse(elementFinderCondition());`
`30`		`- Assert.DoesNotThrow(() => ApplicationManager.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>`
	`30`	`+ Assert.DoesNotThrow(() => AqualityServices.ServiceProvider.GetService<ConditionalWait>().WaitFor(driver =>`
`31`	`31`	`{`
`32`	`32`	`driver.FindElement(CalculatorWindow.TwoButton).Click();`
`33`	`33`	`driver.FindElement(CalculatorWindow.PlusButton).Click();`