fix(base): 报告中可以显示完整的数据

kt-base/src/main/java/org/matrix/testNg/report/DataBean.java

@@ -3,6 +3,7 @@ package org.matrix.testNg.report;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.matrix.actuators.checkpoint.CheckPointResult;
 
 import java.util.List;
 
@@ -89,7 +90,7 @@ public class DataBean {
     /**
      * 结果信息
      */
-    private Object resultMessage;
+    private CheckPointResult resultMessage;
 
     /**
      * 用例名称

kt-base/src/main/java/org/matrix/testNg/report/ReporterData.java

@@ -65,41 +65,42 @@ public class ReporterData {
 
     //每条测试用例的细节
     public List<DataBean> testResults(IResultMap map, int status) {
+        DataBean data = new DataBean();
         // 测试结果详细数据
         List<DataBean> list = new ArrayList<DataBean>();
         //工具类
         ReportUnits units = new ReportUnits();
         for (ITestResult result : sortByTime(map.getAllResults())) {
-            DataBean data = new DataBean();
-            data.setDuration(units.formatDuration(result.getEndMillis()
-                    - result.getStartMillis()));
-            data.setParams(units.getParams(result));
-            String params = data.getParams();
-            //testCase主键id
-            String id = params.replace("{id=", "").replace("}", "");
-            log.info("这里是testResults");
-            long caseId = Long.parseLong(id);
+            List<TestCaseExecuteResult> testCaseExecuteResults;
             Map<Long, List<TestCaseExecuteResult>> longListMap = TestPigeon.userResultMap.get(1L);
-            List<TestCaseExecuteResult> testCaseExecuteResults = longListMap.get(caseId);
-            TestCase testCase = java.util.Optional.of(testCaseService.getById(caseId))
-                    .orElseThrow(() -> new GlobalException(String.format("没有找到id = %d 的TestCase", caseId)));
-            data.setTestCaseName(testCase.getName());
-            data.setOutput(Reporter.getOutput(result));
-            data.setDependMethod(units.getDependMethods(result));
-            data.setType(String.valueOf(testCase.getType()));
-            data.setDetail(testCase.getDetail());
-            data.setMoveBefore(testCase.getMoveBefore());
-            data.setMoveAfterCase(testCase.getMoveAfterCase());
-            data.setMoveAfterTest(testCase.getMoveAfterTest());
-            data.setDescription(testCase.getDes());
-            data.setResultMessage("message");
-            data.setThrowable(result.getThrowable());
-            if (result.getThrowable() != null) {
-                data.setStackTrace(result.getThrowable().getStackTrace());
+            Set<Long> longs = longListMap.keySet();
+            for (Long caseId : longs) {
+                TestCase testCase = java.util.Optional.of(testCaseService.getById(caseId))
+                        .orElseThrow(() -> new GlobalException(String.format("没有找到id = %d 的TestCase", caseId)));
+                testCaseExecuteResults = TestPigeon.resultMap.get(caseId);
+                for (TestCaseExecuteResult testCaseExecuteResult : testCaseExecuteResults) {
+                    data.setDuration(units.formatDuration(result.getEndMillis()
+                            - result.getStartMillis()));
+                    data.setParams(units.getParams(result));
+                    CheckPointResult checkPointResult = testCaseExecuteResult.getCheckPointResult();
+                    data.setTestCaseName(testCase.getName());
+                    data.setOutput(Reporter.getOutput(result));
+                    data.setDependMethod(units.getDependMethods(result));
+                    data.setType(String.valueOf(testCase.getType()));
+                    data.setDetail(testCase.getDetail());
+                    data.setMoveBefore(testCase.getMoveBefore());
+                    data.setMoveAfterCase(testCase.getMoveAfterCase());
+                    data.setMoveAfterTest(testCase.getMoveAfterTest());
+                    data.setDescription(testCase.getDes());
+                    data.setResultMessage(checkPointResult);
+                    data.setThrowable(result.getThrowable());
+                    if (result.getThrowable() != null) {
+                        data.setStackTrace(result.getThrowable().getStackTrace());
+                    }
+                }
             }
             list.add(data);
         }
         return list;
     }
-
 }
\ No newline at end of file