From 3621aaf8b0391869d66dae4e57756737942ec4ca Mon Sep 17 00:00:00 2001
From: Tyler Olson <tylerol@microsoft.com>
Date: Tue, 28 Apr 2020 17:26:53 -0500
Subject: [PATCH 1/3] Set/Get Header fixes

---
 .../Elements/Entity.cs                        |  2 +-
 ...ft.Dynamics365.UIAutomation.Api.UCI.csproj | 10 +----
 .../WebClient.cs                              | 44 +++++++++++++++++--
 .../packages.config                           |  2 -
 ...rosoft.Dynamics365.UIAutomation.Api.csproj |  9 ----
 .../packages.config                           |  2 -
 ...ft.Dynamics365.UIAutomation.Browser.csproj |  9 ----
 .../packages.config                           |  2 -
 8 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
index 93d7dd67..fece5d7a 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
@@ -380,7 +380,7 @@ public void SetHeaderValue(string field, string value)
         /// <param name="control">The lookup field name, value or index of the lookup.</param>
         public void SetHeaderValue(LookupItem control)
         {
-            _client.SetHeaderValue(control);
+            _client.SetHeaderValue(control);            
         }
 
         /// <summary>
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
index 89bccd89..ea9b19cc 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
@@ -108,6 +108,7 @@
     <Compile Include="DTO\ListItem.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -117,15 +118,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets'))" />
-  </Target>
-  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
index c3271de4..46b7a904 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
@@ -2387,6 +2387,7 @@ internal BrowserCommandResult<Field> GetField(string field)
                 Field returnField = new Field(driver.WaitUntilAvailable(By.XPath(AppElements.Xpath[AppReference.Entity.TextFieldContainer].Replace("[NAME]", field))));
                 returnField.Name = field;
 
+                driver.ClearFocus();
                 return returnField;
             });
         }
@@ -2423,6 +2424,8 @@ internal BrowserCommandResult<string> GetValue(string field)
                     throw new Exception($"Field with name {field} does not exist.");
                 }
 
+                driver.ClearFocus();
+
                 return text;
             });
         }
@@ -2440,6 +2443,9 @@ public BrowserCommandResult<string> GetValue(LookupItem control)
                 var xpathToContainer = AppElements.Xpath[AppReference.Entity.TextFieldLookupFieldContainer].Replace("[NAME]", controlName);
                 IWebElement fieldContainer = driver.WaitUntilAvailable(By.XPath(xpathToContainer));
                 string lookupValue = TryGetValue(fieldContainer, control);
+
+                driver.ClearFocus();
+
                 return lookupValue;
             });
         }
@@ -2463,6 +2469,9 @@ public BrowserCommandResult<string[]> GetValue(LookupItem[] controls)
                 var xpathToContainer = By.XPath(AppElements.Xpath[AppReference.Entity.TextFieldLookupFieldContainer].Replace("[NAME]", controlName));
                 var fieldContainer = driver.WaitUntilAvailable(xpathToContainer);
                 string[] result = TryGetValue(fieldContainer, controls);
+
+                driver.ClearFocus();
+
                 return result;
             });
         }
@@ -2518,6 +2527,8 @@ internal BrowserCommandResult<string> GetValue(OptionSet control)
                 var xpathToFieldContainer = AppElements.Xpath[AppReference.Entity.OptionSetFieldContainer].Replace("[NAME]", controlName);
                 var fieldContainer = driver.WaitUntilAvailable(By.XPath(xpathToFieldContainer));
                 string result = TryGetValue(fieldContainer, control);
+
+                driver.ClearFocus();
                 return result;
             });
         }
@@ -2593,6 +2604,7 @@ internal BrowserCommandResult<bool> GetValue(BooleanItem option)
                 else
                     throw new InvalidOperationException($"Field: {option.Name} Does not exist");
 
+                driver.ClearFocus();
                 return check;
             });
         }
@@ -2624,6 +2636,7 @@ internal BrowserCommandResult<MultiValueOptionSet> GetValue(MultiValueOptionSet
                     returnValue.Values = labelItems.Select(x => x.Text).ToArray();
                 }
 
+                driver.ClearFocus();
                 return returnValue;
             });
         }
