Merge branch 'master' into ldap

src/main/java/cn/qg/holmes/controller/auto/TestReportController.java

@@ -123,6 +123,7 @@ public class TestReportController {
         int total = sceneTestcaseReports.size();
         int pass = 0;
         int fail = 0;
+        Long totalElapsedTime = 0L;
         for (SceneTestcaseReport sceneTestcaseReport: sceneTestcaseReports) {
             String status = sceneTestcaseReport.getStatus();
             if (status.equals("pass")) {
@@ -130,10 +131,12 @@ public class TestReportController {
             } else if (status.equals("fail")) {
                 fail += 1;
             }
+            totalElapsedTime += sceneTestcaseReport.getElapsedTime();
         }
         map.put("total", total);
         map.put("pass", pass);
         map.put("fail", fail);
+        map.put("totalElapsedTime", totalElapsedTime);
         map.put("list", sceneTestcaseReports);
         return JsonResult.buildSuccessResult(map);
     }

src/main/java/cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java

@@ -113,7 +113,7 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
             String comparator = map.get("comparator");
             String checkpoint = JsonPath.read(response, map.get("check")).toString();
             String expectValue = map.get("expect");
-            boolean result = singleAssertResponse(response, comparator, checkpoint, expectValue);
+            boolean result = singleAssertResponse(comparator, checkpoint, expectValue);
             if (!result) {
                 return false;
             }
@@ -123,13 +123,12 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
 
     /**
      *
-     * @param response
      * @param comparator
      * @param checkpoint
      * @param expectValue
      * @return
      */
-    public boolean singleAssertResponse(String response, String comparator, String checkpoint, String expectValue) {
+    public boolean singleAssertResponse(String comparator, String checkpoint, String expectValue) {
         switch (comparator) {
             case "eq":
                 return checkpoint.equals(expectValue);