Merge pull request #26 from AxaFrance/develop

Prepare for HTML Report + Organization name change
AxaFrance · Mar 17, 2023 · ba194df · ba194df
2 parents 3a34d6b + c22b127
commit ba194df
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ WebEngine Framework resolves some common problems every test automation project
 * API Reference: Explains every class, method and property.
 * Tutorials: Follow some step by step turotial to build first test automation solution using different approach.
 
-https://axaguildev.github.io/webengine-dotnet/
+https://axafrance.github.io/webengine-dotnet/
 
 ## Use the latest version
 The Framework is distributed via Package Management:
@@ -36,7 +36,7 @@ When using JAVA, these pacakges will be available on Maven
 Feel free to reach us if you want to adopt the Framework, report Bugs, or have good ideas to contribute on it.
 
 #### Repository of .NET Project and shared components:
-+ https://github.com/AxaGuilDEv/webengine-dotnet
++ https://github.com/AxaFrance/webengine-dotnet
 + Main contributor: Huaxing YUAN [<img src="src/AxaFrance.WebEngine.Doc/images/linked-in.svg" width="16" />](https://www.linkedin.com/in/huaxing-yuan/) [<img src="src/AxaFrance.WebEngine.Doc/images/github.svg" width="16" />](https://github.com/huaxing-yuan) [<img src="src/AxaFrance.WebEngine.Doc/images/twitter.svg" width="16" />](https://twitter.com/huaxing_yuan)
 
 #### Repository Java Project:

diff --git a/Schemas/Schemas.xsd b/Schemas/Schemas.xsd
@@ -46,6 +46,7 @@
   </xs:complexType>
   <xs:complexType name="TestCaseReport">
     <xs:sequence>
+      <xs:element minOccurs="1" maxOccurs="1" name="Id" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="TestName" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="Log" type="xs:string" />
       <xs:element minOccurs="1" maxOccurs="1" name="Result" type="tns:Result" />
@@ -73,6 +74,7 @@
   </xs:complexType>
   <xs:complexType name="ActionReport">
     <xs:sequence>
+      <xs:element minOccurs="1" maxOccurs="1" name="Id" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
       <xs:element minOccurs="1" maxOccurs="1" name="Result" type="tns:Result" />
       <xs:element minOccurs="1" maxOccurs="1" name="StartTime" type="xs:dateTime" />
@@ -90,6 +92,7 @@
   </xs:complexType>
   <xs:complexType name="ScreenshotReport">
     <xs:sequence>
+      <xs:element minOccurs="1" maxOccurs="1" name="Id" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="Data" type="xs:base64Binary" />
     </xs:sequence>

diff --git a/src/AxaFrance.WebEngine.Doc/index.md b/src/AxaFrance.WebEngine.Doc/index.md
@@ -43,7 +43,7 @@ td, th, tr {
 | [Introduction](articles/intro.md) | [.NET API<br />Reference](api_net/) | [JAVA API<br />Reference](api_java/) | [Tutorials &<br />Examples](tutorials/intro.md) |
 
 ## Show case
-<iframe frameborder="0" width="640" height="360" src="https://www.dailymotion.com/embed/video/k7kedqwLLueznayqBmd" allowfullscreen allow="autoplay"/>
+<iframe frameborder="0"  src="https://www.dailymotion.com/embed/video/k7kedqwLLueznayqBmd" allowfullscreen allow="autoplay"/>
 
 ## Use the latest version
 The Framework is distributed via Package Management: NuGet for .NET version and Maven for JAVA Version.
@@ -53,7 +53,7 @@ The Framework is distributed via Package Management: NuGet for .NET version and
 Feel free to reach us if you want to adopt the Framework, report Bugs or have good ideas to contribute on it.
 
 ### Repository of .NET Project and shared components:
-+ https://github.com/AxaGuilDEv/webengine-dotnet
++ https://github.com/AxaFrance/webengine-dotnet
 + Main contributor: Huaxing YUAN [<img src="images/linked-in.svg" width="16" />](https://www.linkedin.com/in/huaxing-yuan/) [<img src="images/github.svg" width="16" />](https://github.com/huaxing-yuan) [<img src="images/twitter.svg" width="16" />](https://twitter.com/huaxing_yuan)
 
 ### Repository Java Project:

diff --git a/src/AxaFrance.WebEngine.ExcelUI/Ribbon.cs b/src/AxaFrance.WebEngine.ExcelUI/Ribbon.cs
@@ -517,12 +517,12 @@ private void btnCodeGenerationCSharp_Click(object sender, RibbonControlEventArgs
         }
         private void btnHelp_Click(object sender, RibbonControlEventArgs e)
         {
-            Process.Start("https://github.com/AxaGuilDEv/webengine-dotnet");
+            Process.Start("https://github.com/AxaFrance/webengine-dotnet");
         }
 
         private void btnFeedback_Click(object sender, RibbonControlEventArgs e)
         {
-            Process.Start("https://github.com/AxaGuilDEv/webengine-dotnet/issues");
+            Process.Start("https://github.com/AxaFrance/webengine-dotnet/issues");
         }
 
         private void btnAbout_Click(object sender, RibbonControlEventArgs e)

diff --git a/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj b/src/AxaFrance.WebEngine.MobileApp/AxaFrance.WebEngine.MobileApp.csproj
@@ -16,7 +16,7 @@
     <Product>AXA WebEngine Automation Framework</Product>
     <PackageTags>AXA WebEngine Automation Framework</PackageTags>
     <Description>AXA WebEngine Automation Framework is made to run automated Data Driven Tests on local or distance machine</Description>
-    <PackageProjectUrl>https://github.com/AxaGuilDEv/webengine-dotnet</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/AxaFrance/webengine-dotnet</PackageProjectUrl>
   </PropertyGroup>
 
   <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</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <Nullable>disable</Nullable>
     <UseWPF>true</UseWPF>
     <AssemblyName>ReportViewer</AssemblyName>

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>net472;net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net48;net6.0;net6.0-windows</TargetFrameworks>
     <Nullable>disable</Nullable>
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>false</SelfContained>
@@ -21,8 +21,8 @@
     <Company>AxaFrance</Company>
     <Product>AXA WebEngine Automation Framework</Product>
     <PackageTags>AXA WebEngine Automation Framework</PackageTags>
-    <PackageProjectUrl>https://github.com/AxaGuilDEv/webengine-dotnet</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/AxaGuilDEv/webengine-dotnet</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/AxaFrance/webengine-dotnet</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/AxaFrance/webengine-dotnet</RepositoryUrl>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>

diff --git a/src/AxaFrance.WebEngine/AxaFrance.WebEngine.csproj b/src/AxaFrance.WebEngine/AxaFrance.WebEngine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net472;net48</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net472;net48;net6.0-windows</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -16,7 +16,7 @@
     <Product>AXA WebEngine Automation Framework</Product>
     <PackageTags>AXA WebEngine Automation Framework</PackageTags>
     <Description>AXA WebEngine Automation Framework is made to run automated Data Driven Tests on local or distance machine</Description>
-    <PackageProjectUrl>https://github.com/AxaGuilDEv/webengine-dotnet</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/AxaFrance/webengine-dotnet</PackageProjectUrl>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">

diff --git a/src/AxaFrance.WebEngine/Report/ActionReport.cs b/src/AxaFrance.WebEngine/Report/ActionReport.cs
@@ -14,6 +14,11 @@ namespace AxaFrance.WebEngine.Report
     [XmlRoot(Namespace = GlobalConstants.XmlNamespace)]
     public class ActionReport
     {
+        /// <summary>
+        /// The unique identifier of the report item, generated automaticaly and used for showing report
+        /// </summary>
+        public string Id { get; set; } = Guid.NewGuid().ToString();
+
         /// <summary>
         /// The name of the action.
         /// </summary>

diff --git a/src/AxaFrance.WebEngine/Report/ScreenshotReport.cs b/src/AxaFrance.WebEngine/Report/ScreenshotReport.cs
@@ -14,6 +14,12 @@ namespace AxaFrance.WebEngine.Report
     [XmlRoot(Namespace = GlobalConstants.XmlNamespace)]
     public class ScreenshotReport
     {
+
+        /// <summary>
+        /// The identifier of the screenshot for html report viewing experience.
+        /// </summary>
+        public string Id { get; set; } = Guid.NewGuid().ToString();
+
         /// <summary>
         /// The name or brief descrption of the screenshot.
         /// </summary>

diff --git a/src/AxaFrance.WebEngine/Report/TestCaseReport.cs b/src/AxaFrance.WebEngine/Report/TestCaseReport.cs
@@ -14,6 +14,12 @@ namespace AxaFrance.WebEngine.Report
     [XmlRoot(Namespace = GlobalConstants.XmlNamespace)]
     public class TestCaseReport
     {
+
+        /// <summary>
+        /// The unique identifier of the report item, generated automaticaly and used for showing report
+        /// </summary>
+        public string Id { get; set; } = Guid.NewGuid().ToString();
+
         /// <summary>
         /// The name of test case
         /// </summary>