@@ -2664,6 +2677,8 @@ internal BrowserCommandResult<MultiValueOptionSet> GetValue(MultiValueOptionSet
             var time = DateTime.Parse(strTime);
 
             var result = date.AddHours(time.Hour).AddMinutes(time.Minute).AddSeconds(time.Second);
+
+            driver.ClearFocus();
             return result;
         }
 
@@ -2874,6 +2889,9 @@ internal BrowserCommandResult<string> GetHeaderValue(LookupItem control)
             {
                 var xpathToContainer = AppElements.Xpath[AppReference.Entity.Header.LookupFieldContainer].Replace("[NAME]", controlName);
                 string lookupValue = ExecuteInHeaderContainer(driver, xpathToContainer, container => TryGetValue(container, control));
+
+                driver.ClearFocus(); // Close Header
+
                 return lookupValue;
             });
         }
@@ -2885,6 +2903,9 @@ internal BrowserCommandResult<string[]> GetHeaderValue(LookupItem[] controls)
             return Execute(GetOptions($"Get Header Activityparty LookupItem Value {controlName}"), driver =>
             {
                 string[] lookupValues = ExecuteInHeaderContainer(driver, xpathToContainer, container => TryGetValue(container, controls));
+
+                driver.ClearFocus(); // Close Header
+
                 return lookupValues;
             });
         }
@@ -2962,6 +2983,8 @@ internal BrowserCommandResult<bool> SetHeaderValue(string field, string value)
 
                 SetValue(field, value);
 
+                driver.ClearFocus(); // Close Header
+
                 return true;
             });
         }
@@ -2969,13 +2992,18 @@ internal BrowserCommandResult<bool> SetHeaderValue(string field, string value)
         internal BrowserCommandResult<bool> SetHeaderValue(LookupItem control)
         {
             var controlName = control.Name;
+            bool isHeader = true;
+            bool removeAll = true;
             var xpathToContainer = AppElements.Xpath[AppReference.Entity.Header.LookupFieldContainer].Replace("[NAME]", controlName);
             return Execute(GetOptions($"Set Header LookupItem Value {controlName}"),
                 driver => ExecuteInHeaderContainer(driver, xpathToContainer,
                     fieldContainer =>
                     {
-                        TryRemoveLookupValue(driver, fieldContainer, control);
+                        TryRemoveLookupValue(driver, fieldContainer, control, removeAll, isHeader);
                         TrySetValue(driver, fieldContainer, control);
+
+                        driver.ClearFocus(); // Close Header
+
                         return true;
                     }));
         }
@@ -2993,6 +3021,9 @@ internal BrowserCommandResult<bool> SetHeaderValue(LookupItem[] controls, bool c
                             TryRemoveLookupValue(driver, container, control);
 
                         TryToSetValue(driver, container, controls);
+
+                        driver.ClearFocus(); // Close Header
+
                         return true;
                     }));
         }
@@ -3006,6 +3037,9 @@ internal BrowserCommandResult<bool> SetHeaderValue(OptionSet control)
                     container =>
                     {
                         TrySetValue(container, control);
+
+                        driver.ClearFocus(); // Close Header
+
                         return true;
                     }));
         }
@@ -3018,6 +3052,8 @@ internal BrowserCommandResult<bool> SetHeaderValue(MultiValueOptionSet control)
 
                 SetValue(control);
 
+                driver.ClearFocus(); // Close Header
+
                 return true;
             });
         }
@@ -3030,6 +3066,8 @@ internal BrowserCommandResult<bool> SetHeaderValue(BooleanItem control)
 
                 SetValue(control);
 
+                driver.ClearFocus(); // Close Header
+
                 return true;
             });
         }
@@ -3087,7 +3125,7 @@ internal BrowserCommandResult<bool> ClearValue(LookupItem control, bool removeAl
             });
         }
 
