Merge pull request #17 from aquality-automation/cross-platform-visual…

…ization [Visualization] Use cross-platform solution for visual testing
aquality-automation · Mar 16, 2023 · 5258f0e · 5258f0e
2 parents 9c75d2c + 9ebb43c
commit 5258f0e
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 50 deletions.
diff --git a/...elenium.Template/Aquality.Selenium.Template.NUnit/Aquality.Selenium.Template.NUnit.csproj b/...elenium.Template/Aquality.Selenium.Template.NUnit/Aquality.Selenium.Template.NUnit.csproj
@@ -18,10 +18,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit.Allure" Version="1.2.1.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...ty.Selenium.Template/Aquality.Selenium.Template.NUnit/Steps/CustomImageComparatorSteps.cs b/...ty.Selenium.Template/Aquality.Selenium.Template.NUnit/Steps/CustomImageComparatorSteps.cs
@@ -1,40 +1,40 @@
 using NUnit.Framework;
 using Aquality.Selenium.Template.Utilities;
-using System.Drawing;
 using Aquality.Selenium.Template.CustomAttributes;
-using System.Diagnostics.CodeAnalysis;
+using SkiaSharp;
+using System.IO;
+using Aquality.Selenium.Core.Visualization;
 
 namespace Aquality.Selenium.Template.NUnit.Steps
 {
-    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
     public class CustomImageComparatorSteps
     {
         private readonly CustomImageComparator customImageComparator;
-        private readonly Image modelOfImage;
+        private readonly SKImage modelOfImage;
 
         public CustomImageComparatorSteps(float customThresholdValue, string modelImageResourses)
         {
-            modelOfImage = Image.FromFile(modelImageResourses);
+            modelOfImage = new FileInfo(modelImageResourses).ReadImage();
             var imageWidth = modelOfImage.Width;
             var imageHeight = modelOfImage.Height;
             customImageComparator = new CustomImageComparator(customThresholdValue, imageWidth, imageHeight);
         }
 
         [LogStep(StepType.Step)]
-        public static Image GetExpectedImageFromResourse(string expectedImageResourse)
+        public static SKImage GetExpectedImageFromResourse(string expectedImageResourse)
         {
-            return Image.FromFile(expectedImageResourse);
+            return new FileInfo(expectedImageResourse).ReadImage();
         }
 
         [LogStep(StepType.Assertion)]
-        public void CheckThatActualAndExpectedImagesAreTheSame(Image expectedImage)
+        public void CheckThatActualAndExpectedImagesAreTheSame(SKImage expectedImage)
         {
             var differenceBetweenImages = customImageComparator.Compare(modelOfImage, expectedImage);
             Assert.AreEqual(0, differenceBetweenImages, "The images should be the same");
         }
 
         [LogStep(StepType.Assertion)]
-        public void CheckThatActualAndExpectedImagesAreNotTheSame(Image expectedImage)
+        public void CheckThatActualAndExpectedImagesAreNotTheSame(SKImage expectedImage)
         {
             var differenceBetweenImages = customImageComparator.Compare(modelOfImage, expectedImage);
             Assert.AreNotEqual(0, differenceBetweenImages, "The images should not be the same");

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template.NUnit/Steps/FooterFormSteps.cs b/Aquality.Selenium.Template/Aquality.Selenium.Template.NUnit/Steps/FooterFormSteps.cs
@@ -8,7 +8,7 @@ namespace Aquality.Selenium.Template.NUnit.Steps
     public class FooterFormSteps
     {
         private readonly FooterForm footerForm = new FooterForm();
-        const float ComparisonThreshold = 0.08f;
+        const float ComparisonThreshold = 0.1f;
 
         [LogStep(StepType.Assertion)]
         public void FooterFormIsPresent()

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template.NUnit/runtimeconfig.template.json b/Aquality.Selenium.Template/Aquality.Selenium.Template.NUnit/runtimeconfig.template.json
diff --git a/...m.Template/Aquality.Selenium.Template.SpecFlow/Aquality.Selenium.Template.SpecFlow.csproj b/...m.Template/Aquality.Selenium.Template.SpecFlow/Aquality.Selenium.Template.SpecFlow.csproj
@@ -7,15 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aquality.Selenium" Version="4.9.1" />
+    <PackageReference Include="Aquality.Selenium" Version="4.12.0" />
     <PackageReference Include="AqualityTracking.SpecFlowPlugin" Version="1.0.1" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="SpecFlow" Version="3.9.74" />
     <PackageReference Include="SpecFlow.Allure" Version="3.5.0.73" />
     <PackageReference Include="SpecFlow.NUnit" Version="3.9.74" />

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template.SpecFlow/Features/Demo.feature b/Aquality.Selenium.Template/Aquality.Selenium.Template.SpecFlow/Features/Demo.feature
@@ -6,16 +6,16 @@ Scenario Outline: Empty email validation is working on Contact Us page
     When I open Contact us page
     Then Contact us page is opened
     When I save Contact us page dump
-    And I fill contact form using following data:
-    | Name    | Value                    |
-    | Name    | <Name>                   |
-    | Company | Aquality Automation      |
-    | Phone   | +44 208 816 7320         |
-    | Comment | I'd like to contact you! |
-    And I accept Privacy and Cookies Policy
-    And I click Send button
+        And I fill contact form using following data:
+        | Name    | Value                    |
+        | Name    | <Name>                   |
+        | Company | Aquality Automation      |
+        | Phone   | +44 208 816 7320         |
+        | Comment | I'd like to contact you! |
+        And I accept Privacy and Cookies Policy
+        And I click Send button
     Then Notification about empty fields is present
-    And Contact us page dump is different
+        And Contact us page dump is different
 
     Examples: 
     | Name         |

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template.SpecFlow/runtimeconfig.template.json b/Aquality.Selenium.Template/Aquality.Selenium.Template.SpecFlow/runtimeconfig.template.json
diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template/Aquality.Selenium.Template.csproj b/Aquality.Selenium.Template/Aquality.Selenium.Template/Aquality.Selenium.Template.csproj
@@ -16,14 +16,14 @@
 
   <ItemGroup>
     <PackageReference Include="Allure.Commons" Version="3.5.0.73" />
-    <PackageReference Include="Aquality.Selenium" Version="4.9.1" />
+    <PackageReference Include="Aquality.Selenium" Version="4.12.0" />
     <PackageReference Include="AspectInjector" Version="2.8.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="NUnit.Allure" Version="1.2.1.1" />
     <PackageReference Include="AqualityTracking.Integrations.Core" Version="1.0.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="RestSharp" Version="108.0.3" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="RestSharp" Version="109.0.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template/Forms/Pages/ContactUsPage.cs b/Aquality.Selenium.Template/Aquality.Selenium.Template/Forms/Pages/ContactUsPage.cs
@@ -13,7 +13,7 @@ public class ContactUsPage : BaseAppForm
         private ITextBox CommentTextBox => ElementFactory.GetTextBox(By.Id("your-message"), "Project description");
         private ICheckBox PrivacyCheckBox => ElementFactory.GetCheckBox(By.XPath("//input[@name='privacy']/following-sibling::span[1]"), "Privacy");
         private IButton SendButton => ElementFactory.GetButton(By.XPath("//div[contains(@class,'contactsForm__submit')]//button"), "Send a message");
-        private ILabel EmailAlertLabel => ElementFactory.GetLabel(By.XPath("//div[contains(@class,'error')]//input[@id='your-email']"), "Email validating message", Core.Elements.ElementState.ExistsInAnyState);
+        private ILabel EmailAlertLabel => ElementFactory.GetLabel(By.XPath("//div[contains(@class,'error')]//input[@id='your-email']"), "Email validating message", ElementState.ExistsInAnyState);
         private ILabel TitleLabel => FormElement.FindChildElement<ILabel>(By.XPath("//h2[contains(@class,'blockTitle')]"), "Title");
         private ILabel TermsLabel => FormElement.FindChildElement<ILabel>(By.XPath("//label[contains(@class, 'checkbox')]"), "Terms");
         private ITextBox ContactUsTextBox(ContactUsTextFields contactUsTextField) => ElementFactory.GetTextBox(By.Id($"{contactUsTextField.GetId()}"), contactUsTextField.ToString());

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template/Utilities/CustomImageComparator.cs b/Aquality.Selenium.Template/Aquality.Selenium.Template/Utilities/CustomImageComparator.cs
@@ -1,6 +1,6 @@
 using Aquality.Selenium.Core.Configurations;
 using Aquality.Selenium.Core.Visualization;
-using System.Drawing;
+using SkiaSharp;
 
 namespace Aquality.Selenium.Template.Utilities
 {
@@ -14,7 +14,7 @@ public CustomImageComparator(float defaultThreshold, int comparisonWidth, int co
             imageComparator = new ImageComparator(visualizationConfiguration);
         }
 
-        public float Compare(Image firstImage, Image secondImage, float? threshold = null)
+        public float Compare(SKImage firstImage, SKImage secondImage, float? threshold = null)
         {
             return imageComparator.PercentageDifference(firstImage, secondImage, threshold);
         }

diff --git a/Aquality.Selenium.Template/Aquality.Selenium.Template/Utilities/ScreenshotProvider.cs b/Aquality.Selenium.Template/Aquality.Selenium.Template/Utilities/ScreenshotProvider.cs
@@ -1,13 +1,11 @@
 using Aquality.Selenium.Browsers;
+using Aquality.Selenium.Core.Visualization;
+using SkiaSharp;
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Aquality.Selenium.Template.Utilities
 {
-    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
     public class ScreenshotProvider
     {
         public string TakeScreenshot()
@@ -17,16 +15,14 @@ public string TakeScreenshot()
             EnsureDirectoryExists(directory);
             var screenshotName = $"{GetType().Name}_{DateTime.Now:yyyyMMdd_HHmmss}_{Guid.NewGuid().ToString("n").Substring(0, 5)}.png";
             var path = Path.Combine(directory, screenshotName);
-            image.Save(path, ImageFormat.Png);
+            image.Save(path, SKEncodedImageFormat.Png);
             return path;
         }
 
-        private static Image GetImage()
+        private static SKImage GetImage()
         {
-            using (var stream = new MemoryStream(AqualityServices.Browser.GetScreenshot()))
-            {
-                return Image.FromStream(stream);
-            }
+            using var stream = new MemoryStream(AqualityServices.Browser.GetScreenshot());
+            return SKImage.FromEncodedData(stream);
         }
 
         private static void EnsureDirectoryExists(string directory)