Migration to selenium 4 (#93)

dzed-by · mialeska · web-flow · commit c38dfe2f9cc9 · 2021-12-29T15:28:47.000+01:00
* Updated dependencies, test updated

* azure-pipelines.yml update

Co-authored-by: Alaksiej Mialeška &lt;mialeska@users.noreply.github.com&gt;
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/IApplication.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/IApplication.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using OpenQA.Selenium.Remote;
+using OpenQA.Selenium;
 
 namespace Aquality.Selenium.Core.Applications
 {
@@ -11,7 +11,7 @@ public interface IApplication
         /// <summary>
         /// Current instance of driver
         /// </summary>
-        RemoteWebDriver Driver { get; }
+        WebDriver Driver { get; }
 
         /// <summary>
         /// Defines if the application is already started or not.
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Aquality.Selenium.Core.csproj b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Aquality.Selenium.Core.csproj
@@ -43,11 +43,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DotNetSeleniumExtras.PageObjects" Version="3.11.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
     <PackageReference Include="NLog" Version="4.7.10" />
-    <PackageReference Include="Selenium.Support" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
+    <PackageReference Include="Selenium.Support" Version="4.1.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.1.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />    
   </ItemGroup>
 </Project>
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Element.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Element.cs
@@ -9,7 +9,6 @@
 using Aquality.Selenium.Core.Visualization;
 using Aquality.Selenium.Core.Waitings;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Remote;
 
 namespace Aquality.Selenium.Core.Elements
 {
@@ -118,13 +117,13 @@ public string GetAttribute(string attr)
             return value;
         }
 
-        public virtual RemoteWebElement GetElement(TimeSpan? timeout = null)
+        public virtual WebElement GetElement(TimeSpan? timeout = null)
         {
             try
             {
                 return CacheConfiguration.IsEnabled
                     ? Cache.GetElement(timeout)
-                    : (RemoteWebElement) Finder.FindElement(Locator, elementState, timeout, Name);
+                    : (WebElement) Finder.FindElement(Locator, elementState, timeout, Name);
             }
             catch (NoSuchElementException ex) when (LoggerConfiguration.LogPageSource)
             {
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementCacheHandler.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementCacheHandler.cs
@@ -12,7 +12,7 @@ public class ElementCacheHandler : IElementCacheHandler
         private readonly ElementState state;
         private readonly IElementFinder elementFinder;
 
-        private RemoteWebElement remoteElement;
+        private WebElement element;
 
         public ElementCacheHandler(By locator, string name, ElementState state, IElementFinder finder)
         {
@@ -22,17 +22,17 @@ public ElementCacheHandler(By locator, string name, ElementState state, IElement
             elementFinder = finder;
         }
 
-        public bool IsStale => remoteElement != null && IsRefreshNeeded();
+        public bool IsStale => element != null && IsRefreshNeeded();
 
         public bool IsRefreshNeeded(ElementState? customState = null)
         {
-            if (remoteElement == null)
+            if (element == null)
             {
                 return true;
             }
             try
             {
-                var isDisplayed = remoteElement.Displayed;
+                var isDisplayed = element.Displayed;
                 // refresh is needed only if the property is not match to expected element state
                 return (customState ?? state) == ElementState.Displayed && !isDisplayed;
             }
@@ -43,15 +43,15 @@ public bool IsRefreshNeeded(ElementState? customState = null)
             }
         }
 
-        public RemoteWebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null)
+        public WebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null)
         {
 
             if (IsRefreshNeeded(customState))
             {
-                remoteElement = (RemoteWebElement)elementFinder.FindElement(locator, customState ?? state, timeout, name);
+                element = (WebElement)elementFinder.FindElement(locator, customState ?? state, timeout, name);
             }
 
-            return remoteElement;
+            return element;
         }
     }
 }
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementFactory.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementFactory.cs
@@ -6,7 +6,7 @@
 using Aquality.Selenium.Core.Localization;
 using Aquality.Selenium.Core.Waitings;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Support.PageObjects;
