#37 renamed ApplicationManager to AqualityServices (#39)

+semver: minor * #37 renamed ApplicationManager to AqualityServices * made IsApplicationStarted protected * #37 fixed build * fix build
aquality-automation · Dec 12, 2019 · 8c2ce82 · 8c2ce82
1 parent 0d2ee6c
commit 8c2ce82
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 42 deletions.
diff --git a/...m.Core/Applications/ApplicationManager.cs → ...ium.Core/Applications/AqualityServices.cs b/...m.Core/Applications/ApplicationManager.cs → ...ium.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/...s/Applications/ApplicationManagerTests.cs → ...sts/Applications/AqualityServicesTests.cs b/...s/Applications/ApplicationManagerTests.cs → ...sts/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/...ore/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ApplicationNotStartedTests.cs b/...ore/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/...pplications/Browser/ApplicationManager.cs → .../Applications/Browser/AqualityServices.cs b/...pplications/Browser/ApplicationManager.cs → .../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/...enium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/Elements/WebElement.cs b/...enium.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/...elenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/FindElementsTests.cs b/...elenium.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/....Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/TestWithBrowser.cs b/....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/...ications/WindowsApp/ApplicationManager.cs → ...plications/WindowsApp/AqualityServices.cs b/...ications/WindowsApp/ApplicationManager.cs → ...plications/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/...elenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/CalculatorTest.cs b/...elenium.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/...m.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ConditionalWaitTests.cs b/...m.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/...um.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/ElementFactoryTests.cs b/...um.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/...Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/Elements/WindowElement.cs b/...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/...um.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/TestWithApplication.cs b/...um.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();
             }
         }
     }