Update version of Selenium.Core (#153)

paveliam · web-flow · commit 81fe09f2ad17 · 2019-12-05T18:06:08.000+03:00
* Update version of Selenium.Core

* Update settings.json

* Update settings.local.json
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aquality.Selenium.Core" Version="0.2.0" />
+    <PackageReference Include="Aquality.Selenium.Core" Version="0.2.2" />
     <PackageReference Include="NLog" Version="4.6.6" />
     <PackageReference Include="Selenium.Support" Version="3.141.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs
@@ -29,8 +29,8 @@ public class Browser : IApplication
         public Browser(RemoteWebDriver webDriver, IServiceProvider serviceProvider)
         {
             Driver = webDriver;
-            Logger = serviceProvider.GetRequiredService<LocalizationLogger>();
-            LocalizationManager = serviceProvider.GetRequiredService<LocalizationManager>();
+            Logger = serviceProvider.GetRequiredService<ILocalizedLogger>();
+            LocalizationManager = serviceProvider.GetRequiredService<ILocalizationManager>();
             browserProfile = serviceProvider.GetRequiredService<IBrowserProfile>();
             conditionalWait = serviceProvider.GetRequiredService<ConditionalWait>();
             var timeoutConfiguration = serviceProvider.GetRequiredService<ITimeoutConfiguration>();
@@ -39,9 +39,9 @@ public Browser(RemoteWebDriver webDriver, IServiceProvider serviceProvider)
             SetScriptTimeout(timeoutConfiguration.Script);
         }
 
-        private LocalizationLogger Logger { get; }
+        private ILocalizedLogger Logger { get; }
 
-        private LocalizationManager LocalizationManager { get; }
+        private ILocalizationManager LocalizationManager { get; }
 
         /// <summary>
         /// Gets instance of Selenium WebDriver.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserManager.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserManager.cs
@@ -17,7 +17,7 @@ namespace Aquality.Selenium.Browsers
     /// <summary>
     /// Controls browser instance creation.
     /// </summary>
-    public class BrowserManager : ApplicationManager<BrowserManager, Browser>
+    public class BrowserManager : ApplicationManager<Browser>
     {
         private static readonly ThreadLocal<IBrowserFactory> BrowserFactoryContainer = new ThreadLocal<IBrowserFactory>();
 
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserNavigation.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserNavigation.cs
@@ -17,7 +17,7 @@ internal BrowserNavigation(RemoteWebDriver driver)
             this.driver = driver;
         }
 
-        private LocalizationLogger Logger => BrowserManager.GetRequiredService<LocalizationLogger>();
+        private ILocalizedLogger Logger => BrowserManager.GetRequiredService<ILocalizedLogger>();
 
         /// <summary>
         /// Navigates back.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/CheckBoxJsActions.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/CheckBoxJsActions.cs
@@ -10,7 +10,7 @@ namespace Aquality.Selenium.Elements.Actions
     /// </summary>
     public class CheckBoxJsActions : JsActions
     {
-        public CheckBoxJsActions(IElement element, string elementType, LocalizationLogger logger, IBrowserProfile browserProfile) 
+        public CheckBoxJsActions(IElement element, string elementType, ILocalizedLogger logger, IBrowserProfile browserProfile) 
             : base(element, elementType, logger, browserProfile)
         {
         }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/ComboBoxJsActions.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/ComboBoxJsActions.cs
@@ -12,7 +12,7 @@ namespace Aquality.Selenium.Elements.Actions
     /// </summary>
     public class ComboBoxJsActions : JsActions
     {
-        public ComboBoxJsActions(IElement element, string elementType, LocalizationLogger logger, IBrowserProfile browserProfile) 
+        public ComboBoxJsActions(IElement element, string elementType, ILocalizedLogger logger, IBrowserProfile browserProfile) 
             : base(element, elementType, logger, browserProfile)
         {
         }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/JsActions.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/JsActions.cs
@@ -19,7 +19,7 @@ public class JsActions
         private readonly string elementType;
         private readonly IBrowserProfile browserProfile;
 
-        public JsActions(IElement element, string elementType, LocalizationLogger logger, IBrowserProfile browserProfile)
+        public JsActions(IElement element, string elementType, ILocalizedLogger logger, IBrowserProfile browserProfile)
         {
             this.element = element;
             this.elementType = elementType;
@@ -29,7 +29,7 @@ public JsActions(IElement element, string elementType, LocalizationLogger logger
 
         private Browser Browser => BrowserManager.Browser;
 
-        protected LocalizationLogger Logger { get; }
+        protected ILocalizedLogger Logger { get; }
 
         /// <summary>
         /// Perfroms click on element and waits for page is loaded.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/MouseActions.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/MouseActions.cs
@@ -17,10 +17,10 @@ public class MouseActions
     {
         private readonly IElement element;
         private readonly string elementType;
-        private readonly LocalizationLogger logger;
+        private readonly ILocalizedLogger logger;
         private readonly ElementActionRetrier elementActionsRetrier;
 
-        public MouseActions(IElement element, string elementType, LocalizationLogger logger, ElementActionRetrier elementActionsRetrier)
+        public MouseActions(IElement element, string elementType, ILocalizedLogger logger, ElementActionRetrier elementActionsRetrier)
         {
             this.element = element;
             this.elementType = elementType;
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/CheckBox.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/CheckBox.cs
@@ -25,7 +25,7 @@ public bool IsChecked
             }
         }
 
-        public new CheckBoxJsActions JsActions => new CheckBoxJsActions(this, ElementType, LocalizationLogger, BrowserProfile);
+        public new CheckBoxJsActions JsActions => new CheckBoxJsActions(this, ElementType, LocalizedLogger, BrowserProfile);
         
         public void Check()
         {
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/ComboBox.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/ComboBox.cs
@@ -41,7 +41,7 @@ public IList<string> Values
             }
         }
 
-        public new ComboBoxJsActions JsActions => new ComboBoxJsActions(this, ElementType, LocalizationLogger, BrowserProfile);
+        public new ComboBoxJsActions JsActions => new ComboBoxJsActions(this, ElementType, LocalizedLogger, BrowserProfile);
 
         public void SelectByContainingText(string text)
         {
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Element.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Element.cs
@@ -28,9 +28,9 @@ protected Element(By locator, string name, ElementState state) : base(locator, n
 
         protected IBrowserProfile BrowserProfile => BrowserManager.GetRequiredService<IBrowserProfile>();
 
-        public JsActions JsActions => new JsActions(this, ElementType, LocalizationLogger, BrowserProfile);
+        public JsActions JsActions => new JsActions(this, ElementType, LocalizedLogger, BrowserProfile);
 
-        public MouseActions MouseActions => new MouseActions(this, ElementType, LocalizationLogger, ActionRetrier);
+        public MouseActions MouseActions => new MouseActions(this, ElementType, LocalizedLogger, ActionRetrier);
 
         private Browser Browser => (Browser)Application;
 
@@ -44,9 +44,9 @@ protected Element(By locator, string name, ElementState state) : base(locator, n
 
         protected override CoreElementFinder Finder => BrowserManager.GetRequiredService<CoreElementFinder>();
 
-        protected override LocalizationLogger LocalizationLogger => BrowserManager.GetRequiredService<LocalizationLogger>();
+        protected override ILocalizedLogger LocalizedLogger => BrowserManager.GetRequiredService<ILocalizedLogger>();
 
-        protected LocalizationManager LocalizationManager => BrowserManager.GetRequiredService<LocalizationManager>();
+        protected ILocalizationManager LocalizationManager => BrowserManager.GetRequiredService<ILocalizationManager>();
 
         protected override ConditionalWait ConditionalWait => BrowserManager.GetRequiredService<ConditionalWait>();
 
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementFactory.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementFactory.cs
@@ -17,7 +17,7 @@ namespace Aquality.Selenium.Elements
     /// </summary>
     public class ElementFactory : CoreFactory, IElementFactory
     {
-        public ElementFactory(ConditionalWait conditionalWait, IElementFinder elementFinder, LocalizationManager localizationManager) 
+        public ElementFactory(ConditionalWait conditionalWait, IElementFinder elementFinder, ILocalizationManager localizationManager) 
             : base(conditionalWait, elementFinder, localizationManager)
         {
         }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Forms/Form.cs b/Aquality.Selenium/src/Aquality.Selenium/Forms/Form.cs
@@ -36,7 +36,7 @@ protected Form(By locator, string name)
         /// Instance of logger <see cref="Logging.Logger">
         /// </summary>
         /// <value>Logger instance.</value>
-        protected LocalizationLogger Logger => BrowserManager.GetRequiredService<LocalizationLogger>();
+        protected ILocalizedLogger Logger => BrowserManager.GetRequiredService<ILocalizedLogger>();
 
         /// <summary>
         /// Element factory <see cref="IElementFactory">
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json
@@ -73,4 +73,4 @@
   "logger": {
     "language": "en"
   }
-}
+}
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json
@@ -77,4 +77,4 @@
   "logger": {
     "language": "en"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Aquality.Selenium.Browsers`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Controls browser instance creation.`
`19`	`19`	`/// </summary>`
`20`		`- public class BrowserManager : ApplicationManager<BrowserManager, Browser>`
	`20`	`+ public class BrowserManager : ApplicationManager<Browser>`
`21`	`21`	`{`
`22`	`22`	`private static readonly ThreadLocal<IBrowserFactory> BrowserFactoryContainer = new ThreadLocal<IBrowserFactory>();`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal BrowserNavigation(RemoteWebDriver driver)`
`17`	`17`	`this.driver = driver;`
`18`	`18`	`}`
`19`	`19`
`20`		`- private LocalizationLogger Logger => BrowserManager.GetRequiredService<LocalizationLogger>();`
	`20`	`+ private ILocalizedLogger Logger => BrowserManager.GetRequiredService<ILocalizedLogger>();`
`21`	`21`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// Navigates back.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Aquality.Selenium.Elements.Actions`
`10`	`10`	`/// </summary>`
`11`	`11`	`public class CheckBoxJsActions : JsActions`
`12`	`12`	`{`
`13`		`- public CheckBoxJsActions(IElement element, string elementType, LocalizationLogger logger, IBrowserProfile browserProfile)`
	`13`	`+ public CheckBoxJsActions(IElement element, string elementType, ILocalizedLogger logger, IBrowserProfile browserProfile)`
`14`	`14`	`: base(element, elementType, logger, browserProfile)`
`15`	`15`	`{`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Aquality.Selenium.Elements.Actions`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class ComboBoxJsActions : JsActions`
`14`	`14`	`{`
`15`		`- public ComboBoxJsActions(IElement element, string elementType, LocalizationLogger logger, IBrowserProfile browserProfile)`
	`15`	`+ public ComboBoxJsActions(IElement element, string elementType, ILocalizedLogger logger, IBrowserProfile browserProfile)`
`16`	`16`	`: base(element, elementType, logger, browserProfile)`
`17`	`17`	`{`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public class MouseActions`
`17`	`17`	`{`
`18`	`18`	`private readonly IElement element;`
`19`	`19`	`private readonly string elementType;`
`20`		`- private readonly LocalizationLogger logger;`
	`20`	`+ private readonly ILocalizedLogger logger;`
`21`	`21`	`private readonly ElementActionRetrier elementActionsRetrier;`
`22`	`22`
`23`		`- public MouseActions(IElement element, string elementType, LocalizationLogger logger, ElementActionRetrier elementActionsRetrier)`
	`23`	`+ public MouseActions(IElement element, string elementType, ILocalizedLogger logger, ElementActionRetrier elementActionsRetrier)`
`24`	`24`	`{`
`25`	`25`	`this.element = element;`
`26`	`26`	`this.elementType = elementType;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public bool IsChecked`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- public new CheckBoxJsActions JsActions => new CheckBoxJsActions(this, ElementType, LocalizationLogger, BrowserProfile);`
	`28`	`+ public new CheckBoxJsActions JsActions => new CheckBoxJsActions(this, ElementType, LocalizedLogger, BrowserProfile);`
`29`	`29`
`30`	`30`	`public void Check()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public IList<string> Values`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- public new ComboBoxJsActions JsActions => new ComboBoxJsActions(this, ElementType, LocalizationLogger, BrowserProfile);`
	`44`	`+ public new ComboBoxJsActions JsActions => new ComboBoxJsActions(this, ElementType, LocalizedLogger, BrowserProfile);`
`45`	`45`
`46`	`46`	`public void SelectByContainingText(string text)`
`47`	`47`	`{`