改进元素Map匹配机制

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

@@ -104,6 +104,7 @@ public class SeleniumExecutor {
             driver.close();
             checkWindow();
         }
+        driver.quit();
         return new Report(
                 null,
                 project.getId(),
@@ -340,9 +341,7 @@ public class SeleniumExecutor {
         for (int i = 0; i < webElements.size(); i++) {
             WebElement webElement = webElements.get(i);
             Element jElement = jElements.get(i);
-            if (elementMatch(webElement, jElement)) {
-                result.put(jElement.attributes(), webElement);
-            }
+            result.put(jElement.attributes(), webElement);
         }
         return result;
     }
@@ -406,27 +405,8 @@ public class SeleniumExecutor {
     }
 
     private Boolean elementMatch(WebElement webElement, Element element) {
-        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 {
-                if (element.hasText()) {
-                    return attributesMatch && tagMatch && textMatch;
-                } else {
-                    return attributesMatch && tagMatch;
-                }
-            }
-        } catch (StaleElementReferenceException e) {
-            return false;
-        }
+        return element.attributes().asList().stream()
+                .allMatch(attribute -> Objects.equals(attribute.getValue(), webElement.getAttribute(attribute.getKey())));
     }
 
     private Map<Attributes, WebElement> removeHistoryElements(Map<Attributes, WebElement> elements) {