Able to mesure environmental impacts during user journey (#77)

* Accessibility: update to axe core 4.9 * axe report multi lang * unit test * Able to mesure environmental impacts during user journey (#76) * Update build-and-publish-PROnly.yml * Update build-develop.yml * Accessibility: update to axe core 4.9 (#73) * Accessibility: update to axe core 4.9 * axe report multi lang * [mobile] throw exception when session is not open * unit test * Accessibility: French verison of report * add support of some language for accessibility test. * update unit test for multi language. * retro PR because commited on main branch (#75) * [Mobile] force an exception if appium session is not opened (#74) * Accessibility: update to axe core 4.9 * Accessibility: French verison of report * add support of some language for accessibility test. * update unit test for multi language. * Optimise screenshot of accessibility test (from png to webp format) * Avoid divide by zero error when there is no pages scanned during a test. * update dependencies: - Appium 7.0 - Selenium 4.27 - Axe Core 4.10.1 - Add support to .NET 9.0 * Mesure ressources metrics * display downloaded resources * Update build-and-publish-PROnly.yml --------- Co-authored-by: Huaxing YUAN <[email protected]> --------- Co-authored-by: Huaxing YUAN <[email protected]>
AxaFrance · Jan 3, 2025 · 9fecd14 · 9fecd14
1 parent 4faf047
commit 9fecd14
Show file tree

Hide file tree

Showing 34 changed files with 2,147 additions and 299 deletions.
diff --git a/.github/workflows/build-and-publish-PROnly.yml b/.github/workflows/build-and-publish-PROnly.yml
@@ -80,7 +80,7 @@ jobs:
         Get-ChildItem ./src -Recurse -File -Filter Axa*.nupkg | % {Copy-Item -Path $_.FullName -Destination "./nuget/$_"}
     
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
        name: build-artifact
        path: "./nuget"

diff --git a/src/AxaFrance.AxeExtended.HtmlReport/Assets/axe-core.fr.json b/src/AxaFrance.AxeExtended.HtmlReport/Assets/axe-core.fr.json
diff --git a/src/AxaFrance.AxeExtended.HtmlReport/Assets/report.en.json b/src/AxaFrance.AxeExtended.HtmlReport/Assets/report.en.json
@@ -0,0 +1,4 @@
+{
+  "overall-banner-title": "Accessibility Report: Application {{Title}}",
+  "overall-banner-performed-at": "Test performed at: {{TimeStamp}}"
+}
diff --git a/src/AxaFrance.AxeExtended.HtmlReport/AxaFrance.AxeExtended.HtmlReport.csproj b/src/AxaFrance.AxeExtended.HtmlReport/AxaFrance.AxeExtended.HtmlReport.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Deque.AxeCore.Commons" Version="4.9.1" />
+    <PackageReference Include="Deque.AxeCore.Commons" Version="4.10.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">

diff --git a/src/AxaFrance.AxeExtended.HtmlReport/AxeOverallResult.cs b/src/AxaFrance.AxeExtended.HtmlReport/AxeOverallResult.cs
@@ -89,6 +89,11 @@ protected override int GetScore()
                 }
                 overall += impact;
             }
+            if(overall == 0)
+            {
+                //to avoir division by zero
+                return 0;
+            }
             var score = passed * 100 / overall;
             Score = score;
             ScoreRotation = Score * 360 / 100;

diff --git a/src/AxaFrance.AxeExtended.Selenium/AxaFrance.AxeExtended.Selenium.csproj b/src/AxaFrance.AxeExtended.Selenium/AxaFrance.AxeExtended.Selenium.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -19,8 +19,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Deque.AxeCore.Selenium" Version="4.9.1" />
-    <PackageReference Include="SkiaSharp" Version="2.88.8" />
+    <PackageReference Include="Deque.AxeCore.Selenium" Version="4.10.1" />
+    <PackageReference Include="SkiaSharp" Version="3.116.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.Doc/files/Data-HomeInsurance.xlsx b/src/AxaFrance.WebEngine.Doc/files/Data-HomeInsurance.xlsx
diff --git a/src/AxaFrance.WebEngine.ExcelUI/AxaFrance.WebEngine.ExcelUI.csproj b/src/AxaFrance.WebEngine.ExcelUI/AxaFrance.WebEngine.ExcelUI.csproj
@@ -60,6 +60,11 @@
       <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
@@ -261,6 +266,7 @@
     <EmbeddedResource Include="Ribbon.resx">
       <DependentUpon>Ribbon.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="AxaFrance.WebEngine.ExcelUI_1_TemporaryKey.pfx" />
     <None Include="AxaFrance.WebEngine.ExcelUI_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -353,10 +359,10 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>AxaFrance.WebEngine.ExcelUI_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>AxaFrance.WebEngine.ExcelUI_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>E17D56D22BE7799197DB7C86058639A0CF1A0690</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>96271E6190A8D7740CF12B1334391DEBCD78328E</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>

