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

src/main/java/com/zjty/autotest/pojo/test/ElementMapping.java

+package com.zjty.autotest.pojo.test;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jsoup.nodes.Attributes;
+import org.openqa.selenium.WebElement;
+
+/**
+ * <p>Description : autotest
+ * <p>Date : 2020/3/26 16:25
+ * <p>@author : C
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ElementMapping {
+
+    Integer order;
+
+    WebElement webElement;
+
+    Attributes attributes;
+
+}

src/test/java/com/zjty/autotest/AutotestApplicationTests.java

@@ -9,18 +9,17 @@ import com.zjty.autotest.pojo.test.Project;
 import com.zjty.autotest.service.impl.SeleniumExecutor;
 import com.zjty.autotest.util.WebDriverUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.boot.jaxb.SourceType;
 import org.jsoup.Jsoup;
+import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
 import org.junit.jupiter.api.Test;
-import org.openqa.selenium.*;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.Sleeper;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -35,8 +34,8 @@ class AutotestApplicationTests {
     @Test
     public void execute() throws InterruptedException {
         List<Input> inputs = Lists.newArrayList();
-        inputs.add(new Input(null, null, null, "caozuoyuan"));
         inputs.add(new Input(null, null, null, "caozuoyuan123"));
+        inputs.add(new Input(null, null, null, "caozuoyuan"));
 
         String url = "http://192.168.1.244:8080/person/#/login";
         Project project = new Project(
@@ -57,18 +56,26 @@ class AutotestApplicationTests {
 //        Sleeper.SYSTEM_SLEEPER.sleep(Duration.ofSeconds(2));
 //        String source2 = driver.getPageSource();
 //        System.out.println(Objects.equals(source1,source2));
+
+
         Report report = seleniumExecutor.execute(project);
         for (Measure measure : report.getMeasures()) {
             System.out.println(measure);
         }
 
+
 //        Document document = Jsoup.parse(driver.getPageSource());
 //        List<Element> elements = document.getAllElements().stream()
 //                .filter(element -> element.childrenSize() == 0)
 //                .collect(Collectors.toList());
 //        for (Element element : elements) {
-//            System.out.println(element.attributes());
+//            System.out.println("==============================================");
+//            System.out.println(String.format("tag:%s   text:%s  attrs:%s",element.tagName(),element.text(),element.attributes()));
 //        }
+    }
 
+    private Boolean elementMatch(WebElement webElement, Attributes Attributes) {
+        return Attributes.asList().stream().allMatch(attribute -> Objects.equals(attribute.getValue(), webElement.getAttribute(attribute.getKey())));
     }
+
 }