+using SeleniumExtras.PageObjects;
 
 namespace Aquality.Selenium.Core.Elements
 {
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Interfaces/IElement.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Interfaces/IElement.cs
@@ -1,6 +1,5 @@
 ﻿using Aquality.Selenium.Core.Visualization;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Remote;
 using System;
 
 namespace Aquality.Selenium.Core.Elements.Interfaces
@@ -37,9 +36,9 @@ public interface IElement : IParent
         /// Finds current element by specified <see cref="Locator"/>
         /// </summary>
         /// <param name="timeout">Timeout to find element. Default: <see cref="Configurations.ITimeoutConfiguration.Condition"/></param>
-        /// <returns>Instance of <see cref="RemoteWebElement"/> if found.</returns>
+        /// <returns>Instance of <see cref="WebElement"/> if found.</returns>
         /// <exception cref="NoSuchElementException">Thrown when no elements found.</exception>
-        RemoteWebElement GetElement(TimeSpan? timeout = null);
+        WebElement GetElement(TimeSpan? timeout = null);
                 
         /// <summary>
         /// Gets element text.
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Interfaces/IElementCacheHandler.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Interfaces/IElementCacheHandler.cs
@@ -1,4 +1,4 @@
-﻿using OpenQA.Selenium.Remote;
+﻿using OpenQA.Selenium;
 using System;
 
 namespace Aquality.Selenium.Core.Elements.Interfaces
@@ -26,6 +26,6 @@ public interface IElementCacheHandler
         /// <param name="timeout">Timeout used to retrive the element when <see cref="IsRefreshNeeded(ElementState?)"/> is true.</param>
         /// <param name="customState">Custom element's existance state used for search.</param>
         /// <returns>Cached element.</returns>
-        RemoteWebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null);
+        WebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null);
     }
-}
+}
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Visualization/DumpManager.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Visualization/DumpManager.cs
@@ -44,8 +44,7 @@ public virtual float Compare(string dumpName = null)
             {
                 throw new InvalidOperationException($"Dump directory [{directory.FullName}] does not contain any [*{ImageFormat}] files.");
             }
-            var existingElements = ElementsForVisualization.Where(element => element.Value.State.IsExist)
-                .ToDictionary(el => el.Key, el => el.Value);
+            var existingElements = FilterElementsForVisualization().ToDictionary(el => el.Key, el => el.Value);
             var countOfUnproceededElements = existingElements.Count;
             var countOfProceededElements = 0;
             var comparisonResult = 0f;
@@ -89,7 +88,7 @@ public virtual void Save(string dumpName = null)
         {
             var directory = CleanUpAndGetDumpDirectory(dumpName);
             LocalizedLogger.Info("loc.form.dump.save", directory.Name);
-            ElementsForVisualization.Where(element => element.Value.State.IsExist).ToList()
+            FilterElementsForVisualization()
                 .ForEach(element =>
                 {
                     try
@@ -103,6 +102,11 @@ public virtual void Save(string dumpName = null)
                 });
         }
 