-        private static void TryRemoveLookupValue(IWebDriver driver, IWebElement fieldContainer, LookupItem control, bool removeAll = true)
+        private static void TryRemoveLookupValue(IWebDriver driver, IWebElement fieldContainer, LookupItem control, bool removeAll = true, bool isHeader = false)
         {
             var controlName = control.Name;
             fieldContainer.Hover(driver);
@@ -3104,7 +3142,7 @@ private static void TryRemoveLookupValue(IWebDriver driver, IWebElement fieldCon
                 var count = existingValues.Count;
                 fieldContainer.WaitUntil(x => x.FindElements(xpathDeleteExistingValues).Count > count);
             }
-            else
+            else if (!isHeader && !success)
             {
                 var xpathToHoveExistingValue = By.XPath(AppElements.Xpath[AppReference.Entity.LookupFieldHoverExistingValue].Replace("[NAME]", controlName));
                 var found = fieldContainer.TryFindElement(xpathToHoveExistingValue, out var existingList);
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config b/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config
index 8aa1f99d..10664e4d 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config
@@ -3,8 +3,6 @@
   <package id="Microsoft.ApplicationInsights" version="2.11.0" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
   <package id="Otp.NET" version="1.2.1" targetFramework="net46" />
-  <package id="Selenium.Chrome.WebDriver" version="76.0.0" targetFramework="net46" />
-  <package id="Selenium.Firefox.WebDriver" version="0.24.0" targetFramework="net46" />
   <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net46" />
diff --git a/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj b/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
index 67e5cbe1..f039fea0 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
@@ -124,15 +124,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets'))" />
-  </Target>
-  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Microsoft.Dynamics365.UIAutomation.Api/packages.config b/Microsoft.Dynamics365.UIAutomation.Api/packages.config
index 74c1ad6d..2c229364 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api/packages.config
+++ b/Microsoft.Dynamics365.UIAutomation.Api/packages.config
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Selenium.Chrome.WebDriver" version="76.0.0" targetFramework="net46" />
-  <package id="Selenium.Firefox.WebDriver" version="0.24.0" targetFramework="net46" />
   <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
 </packages>
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj b/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
index 3ba7cb0a..de12d089 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
@@ -107,15 +107,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets'))" />
-  </Target>
-  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/packages.config b/Microsoft.Dynamics365.UIAutomation.Browser/packages.config
index 351d9030..2abb7554 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/packages.config
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/packages.config
@@ -3,8 +3,6 @@
     Licensed under the MIT license.-->
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="Selenium.Chrome.WebDriver" version="76.0.0" targetFramework="net46" />
-  <package id="Selenium.Firefox.WebDriver" version="0.24.0" targetFramework="net46" />
   <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
 </packages>
\ No newline at end of file

From 79175c1ba59509673afbf6f95733a8b037a81ef5 Mon Sep 17 00:00:00 2001
From: Tyler Olson <tylerol@microsoft.com>
Date: Tue, 28 Apr 2020 17:36:25 -0500
Subject: [PATCH 2/3] PR code cleanup

---
 Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs   | 2 +-
 .../Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
index fece5d7a..93d7dd67 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
@@ -380,7 +380,7 @@ public void SetHeaderValue(string field, string value)
         /// <param name="control">The lookup field name, value or index of the lookup.</param>
         public void SetHeaderValue(LookupItem control)
         {
-            _client.SetHeaderValue(control);            
+            _client.SetHeaderValue(control);
         }
 
         /// <summary>
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
index ea9b19cc..322456b8 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
@@ -108,7 +108,6 @@
     <Compile Include="DTO\ListItem.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

From 4e311140c09a1aa17f8857fce4cec4d9a3bcf8bb Mon Sep 17 00:00:00 2001
From: Tyler Olson <tylerol@microsoft.com>
Date: Wed, 29 Apr 2020 12:05:37 -0500
Subject: [PATCH 3/3] Resiliency fix for updating Time value on DateTimeControl
 Fixing GetHeaderValue if Time value is present

---
 Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
index 46b7a904..f01b5434 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/WebClient.cs
@@ -2256,6 +2256,7 @@ private static void TrySetTime(IWebDriver driver, IWebElement timeField, string
                 timeField.Clear();
                 timeField.Click();
                 timeField.SendKeys(time);
+                timeField.SendKeys(Keys.Tab);
             },
                 d => timeField.GetAttribute("value").IsValueEqualsTo(time),
                 TimeSpan.FromSeconds(9), 3,
@@ -2411,7 +2412,7 @@ internal BrowserCommandResult<string> GetValue(string field)
                         var timefields = driver.FindElements(By.XPath(AppElements.Xpath[AppReference.Entity.FieldControlDateTimeTimeInputUCI].Replace("[FIELD]", field)));
                         if (timefields.Any())
                         {
-                            text = $" {timefields.First().GetAttribute("value")}";
+                            text += $" {timefields.First().GetAttribute("value")}";
                         }
                     }
                 }