Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Fix incorrect locator deprecation warnings #68

Merged
merged 3 commits into from
Jun 26, 2019
Merged

Fix incorrect locator deprecation warnings #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a598dc0
Merge tag '3.14.0.0'
Hi-Fi Jan 20, 2019
d5e48a4
Merge tag '3.141.59.2' of github.com:Hi-Fi/robotframework-seleniumlib…
Hi-Fi Feb 10, 2019
4122812
Fix incorrect locator deprecation warnings
Logima Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/Element.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ public void clickLink(String locator) {
public ArrayList<String> getAllLinks() {
ArrayList<String> ret = new ArrayList<String>();

List<WebElement> elements = elementFind("tag=a", false, false, "a");
List<WebElement> elements = elementFind("tag:a", false, false, "a");
for (WebElement element : elements) {
ret.add(element.getAttribute("id"));
}
Expand Down Expand Up @@ -861,8 +861,8 @@ public void pageShouldNotContainImage(String locator, String...params) {
"If you wish to assert the number of located elements, use `Xpath Should Match X Times`.")
@ArgumentNames({ "xpath" })
public int getMatchingXpathCount(String xpath) {
if (!xpath.startsWith("xpath=")) {
xpath = "xpath=" + xpath;
if (!xpath.startsWith("xpath=") && !xpath.startsWith("xpath:")) {
xpath = "xpath:" + xpath;
}
List<WebElement> elements = elementFind(xpath, false, false);

Expand All @@ -874,8 +874,8 @@ public int getMatchingXpathCount(String xpath) {
public void xpathShouldMatchXTimes(String xpath, int expectedXpathCount, String...params) {
String message = robot.getParamsValue(params, 0, "");
String logLevel = robot.getParamsValue(params, 1, "INFO");
if (!xpath.startsWith("xpath=")) {
xpath = "xpath=" + xpath;
if (!xpath.startsWith("xpath=") && !xpath.startsWith("xpath:")) {
xpath = "xpath:" + xpath;
}
List<WebElement> elements = elementFind(xpath, false, false);
int actualXpathCount = elements.size();
Expand Down Expand Up @@ -932,7 +932,7 @@ protected boolean frameContains(String locator, String text) {
}

protected boolean isTextPresent(String text) {
String locator = String.format("xpath=//*[contains(., %s)]", escapeXpathValue(text));
String locator = String.format("xpath://*[contains(., %s)]", escapeXpathValue(text));

return isElementPresent(locator);
}
Expand Down Expand Up @@ -1015,7 +1015,7 @@ protected boolean pageContains(String text) {
return true;
}

List<WebElement> elements = elementFind("xpath=//frame|//iframe", false, false);
List<WebElement> elements = elementFind("xpath://frame|//iframe", false, false);
Iterator<WebElement> it = elements.iterator();
while (it.hasNext()) {
current.switchTo().frame(it.next());
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/FormElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void submitForm() {
public void submitForm(String locator) {
logging.info(String.format("Submitting form '%s'.", locator));
if (locator == null) {
locator = "xpath=//form";
locator = "xpath://form";
}
List<WebElement> webElements = element.elementFind(locator, true, true, "form");
webElements.get(0).submit();
Expand Down Expand Up @@ -428,13 +428,13 @@ protected WebElement getCheckbox(String locator) {
}

protected List<WebElement> getRadioButtons(String groupName) {
String xpath = String.format("xpath=//input[@type='radio' and @name='%s']", groupName);
String xpath = String.format("xpath://input[@type='radio' and @name='%s']", groupName);
logging.debug("Radio group locator: " + xpath);
return element.elementFind(xpath, false, true);
}

protected WebElement getRadioButtonWithValue(String groupName, String value) {
String xpath = String.format("xpath=//input[@type='radio' and @name='%s' and (@value='%s' or @id='%s')]",
String xpath = String.format("xpath://input[@type='radio' and @name='%s' and (@value='%s' or @id='%s')]",
groupName, value, value);
logging.debug("Radio group locator: " + xpath);
return element.elementFind(xpath, true, true).get(0);
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/github/markusbernhardt/seleniumlibrary/locators/TableElementFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,14 @@ protected static void addLocatorSuffix(Map<String, List<String>> locatorSuffixes
protected static List<String> parseTableLocator(String tableLocator, String locationMethod) {
String tableLocatorType = null;

if (tableLocator.startsWith("xpath=")) {
if (tableLocator.startsWith("xpath=") || tableLocator.startsWith("xpath:")) {
tableLocatorType = "xpath.";
} else if (tableLocator.startsWith("jquery=") || tableLocator.startsWith("sizzle=")) {
} else if (tableLocator.startsWith("jquery=") || tableLocator.startsWith("jquery:") ||
tableLocator.startsWith("sizzle=") || tableLocator.startsWith("sizzle:")) {
tableLocatorType = "sizzle.";
} else {
if (!tableLocator.startsWith("css=")) {
tableLocator = String.format("css=table#%s", tableLocator);
if (!tableLocator.startsWith("css=") && !tableLocator.startsWith("css:")) {
tableLocator = String.format("css:table#%s", tableLocator);
}
tableLocatorType = "css.";
}
Expand Down