jasder
/
autest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复使用BeType时不走元素存在判断的问题

This commit is contained in:
彭宇琦 2020-05-12 13:05:34 +08:00
parent abc3941f45
commit df6328c302
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/pres/auxiliary/work/selenium/element/AbstractElement.java
View File

@ -429,7 +429,11 @@ public abstract class AbstractElement {
if (elementInformation.byType == null) { if (elementInformation.byType == null) {
return judgeCommonElementBy(elementInformation.name); return judgeCommonElementBy(elementInformation.name);
} else { } else {
return getBy(elementInformation.name, elementInformation.byType); By by = getBy(elementInformation.name, elementInformation.byType);
if (isExistElement(by, getWaitTime(elementInformation.name)))
return by;
else
throw new TimeoutException("普通元素定位方式类型无法识别：" + by);
} }
} }
@ -443,7 +447,11 @@ public abstract class AbstractElement {
if (elementInformation.byType == null) { if (elementInformation.byType == null) {
return judgeXmlElementBy(elementInformation.name); return judgeXmlElementBy(elementInformation.name);
} else { } else {
return xml.getBy(elementInformation.name, elementInformation.byType); By by = xml.getBy(elementInformation.name, elementInformation.byType);
if (isExistElement(by, getWaitTime(elementInformation.name)))
return by;
else
throw new TimeoutException("普通元素定位方式类型无法识别：" + by);
} }
} }
@ -573,6 +581,8 @@ public abstract class AbstractElement {
default: default:
throw new UnrecognizableLocationModeException("无法识别的定位类型：" + byType); throw new UnrecognizableLocationModeException("无法识别的定位类型：" + byType);
} }
} }
/** /**