+        protected virtual List<KeyValuePair<string, T>> FilterElementsForVisualization()
+        {
+            return ElementsForVisualization.Where(element => element.Value.State.IsDisplayed).ToList();
+        }
+
         protected virtual DirectoryInfo CleanUpAndGetDumpDirectory(string dumpName = null)
         {
             var dirInfo = GetDumpDirectory(dumpName);
diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Visualization/VisualStateProvider.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Visualization/VisualStateProvider.cs
@@ -1,6 +1,6 @@
 ﻿using Aquality.Selenium.Core.Logging;
 using Aquality.Selenium.Core.Utilities;
-using OpenQA.Selenium.Remote;
+using OpenQA.Selenium;
 using System;
 using System.Drawing;
 using System.Globalization;
@@ -11,10 +11,10 @@ public class VisualStateProvider : IVisualStateProvider
     {
         private readonly IImageComparator imageComparator;
         private readonly IElementActionRetrier actionRetrier;
-        private readonly Func<RemoteWebElement> getElement;
+        private readonly Func<WebElement> getElement;
         private readonly LogVisualState logVisualState;
 
-        public VisualStateProvider(IImageComparator imageComparator, IElementActionRetrier actionRetrier, Func<RemoteWebElement> getElement, LogVisualState logVisualState)
+        public VisualStateProvider(IImageComparator imageComparator, IElementActionRetrier actionRetrier, Func<WebElement> getElement, LogVisualState logVisualState)
         {
             this.imageComparator = imageComparator;
             this.actionRetrier = actionRetrier;
@@ -27,9 +27,9 @@ public VisualStateProvider(IImageComparator imageComparator, IElementActionRetri
         public Point Location => GetLoggedValue(nameof(Location), element => element.Location);
 
         public Image Image 
-            => GetLoggedValue(nameof(Image), element => element.GetScreenshot().AsImage(), image => image.Size.ToString());
+            => GetLoggedValue(nameof(Image), element => element.GetScreenshot().AsImage(), image => image?.Size.ToString());
 
-        private T GetLoggedValue<T>(string name, Func<RemoteWebElement, T> getValue, Func<T, string> toString = null)
+        private T GetLoggedValue<T>(string name, Func<WebElement, T> getValue, Func<T, string> toString = null)
         {
             logVisualState($"loc.el.visual.get{name.ToLower()}");
             var value = actionRetrier.DoWithRetry(() => getValue(getElement()));
@@ -40,6 +40,8 @@ private T GetLoggedValue<T>(string name, Func<RemoteWebElement, T> getValue, Fun
         public float GetDifference(Image theOtherOne, float? threshold = null)
         {
             var currentImage = Image;
+            float value = 1;
+
             if (threshold == null)
             {
                 logVisualState("loc.el.visual.getdifference", theOtherOne.Size.ToString());
@@ -48,7 +50,11 @@ public float GetDifference(Image theOtherOne, float? threshold = null)
             {
                 logVisualState("loc.el.visual.getdifference.withthreshold", theOtherOne.Size.ToString(), threshold?.ToString("P", CultureInfo.InvariantCulture));
             }
-            var value = imageComparator.PercentageDifference(currentImage, theOtherOne, threshold);
+
+            if (currentImage != default)
+            {
+                value = imageComparator.PercentageDifference(currentImage, theOtherOne, threshold);
+            }
             logVisualState("loc.el.visual.difference.value", value.ToString("P", CultureInfo.InvariantCulture));
             return value;
         }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ChromeApplication.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/Browser/ChromeApplication.cs
@@ -1,7 +1,7 @@
 ﻿using Aquality.Selenium.Core.Applications;
 using Aquality.Selenium.Core.Configurations;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
-using OpenQA.Selenium.Remote;
 using System;
 
 namespace Aquality.Selenium.Core.Tests.Applications.Browser
@@ -17,7 +17,7 @@ public ChromeApplication(ITimeoutConfiguration timeoutConfiguration)
             Driver.Manage().Timeouts().ImplicitWait = implicitWait;
         }
 
-        public RemoteWebDriver Driver { get; }
+        public WebDriver Driver { get; }
 
         public bool IsStarted => Driver.SessionId != null;
 
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
@@ -31,9 +31,9 @@ private static WindowsApplication StartApplication(IServiceProvider services)
                 var driverService = AppiumLocalService.BuildDefaultService();
                 driverService.Start();
                 driverServer = driverService.ServiceUrl;
-                options.AddAdditionalCapability("platformVersion", "10");
-                options.AddAdditionalCapability("platformName", "Windows");
-                options.AddAdditionalCapability("deviceName", "WindowsPC");
+                options.PlatformVersion = "10";
+                options.PlatformName = "Windows";
+                options.DeviceName = "WindowsPC";
             }
             else
             {
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
@@ -34,7 +34,7 @@ bool elementFinderCondition() => AqualityServices.ServiceProvider.GetRequiredSer
                 driver.FindElement(CalculatorWindow.PlusButton).Click();
                 driver.FindElement(CalculatorWindow.OneButton).Click();
                 driver.FindElement(CalculatorWindow.EqualsButton).Click();
-                var first = driver.FindElement(By.TagName("Window")).Text;
+                var first = driver.FindElement(CalculatorWindow.WindowLocator).Text;
                 var pageSource = driver.PageSource;
                 return elementFinderCondition();
             }, LittleTimeout));
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/Locators/CalculatorWindow.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/Locators/CalculatorWindow.cs
@@ -4,23 +4,23 @@
 namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp.Locators
 {
     public static class CalculatorWindow
-    {
-        public static By WindowLocator => By.TagName("Window");
+    { 
+        public static By WindowLocator => MobileBy.ClassName("ThunderRT6FormDC");
 
-        public static By OneButton => By.Name("1");
+        public static By OneButton => MobileBy.Name("1");
 
-        public static By TwoButton => By.Name("2");
+        public static By TwoButton => MobileBy.Name("2");
 
-        public static By ThreeButton => By.Name("3");
+        public static By ThreeButton => MobileBy.Name("3");
 
-        public static By PlusButton => By.Name("+");
+        public static By PlusButton => MobileBy.Name("+");
 
-        public static By EqualsButton => By.Name("=");
+        public static By EqualsButton => MobileBy.Name("=");
 
         public static By ResultsLabel => MobileBy.AccessibilityId("48");
 
-        public static By EmptyButton => By.XPath("//*[@AutomationId='7']");
+        public static By EmptyButton => MobileBy.AccessibilityId("7");
 
-        public static By AbsentElement => By.Name("Absent element");
+        public static By AbsentElement => MobileBy.Name("Absent element");
     }
 }
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/WindowsApplication.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/WindowsApp/WindowsApplication.cs
@@ -1,30 +1,31 @@
 ﻿using System;
 using Aquality.Selenium.Core.Applications;
 using Aquality.Selenium.Core.Configurations;
+using OpenQA.Selenium;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Windows;
-using OpenQA.Selenium.Remote;
 
 namespace Aquality.Selenium.Core.Tests.Applications.WindowsApp
 {
     public class WindowsApplication : IApplication
     {
         private TimeSpan implicitWait;
-        private readonly Lazy<RemoteWebDriver> lazyDriver;
+        private readonly Lazy<WebDriver> lazyDriver;
 
         public WindowsApplication(string application, Uri driverServer, ITimeoutConfiguration timeoutConfiguration, AppiumOptions appiumOptions)
         {
             var options = appiumOptions ?? new AppiumOptions();
-            options.AddAdditionalCapability("app", application);
-            lazyDriver = new Lazy<RemoteWebDriver>(() =>
+            options.App = application;
+            options.AutomationName = "windows";
+            lazyDriver = new Lazy<WebDriver>(() =>
             {
-                var value = new WindowsDriver<WindowsElement>(driverServer, options, timeoutConfiguration.Command);
+                var value = new WindowsDriver(driverServer, options, timeoutConfiguration.Command);
                 value.Manage().Timeouts().ImplicitWait = timeoutConfiguration.Implicit;
                 return value;
             });
         }
 
-        public RemoteWebDriver Driver => lazyDriver.Value;
+        public WebDriver Driver => lazyDriver.Value;
 
         public bool IsStarted => lazyDriver.IsValueCreated && Driver.SessionId != null;
 
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Aquality.Selenium.Core.Tests.csproj b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Aquality.Selenium.Core.Tests.csproj
@@ -25,15 +25,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="4.3.1" />
+    <PackageReference Include="Appium.WebDriver" Version="5.0.0-beta01" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="WebDriverManager" Version="2.11.1" />
+    <PackageReference Include="WebDriverManager" Version="2.12.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Visualization/FormDumpTests.cs b/Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Visualization/FormDumpTests.cs
diff --git a/azure-pipelines.yml b/azure-pipelines.yml

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using Aquality.Selenium.Core.Visualization;`
`10`	`10`	`using Aquality.Selenium.Core.Waitings;`
`11`	`11`	`using OpenQA.Selenium;`
`12`		`-using OpenQA.Selenium.Remote;`
`13`	`12`
`14`	`13`	`namespace Aquality.Selenium.Core.Elements`
`15`	`14`	`{`
`@@ -118,13 +117,13 @@ public string GetAttribute(string attr)`
`118`	`117`	`return value;`
`119`	`118`	`}`
`120`	`119`
`121`		`- public virtual RemoteWebElement GetElement(TimeSpan? timeout = null)`
	`120`	`+ public virtual WebElement GetElement(TimeSpan? timeout = null)`
`122`	`121`	`{`
`123`	`122`	`try`
`124`	`123`	`{`
`125`	`124`	`return CacheConfiguration.IsEnabled`
`126`	`125`	`? Cache.GetElement(timeout)`
`127`		`- : (RemoteWebElement) Finder.FindElement(Locator, elementState, timeout, Name);`
	`126`	`+ : (WebElement) Finder.FindElement(Locator, elementState, timeout, Name);`
`128`	`127`	`}`
`129`	`128`	`catch (NoSuchElementException ex) when (LoggerConfiguration.LogPageSource)`
`130`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ElementCacheHandler : IElementCacheHandler`
`12`	`12`	`private readonly ElementState state;`
`13`	`13`	`private readonly IElementFinder elementFinder;`
`14`	`14`
`15`		`- private RemoteWebElement remoteElement;`
	`15`	`+ private WebElement element;`
`16`	`16`
`17`	`17`	`public ElementCacheHandler(By locator, string name, ElementState state, IElementFinder finder)`
`18`	`18`	`{`
`@@ -22,17 +22,17 @@ public ElementCacheHandler(By locator, string name, ElementState state, IElement`
`22`	`22`	`elementFinder = finder;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public bool IsStale => remoteElement != null && IsRefreshNeeded();`
	`25`	`+ public bool IsStale => element != null && IsRefreshNeeded();`
`26`	`26`
`27`	`27`	`public bool IsRefreshNeeded(ElementState? customState = null)`
`28`	`28`	`{`
`29`		`- if (remoteElement == null)`
	`29`	`+ if (element == null)`
`30`	`30`	`{`
`31`	`31`	`return true;`
`32`	`32`	`}`
`33`	`33`	`try`
`34`	`34`	`{`
`35`		`- var isDisplayed = remoteElement.Displayed;`
	`35`	`+ var isDisplayed = element.Displayed;`
`36`	`36`	`// refresh is needed only if the property is not match to expected element state`
`37`	`37`	`return (customState ?? state) == ElementState.Displayed && !isDisplayed;`
`38`	`38`	`}`
`@@ -43,15 +43,15 @@ public bool IsRefreshNeeded(ElementState? customState = null)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- public RemoteWebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null)`
	`46`	`+ public WebElement GetElement(TimeSpan? timeout = null, ElementState? customState = null)`
`47`	`47`	`{`
`48`	`48`
`49`	`49`	`if (IsRefreshNeeded(customState))`
`50`	`50`	`{`
`51`		`- remoteElement = (RemoteWebElement)elementFinder.FindElement(locator, customState ?? state, timeout, name);`
	`51`	`+ element = (WebElement)elementFinder.FindElement(locator, customState ?? state, timeout, name);`
`52`	`52`	`}`
`53`	`53`
`54`		`- return remoteElement;`
	`54`	`+ return element;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Aquality.Selenium.Core.Localization;`
`7`	`7`	`using Aquality.Selenium.Core.Waitings;`
`8`	`8`	`using OpenQA.Selenium;`
`9`		`-using OpenQA.Selenium.Support.PageObjects;`
	`9`	`+using SeleniumExtras.PageObjects;`
`10`	`10`
`11`	`11`	`namespace Aquality.Selenium.Core.Elements`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public virtual float Compare(string dumpName = null)`
`44`	`44`	`{`
`45`	`45`	`throw new InvalidOperationException($"Dump directory [{directory.FullName}] does not contain any [*{ImageFormat}] files.");`
`46`	`46`	`}`
`47`		`- var existingElements = ElementsForVisualization.Where(element => element.Value.State.IsExist)`
`48`		`- .ToDictionary(el => el.Key, el => el.Value);`
	`47`	`+ var existingElements = FilterElementsForVisualization().ToDictionary(el => el.Key, el => el.Value);`
`49`	`48`	`var countOfUnproceededElements = existingElements.Count;`
`50`	`49`	`var countOfProceededElements = 0;`
`51`	`50`	`var comparisonResult = 0f;`
`@@ -89,7 +88,7 @@ public virtual void Save(string dumpName = null)`
`89`	`88`	`{`
`90`	`89`	`var directory = CleanUpAndGetDumpDirectory(dumpName);`
`91`	`90`	`LocalizedLogger.Info("loc.form.dump.save", directory.Name);`
`92`		`- ElementsForVisualization.Where(element => element.Value.State.IsExist).ToList()`
	`91`	`+ FilterElementsForVisualization()`
`93`	`92`	`.ForEach(element =>`
`94`	`93`	`{`
`95`	`94`	`try`
`@@ -103,6 +102,11 @@ public virtual void Save(string dumpName = null)`
`103`	`102`	`});`
`104`	`103`	`}`
`105`	`104`
	`105`	`+ protected virtual List<KeyValuePair<string, T>> FilterElementsForVisualization()`
	`106`	`+ {`
	`107`	`+ return ElementsForVisualization.Where(element => element.Value.State.IsDisplayed).ToList();`
	`108`	`+ }`
	`109`	`+`
`106`	`110`	`protected virtual DirectoryInfo CleanUpAndGetDumpDirectory(string dumpName = null)`
`107`	`111`	`{`
`108`	`112`	`var dirInfo = GetDumpDirectory(dumpName);`