调整布局判断的顺序以及布局错误时照样操作

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

@@ -155,7 +155,6 @@ public class SeleniumExecutor {
             for (String msg : messages) {
                 message.append(msg);
                 message.append(";");
-
             }
             log.info("遍历完毕...");
             measure = new Measure(
@@ -211,19 +210,6 @@ public class SeleniumExecutor {
         boolean success = false;
         try {
             if (isEnabled(element)) {
-                Boolean locationMatch = checkLocation(element);
-                if (!locationMatch) {
-                    message = "布局错误";
-                    log.error("error:布局错误");
-                    historyAttributes.add(attributes);
-                    currentHistoryAttributes.add(attributes);
-                    return new ElementDetail(
-                            type,
-                            (int) responseTime,
-                            false,
-                            message
-                    );
-                }
                 long startTime = System.currentTimeMillis();
                 if (Objects.equals(actType, INPUT)) {
                     log.info("Input操作 元素 ----- tag：[{}] ------ text:[{}] ---- attrs:[{}]", element.getTagName(), element.getText(), attributes);
@@ -242,10 +228,17 @@ public class SeleniumExecutor {
                 responseTime = endTime - startTime;
                 Alert alert = ExpectedConditions.alertIsPresent().apply(driver);
                 String jsMsg = checkJsError();
+                Boolean locationMatch = checkLocation(element);
+                if (!locationMatch) {
+                    message = "布局错误";
+                    success = false;
+                    log.error("error:布局错误");
+                }
                 if (nonNull(alert)) {
                     message = "error:出现警告窗：" + alert.getText();
                     alert.accept();
                     success = false;
+                    log.error("error:出现警告窗:{}", alert.getText());
                 } else if (nonNull(jsMsg)) {
                     message = jsMsg;
                     success = false;