[feature]

src/main/java/com/zjty/autotest/common/action/CommandType.java

@@ -26,6 +26,12 @@ public interface CommandType {
 
     String CLICK = "click";
 
+    String MOUSE_DOWN = "mouseDownAt";
+
+    String MOUSE_MOVE = "mouseMoveAt";
+
+    String MOUSE_UP = "mouseUpAt";
+
     String DOUBLE_CLICK = "doubleClick";
 
     String CLOSE = "close";

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

@@ -69,7 +69,7 @@ public class SeleniumExecutor {
 
     private Date endTime = null;
 
-    private Long costTime = 0L;
+    private Long costTime = -1L;
 
     private Integer finished = 0;
 
@@ -98,7 +98,6 @@ public class SeleniumExecutor {
             name = testCase.getName();
             this.params = params;
             List<Command> commands = testCase.getCommands();
-            total = commands.size();
             //根据浏览器 获取driver
             this.browser = browser;
             if (nonNull(headless)) {
@@ -111,6 +110,8 @@ public class SeleniumExecutor {
                 Step step = actCommand(command);
                 if (nonNull(step)) {
                     steps.add(step);
+                } else {
+                    total--;
                 }
                 finished = steps.size();
                 Report report = getReport();
@@ -230,7 +231,7 @@ public class SeleniumExecutor {
                         success = true;
                         break;
                     case CLICK:
-                        content = format("点击元素:[%s]", target);
+                        content = format("单击:[%s]", target);
                         element = locateElement(target);
                         if (isNull(element)) {
                             element = getElement(targets);
@@ -255,7 +256,7 @@ public class SeleniumExecutor {
                         }
                         break;
                     case DOUBLE_CLICK:
-                        content = format("双击元素:[%s]", target);
+                        content = format("双击:[%s]", target);
                         element = locateElement(target);
                         if (isNull(element)) {
                             element = getElement(targets);
@@ -279,6 +280,78 @@ public class SeleniumExecutor {
                             success = false;
                         }
                         break;
+                    case MOUSE_DOWN:
+                        content = format("长单击:[%s]", target);
+                        element = locateElement(target);
+                        if (isNull(element)) {
+                            element = getElement(targets);
+                        }
+                        if (nonNull(element)) {
+                            boolean newWindow = nonNull(command.getOpensWindow()) && command.getOpensWindow();
+                            if (newWindow) {
+                                seleniumHelper.setHistoryHandles(driver.getWindowHandles());
+                            }
+                            new Actions(driver).moveToElement(element).clickAndHold().perform();
+                            seleniumHelper.waitSomeTime();
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = true;
+                            if (newWindow) {
+                                seleniumHelper.getHandleMap().put(command.getWindowHandleName(), getWindowHandle());
+                            }
+                        } else {
+                            message = "无法定位该元素";
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = false;
+                        }
+                        break;
+                    case MOUSE_MOVE:
+                        content = format("鼠标移动至:[%s]", target);
+                        element = locateElement(target);
+                        if (isNull(element)) {
+                            element = getElement(targets);
+                        }
+                        if (nonNull(element)) {
+                            boolean newWindow = nonNull(command.getOpensWindow()) && command.getOpensWindow();
+                            if (newWindow) {
+                                seleniumHelper.setHistoryHandles(driver.getWindowHandles());
+                            }
+                            new Actions(driver).moveToElement(element).perform();
+                            seleniumHelper.waitSomeTime();
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = true;
+                            if (newWindow) {
+                                seleniumHelper.getHandleMap().put(command.getWindowHandleName(), getWindowHandle());
+                            }
+                        } else {
+                            message = "无法定位该元素";
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = false;
+                        }
+                        break;
+                    case MOUSE_UP:
+                        content = format("停止长按:[%s]", target);
+                        element = locateElement(target);
+                        if (isNull(element)) {
+                            element = getElement(targets);
+                        }
+                        if (nonNull(element)) {
+                            boolean newWindow = nonNull(command.getOpensWindow()) && command.getOpensWindow();
+                            if (newWindow) {
+                                seleniumHelper.setHistoryHandles(driver.getWindowHandles());
+                            }
+                            new Actions(driver).moveToElement(element).release().perform();
+                            seleniumHelper.waitSomeTime();
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = true;
+                            if (newWindow) {
+                                seleniumHelper.getHandleMap().put(command.getWindowHandleName(), getWindowHandle());
+                            }
+                        } else {
+                            message = "无法定位该元素";
+                            costTime = System.currentTimeMillis() - stepStartTime;
+                            success = false;
+                        }
+                        break;
                     case SELECT:
                         String label = seleniumHelper.getValue(value);
                         content = format("下拉框选择:[%s]", label);
@@ -462,8 +535,8 @@ public class SeleniumExecutor {
         startTime = null;
         endTime = null;
         costTime = -1L;
-        finished = -1;
-        total = -1;
+        finished = 0;
+        total = 0;
         steps.clear();
         if (nonNull(params)) {
             params.clear();