forked from SeleniumHQ/selenium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JimEvans: Beginning the long process of fixing the .NET WebDriverBack…
…edSelenium (with integration tests!) r10899
- Loading branch information
Showing
26 changed files
with
987 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
selenium/src/csharp/WebdriverBackedSelenium/Internal/AlertOverride.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using OpenQA.Selenium; | ||
|
|
||
| namespace Selenium.Internal | ||
| { | ||
| internal class AlertOverride | ||
| { | ||
| public void ReplaceAlertMethod(IWebDriver driver) | ||
| { | ||
| ((IJavaScriptExecutor)driver).ExecuteScript( | ||
| "if (window.__webdriverAlerts) { return; } " + | ||
| "window.__webdriverAlerts = []; " + | ||
| "window.alert = function(msg) { window.__webdriverAlerts.push(msg); }; " + | ||
| "window.__webdriverConfirms = []; " + | ||
| "window.__webdriverNextConfirm = true; " + | ||
| "window.confirm = function(msg) { " + | ||
| " window.__webdriverConfirms.push(msg); " + | ||
| " var res = window.__webdriverNextConfirm; " + | ||
| " window.__webdriverNextConfirm = true; " + | ||
| " return res; " + | ||
| "};" | ||
| ); | ||
| } | ||
|
|
||
| public string GetNextAlert(IWebDriver driver) | ||
| { | ||
| string result = (string)((IJavaScriptExecutor)driver).ExecuteScript( | ||
| "if (!window.__webdriverAlerts) { return null }; " + | ||
| "var t = window.__webdriverAlerts.shift();" + | ||
| "if (t) { t = t.replace(/\\n/g, ' '); } " + | ||
| "return t;" | ||
| ); | ||
|
|
||
| if (result == null) | ||
| { | ||
| throw new SeleniumException("There were no alerts"); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| public bool IsAlertPresent(IWebDriver driver) | ||
| { | ||
| bool alertPresent = (bool)((IJavaScriptExecutor)driver).ExecuteScript( | ||
| "return window.__webdriverAlerts && window.__webdriverAlerts.length > 0;" | ||
| ); | ||
|
|
||
| return alertPresent; | ||
| } | ||
|
|
||
| public string GetNextConfirmation(IWebDriver driver) | ||
| { | ||
| string result = (string)((IJavaScriptExecutor)driver).ExecuteScript( | ||
| "if (!window.__webdriverConfirms) { return null; } " + | ||
| "return window.__webdriverConfirms.shift();" | ||
| ); | ||
|
|
||
| if (result == null) | ||
| { | ||
| throw new SeleniumException("There were no confirmations"); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| public bool IsConfirmationPresent(IWebDriver driver) | ||
| { | ||
| bool confirmPresent = (bool)((IJavaScriptExecutor)driver).ExecuteScript( | ||
| "return window.__webdriverConfirms && window.__webdriverConfirms.length > 0;" | ||
| ); | ||
|
|
||
| return confirmPresent; | ||
| } | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
selenium/src/csharp/WebdriverBackedSelenium/Internal/CommandTimer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using Selenium.Internal.SeleniumEmulation; | ||
| using OpenQA.Selenium; | ||
| using System.Threading; | ||
|
|
||
| namespace Selenium.Internal | ||
| { | ||
| internal class CommandTimer | ||
| { | ||
| private int timeout; | ||
| private object commandResult = null; | ||
| private SeleneseCommand command; | ||
| private IWebDriver driver; | ||
| private string[] args; | ||
|
|
||
| public CommandTimer(int timeout) | ||
| { | ||
| this.timeout = timeout; | ||
| } | ||
|
|
||
| public int Timeout | ||
| { | ||
| get { return timeout; } | ||
| set { timeout = value; } | ||
| } | ||
|
|
||
| public object Execute(SeleneseCommand command, IWebDriver driver, string[] args) | ||
| { | ||
| this.command = command; | ||
| this.driver = driver; | ||
| this.args = args; | ||
| Thread executionThread = new Thread(RunCommand); | ||
| executionThread.Start(); | ||
| executionThread.Join(timeout); | ||
| if (executionThread.IsAlive) | ||
| { | ||
| throw new SeleniumException("Timed out running command"); | ||
| } | ||
|
|
||
| return commandResult; | ||
| } | ||
|
|
||
| private void RunCommand() | ||
| { | ||
| commandResult = command.Apply(driver, args); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
.../WebdriverBackedSelenium/Internal/SeleniumEmulation/FilterFunctions/BaseFilterFunction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using OpenQA.Selenium; | ||
|
|
||
| namespace Selenium.Internal.SeleniumEmulation.FilterFunctions | ||
| { | ||
| internal abstract class BaseFilterFunction : IFilterFunction | ||
| { | ||
|
|
||
| #region IFilterFunction Members | ||
|
|
||
| public List<IWebElement> FilterElements(IList<IWebElement> allElements, string filterValue) | ||
| { | ||
| List<IWebElement> toReturn = new List<IWebElement>(); | ||
| foreach (IWebElement element in allElements) | ||
| { | ||
| if (ShouldAdd(element, filterValue)) | ||
| { | ||
| toReturn.Add(element); | ||
| } | ||
| } | ||
|
|
||
| return toReturn; | ||
| } | ||
|
|
||
| #endregion | ||
|
|
||
| protected abstract bool ShouldAdd(IWebElement element, string filterValue); | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
...WebdriverBackedSelenium/Internal/SeleniumEmulation/FilterFunctions/IndexFilterFunction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using OpenQA.Selenium; | ||
|
|
||
| namespace Selenium.Internal.SeleniumEmulation.FilterFunctions | ||
| { | ||
| internal class IndexFilterFunction : IFilterFunction | ||
| { | ||
| #region IFilterFunction Members | ||
|
|
||
| public List<IWebElement> FilterElements(IList<IWebElement> allElements, string filterValue) | ||
| { | ||
| int index = -1; | ||
| if (int.TryParse(filterValue, out index)) | ||
| { | ||
| if (index < allElements.Count) | ||
| { | ||
| return new List<IWebElement>() { allElements[index] }; | ||
| } | ||
| } | ||
|
|
||
| throw new SeleniumException("Element with index " + filterValue + " not found"); | ||
| } | ||
|
|
||
| #endregion | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
.../WebdriverBackedSelenium/Internal/SeleniumEmulation/FilterFunctions/NameFilterFunction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using OpenQA.Selenium; | ||
|
|
||
| namespace Selenium.Internal.SeleniumEmulation.FilterFunctions | ||
| { | ||
| internal class NameFilterFunction : BaseFilterFunction | ||
| { | ||
| protected override bool ShouldAdd(IWebElement element, string filterValue) | ||
| { | ||
| String name = element.GetAttribute("name"); | ||
| return filterValue == name; | ||
| } | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...WebdriverBackedSelenium/Internal/SeleniumEmulation/FilterFunctions/ValueFilterFunction.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using OpenQA.Selenium; | ||
|
|
||
| namespace Selenium.Internal.SeleniumEmulation.FilterFunctions | ||
| { | ||
| internal class ValueFilterFunction : BaseFilterFunction | ||
| { | ||
| protected override bool ShouldAdd(IWebElement element, string filterValue) | ||
| { | ||
| string elementValue = element.Value; | ||
| return filterValue == elementValue; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 63 additions & 1 deletion
64
...WebdriverBackedSelenium/Internal/SeleniumEmulation/LookupStrategies/NameLookupStrategy.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,75 @@ | ||
| using System; | ||
| using OpenQA.Selenium; | ||
| using System.Collections.Generic; | ||
| using Selenium.Internal.SeleniumEmulation; | ||
| using Selenium.Internal.SeleniumEmulation.FilterFunctions; | ||
| using System.Collections.ObjectModel; | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| namespace Selenium | ||
| { | ||
| internal class NameLookupStrategy : ILookupStrategy | ||
| { | ||
| private Dictionary<string, IFilterFunction> filterFunctions = new Dictionary<string, IFilterFunction>(); | ||
| private Regex nameAndValueMatcherRegex = new Regex("^([A-Za-z]+)=(.+)"); | ||
|
|
||
| public NameLookupStrategy() | ||
| { | ||
| filterFunctions.Add("value", new ValueFilterFunction()); | ||
| filterFunctions.Add("name", new NameFilterFunction()); | ||
| filterFunctions.Add("index", new IndexFilterFunction()); | ||
| } | ||
|
|
||
| public IWebElement Find(OpenQA.Selenium.IWebDriver driver, string use) | ||
| { | ||
| return driver.FindElement(By.Name(use)); | ||
| string[] parts = use.Split(new char[] { ' ' }); | ||
|
|
||
| ReadOnlyCollection<IWebElement> allElements = driver.FindElements(By.Name(parts[0])); | ||
| List<IWebElement> filteredElements = new List<IWebElement>(allElements); | ||
|
|
||
| for (int i = 1; i < parts.Length; i++) | ||
| { | ||
| IFilterFunction filterBy = GetFilterFunction(parts[i]); | ||
|
|
||
| if (filterBy == null) | ||
| { | ||
| throw new SeleniumException(use + " not found. Cannot find filter for: " + parts[i]); | ||
| } | ||
|
|
||
| string filterValue = GetFilterValue(parts[i]); | ||
| filteredElements = filterBy.FilterElements(allElements, filterValue); | ||
| } | ||
|
|
||
| if (filteredElements != null && filteredElements.Count > 0) | ||
| { | ||
| return filteredElements[0]; | ||
| } | ||
|
|
||
| throw new SeleniumException(use + " not found"); | ||
| } | ||
|
|
||
| private string GetFilterValue(string originalFilterValue) | ||
| { | ||
| Match filterValueMatch = nameAndValueMatcherRegex.Match(originalFilterValue); | ||
| if (filterValueMatch.Success) | ||
| { | ||
| return filterValueMatch.Groups[2].ToString(); | ||
| } | ||
| return originalFilterValue; | ||
| } | ||
|
|
||
| private IFilterFunction GetFilterFunction(string originalFilter) | ||
| { | ||
| string filterName = "value"; | ||
|
|
||
| Match filterValueMatch = nameAndValueMatcherRegex.Match(originalFilter); | ||
| if (filterValueMatch.Success) | ||
| { | ||
| filterName = filterValueMatch.Groups[1].ToString(); | ||
| } | ||
|
|
||
| return filterFunctions[filterName]; | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.