Merge branch 'master' of git.yfzx.zjtys.com.cn:hct/auto-test

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

@@ -412,22 +412,26 @@ public class SeleniumExecutor {
     }
 
     private Boolean elementMatch(WebElement webElement, Element element) {
-        boolean attributesMatch = element.attributes().asList().stream()
-                .allMatch(attribute -> Objects.equals(attribute.getValue(), webElement.getAttribute(attribute.getKey())));
-        boolean tagMatch = Objects.equals(webElement.getTagName(), element.tagName());
-        boolean textMatch = Objects.equals(webElement.getText(), element.text());
-        if (element.attributes().isEmpty()) {
-            if (element.hasText()) {
-                return tagMatch && textMatch;
-            } else {
-                return tagMatch;
-            }
-        } else {
-            if (element.hasText()) {
-                return attributesMatch && tagMatch && textMatch;
+        try {
+            boolean attributesMatch = element.attributes().asList().stream()
+                    .allMatch(attribute -> Objects.equals(attribute.getValue(), webElement.getAttribute(attribute.getKey())));
+            boolean tagMatch = Objects.equals(webElement.getTagName(), element.tagName());
+            boolean textMatch = Objects.equals(webElement.getText(), element.text());
+            if (element.attributes().isEmpty()) {
+                if (element.hasText()) {
+                    return tagMatch && textMatch;
+                } else {
+                    return tagMatch;
+                }
             } else {
-                return attributesMatch && tagMatch;
+                if (element.hasText()) {
+                    return attributesMatch && tagMatch && textMatch;
+                } else {
+                    return attributesMatch && tagMatch;
+                }
             }
+        } catch (StaleElementReferenceException e) {
+            return false;
         }
     }