优化元素等待机制

src/main/java/com/zjty/autotest/service/SeleniumExecutor.java

@@ -360,7 +360,7 @@ public class SeleniumExecutor {
                         break;
                     case MOUSE_OVER:
                         content = format("鼠标悬停:[%s]", target);
-                        element = waitForElement(target,targets);
+                        element = waitForElement(target, targets);
                         costTime = System.currentTimeMillis() - stepStartTime;
                         if (nonNull(element)) {
                             movetoElementView(element);
@@ -372,7 +372,7 @@ public class SeleniumExecutor {
                         break;
                     case MOUSE_OUT:
                         content = format("鼠标移开:[%s]", target);
-                        element = waitForElement(target,targets);
+                        element = waitForElement(target, targets);
                         costTime = System.currentTimeMillis() - stepStartTime;
                         if (nonNull(element)) {
                             new Actions(driver).moveToElement(element, 0, 0).perform();
@@ -384,7 +384,7 @@ public class SeleniumExecutor {
                         break;
                     case TYPE:
                         content = format("输入内容:[%s]", value);
-                        element = waitForElement(target,targets);
+                        element = waitForElement(target, targets);
                         costTime = System.currentTimeMillis() - stepStartTime;
                         if (nonNull(element)) {
                             String elementType = element.getAttribute("type");
@@ -405,7 +405,7 @@ public class SeleniumExecutor {
                         break;
                     case SEND_KEYS:
                         content = format("输入按键:[%s]", value);
-                        element = waitForElement(target,targets );
+                        element = waitForElement(target, targets);
                         costTime = System.currentTimeMillis() - stepStartTime;
                         if (nonNull(element)) {
                             String key = seleniumHelper.getKeyForSend(value);
@@ -475,7 +475,7 @@ public class SeleniumExecutor {
         try {
             new WebDriverWait(driver, 3).until(webDriver -> nonNull(getElement(target, targets)));
             WebElement element = getElement(target, targets);
-            if (ExpectedConditions.stalenessOf(element).apply(driver)){
+            if (nonNull(element) && ExpectedConditions.stalenessOf(element).apply(driver)) {
                 element = getElement(target, targets);
             }
             return element;