GithubStar/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-10-21 08:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tag name selector

Browse Source 
#451
This commit is contained in:
bootstraponline
2013-04-18 15:21:33 -04:00
parent a5261854ea
commit fb13e00456
1 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uiautomator/bootstrap/src/io/appium/android/bootstrap/handler/Find.java
+53 -22
View File
@@ -180,23 +180,46 @@ public class Find extends CommandHandler {
}
} else {
try {
final UiSelector sel = getSelector(strategy, text, multiple);
if (multiple) {
return getSuccessResult(fetchElements(sel, contextId));
} else {
return getSuccessResult(fetchElement(sel, contextId));
Object result = null;
final JSONArray array = new JSONArray();
for (final UiSelector sel : getSelector(strategy, text, multiple)) {
// With multiple selectors, we expect that some elements may not
// exist.
try {
if (!multiple) {
result = fetchElement(sel, contextId);
// Return first element when multiple is false.
if (result != null) {
break;
}
} else {
final JSONArray results = fetchElements(sel, contextId);
for (int a = 0, len = results.length(); a < len; a++) {
array.put(results.get(a));
}
}
} catch (final ElementNotInHashException e) {
} catch (final ElementNotFoundException e) {
}
}
if (multiple) {
result = array;
}
// If there are no results, then return an error.
if (result == null) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
"No element found");
}
return getSuccessResult(result);
} catch (final InvalidStrategyException e) {
return getErrorResult(e.getMessage());
} catch (final ElementNotFoundException e) {
return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT,
e.getMessage());
} catch (final UnallowedTagNameException e) {
return getErrorResult(e.getMessage());
} catch (final AndroidCommandException e) {
return getErrorResult(e.getMessage());
} catch (final ElementNotInHashException e) {
return getErrorResult(e.getMessage());
} catch (final UiObjectNotFoundException e) {
return getErrorResult(e.getMessage());
}
@@ -263,25 +286,36 @@ public class Find extends CommandHandler {
* @throws InvalidStrategyException
* @throws AndroidCommandException
*/
private UiSelector getSelector(final Strategy strategy, final String text,
final Boolean many) throws InvalidStrategyException,
private List<UiSelector> getSelector(final Strategy strategy,
final String text, final Boolean many) throws InvalidStrategyException,
AndroidCommandException, UnallowedTagNameException {
final List<UiSelector> selectors = new ArrayList<UiSelector>();
UiSelector sel = new UiSelector();
switch (strategy) {
case CLASS_NAME:
case TAG_NAME:
String androidClass = AndroidElementClassMap.match(text);
final String androidClass = AndroidElementClassMap.match(text);
sel = sel.className(androidClass);
if (!many) {
sel = sel.instance(0);
}
selectors.add(sel);
// Find both Button and ImageButton when tag name is button
if (androidClass.contentEquals("android.widget.Button")) {
androidClass += "|android.widget.ImageButton";
androidClass = androidClass.replaceAll("([^\\p{Alnum}|])", "\\\\$1");
sel = sel.classNameMatches("^" + androidClass + "$");
} else {
sel = sel.className(androidClass);
UiSelector sel2 = new UiSelector()
.className("android.widget.ImageButton");
if (!many) {
sel2 = sel2.instance(0);
}
selectors.add(sel2);
}
break;
case NAME:
sel = sel.description(text);
if (!many) {
sel = sel.instance(0);
}
break;
case XPATH:
break;
@@ -294,10 +328,7 @@ public class Find extends CommandHandler {
+ strategy.getStrategyName() + " is not valid.");
}
if (!many) {
sel = sel.instance(0);
}
return sel;
return selectors;
}
/**