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

src/main/java/com/zjty/autotest/config/WebSocketConfig.java

@@ -6,7 +6,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-    @Bean
+//    @Bean
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }

src/main/java/com/zjty/autotest/pojo/report/Detail.java

+package com.zjty.autotest.pojo.report;
+
+/**
+ * <p>Description : autotest
+ * <p>Date : 2020/3/24 11:15
+ * <p>@author : C
+ */
+public class Detail {
+
+    /**
+     * 元素类型
+     */
+    private String type;
+
+    /**
+     * 响应时间
+     */
+    private Integer responseTime;
+
+    /**
+     * 路径
+     */
+    private String url;
+
+    /**
+     * 是否通过
+     */
+    private Boolean success;
+
+    /**
+     * 信息(未通过理由)
+     */
+    private String message;
+}

src/main/java/com/zjty/autotest/pojo/report/Measure.java

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * <p>Description : measurement
  * <p>Date : 2020/1/16 13:39

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

@@ -16,7 +16,6 @@ import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
 import static com.zjty.autotest.common.action.LabelType.*;
@@ -59,7 +58,6 @@ public class SeleniumExecutor {
 
     public Report execute(Project project) {
         driver = WebDriverUtil.getWebDriver(project.getBrowser());
-        driver.manage().timeouts().implicitlyWait(10L, TimeUnit.SECONDS);
         inputs = project.getInputs();
         List<Measure> measures = Lists.newArrayList();
         String os = "";
@@ -137,9 +135,9 @@ public class SeleniumExecutor {
 
     private String act(WebElement element) {
         String message = null;
+        elementIndex++;
         try {
             log.info("正在操作第{}个元素 ------ text:[{}] ----- tag：[{}]", elementIndex + 1, element.getText(), element.getTagName());
-            elementIndex++;
             if (isEnabledAndDisplayed(element)) {
                 if (isEnabledInput(element)) {
                     inputValue(element, inputs);

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

@@ -33,18 +33,11 @@ class AutotestApplicationTests {
         Map<String, String> inputs = Maps.newHashMap();
         inputs.put("name", "root");
         inputs.put("password", "root");
-        System.setProperty("webdriver.firefox.driver", WebDriverUtil.FIRE_FOX_EXE);
-        DesiredCapabilities caps = DesiredCapabilities.chrome();
-        LoggingPreferences logPrefs = new LoggingPreferences();
-        logPrefs.enable(LogType.BROWSER, Level.ALL);
-        caps.setCapability(CapabilityType.LOGGING_PREFS, logPrefs);
-        WebDriver driver = new ChromeDriver();
-        String url = "file:///C:/MyProjects/auto-test/wps/index.html";
-        driver.get(url);
+        String url = "https://www.cnblogs.com/invoker-/";
         Project project = new Project(
                 null,
                 null,
-                "chrome",
+                "firefox",
                 url,
                 Lists.newArrayList()
         );