diff --git a/src/AxaFrance.WebEngine.ExcelUI/FrmAbout.Designer.cs b/src/AxaFrance.WebEngine.ExcelUI/FrmAbout.Designer.cs
diff --git a/src/AxaFrance.WebEngine.ExcelUI/FrmAbout.resx b/src/AxaFrance.WebEngine.ExcelUI/FrmAbout.resx
@@ -121,7 +121,7 @@
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAACO1JREFUeF7dm3lQlOcBhx2b/tXO1MzEptOJM5qZdNp0JmOSqrXteKWNYjQdmzGH
+        vAAADrwBlbxySQAACO1JREFUeF7dm3lQlOcBhx2b/tXO1MzEptOJM5qZdNp0JmOSqrXteKWNYjQdmzGH
         mrTVVo1IKh6JQBCQSwXUAA2gIwhySsEj3CAgurhyeuCBgggqIPHgWJdjj1+/d3k/4ON7d/e7YCQ/5xmd
         0Rne59lvL1km4TlYR18/LnV2o7jjEbLaOvCof4D+zdhv3APcN/Yiofk+NtbUYXaxDj89mYdJ/8sRUNLx
         mP7rsd+4BGh+ZkTAjQbMLDovkmXxgwlQ+PARlp6rwOSMXKaoPSZ8gCJOfE5xOVNOChM2ALnU39dVMaXk

diff --git a/src/AxaFrance.WebEngine.MobileApp/AppFactory.cs b/src/AxaFrance.WebEngine.MobileApp/AppFactory.cs
@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Linq;
 using OpenQA.Selenium.Appium;
 using OpenQA.Selenium.Appium.Android;
+using OpenQA.Selenium.Appium.Android.Enums;
 using OpenQA.Selenium.Appium.iOS;
 using OpenQA.Selenium.Remote;
 using System;

diff --git a/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj b/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -20,9 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.1.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.23.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj b/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net6.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows;net9.0-windows</TargetFrameworks>
     <Nullable>disable</Nullable>
     <UseWPF>true</UseWPF>
     <AssemblyName>ReportViewer</AssemblyName>
@@ -29,6 +29,10 @@
     <None Remove="XmlDark.xshd" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AxaFrance.WebEngine.Web\NetworkRequest.cs" Link="NetworkRequest.cs" />
+  </ItemGroup>
+
 
   <ItemGroup>
     <EmbeddedResource Include="XmlDark.xshd" />
@@ -37,7 +41,8 @@
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Hummingbird.UI" Version="1.2.2772.2" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml b/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml
@@ -102,6 +102,10 @@
                     </Grid>
 
                 </TabItem>
+                <TabItem Header="Impact" x:Name="tabResourceUsages">
+                    <DataGrid x:Name="dgImpacts" IsReadOnly="True">
+                    </DataGrid>
+                </TabItem>
             </TabControl>
 
             <TabControl Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource SecondaryTabControlStyle}">

diff --git a/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml.cs b/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml.cs
@@ -2,10 +2,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 // Modified By: YUAN Huaxing, at: 2022-8-1 10:22
 using AxaFrance.WebEngine.Report;
+using AxaFrance.WebEngine.Web;
 using Hummingbird.UI;
 using ICSharpCode.AvalonEdit.Folding;
 using Microsoft.Win32;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
@@ -167,6 +169,19 @@ private void lvTestcases_SelectionChanged(object sender, System.Windows.Controls
                 tabControl.SelectedIndex = 0;
             }
 
+            if(tc.AttachedData.FirstOrDefault(x=>x.Name == "ResourceUsage") != null)
+            {
+                tabResourceUsages.Visibility = Visibility.Visible;
+                var data = tc.AttachedData.FirstOrDefault(x => x.Name == "ResourceUsage")?.Value;
+                string json = System.Text.Encoding.UTF8.GetString(data);
+                var resourceUsage = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, NetworkRequest>>(json);
+                dgImpacts.ItemsSource = resourceUsage.Values.ToArray() ;
+            }
+            else
+            {
+                tabResourceUsages.Visibility = Visibility.Collapsed;
+            }
+
 
         }
 

diff --git a/src/AxaFrance.WebEngine.Runner/AxaFrance.WebEngine.Runner.csproj b/src/AxaFrance.WebEngine.Runner/AxaFrance.WebEngine.Runner.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0;net9.0</TargetFrameworks>
     <Nullable>disable</Nullable>
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>false</SelfContained>
@@ -41,7 +41,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SkiaSharp" Version="2.88.8" />
+    <PackageReference Include="SkiaSharp" Version="3.116.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AxaFrance.WebEngine.Web/AxaFrance.WebEngine.Web.csproj b/src/AxaFrance.WebEngine.Web/AxaFrance.WebEngine.Web.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -31,12 +31,13 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Appium.WebDriver" Version="5.1.0" />
+    <PackageReference Include="Appium.WebDriver" Version="7.0.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.23.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.8" />
-    <PackageReference Include="WebDriverManager" Version="2.17.4" />
+    <PackageReference Include="Selenium.Support" Version="4.27.0" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
+    <PackageReference Include="SkiaSharp" Version="3.116.1" />
+    <PackageReference Include="WebDriverManager" Version="2.17.5" />
   </ItemGroup>
 
   <ItemGroup>