Merge branch 'master' of https://github.com/QASymphony/jenkin-qtest-p…

…lugin
jenkinsci · Jan 26, 2018 · 1aee50f · 1aee50f
2 parents a47ed14 + 542a1db
commit 1aee50f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/qasymphony/ci/plugin/model/AutomationTestResult.java b/src/main/java/com/qasymphony/ci/plugin/model/AutomationTestResult.java
@@ -26,6 +26,8 @@ public class AutomationTestResult {
   private String automationContent;
   private String status;
   private String name;
+
+  private Integer order;
   @JsonProperty("test_step_logs")
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
   private List<AutomationTestStepLog> testLogs;
@@ -125,6 +127,14 @@ public void setBuildURL(String buildURL) {
     this.buildURL = buildURL;
   }
 
+  public Integer getOrder() {
+    return order;
+  }
+
+  public void setOrder(Integer order) {
+    this.order = order;
+  }
+
 
   /**
    * Add testLog and resolve status of testResult

diff --git a/src/main/java/com/qasymphony/ci/plugin/parse/CommonParsingUtils.java b/src/main/java/com/qasymphony/ci/plugin/parse/CommonParsingUtils.java
@@ -54,6 +54,7 @@ public static List<AutomationTestResult> toAutomationTestResults(ParseRequest re
   private static List<AutomationTestResult> useTestMethodAsTestCase(ParseRequest request, List<TestResult> testResults, Date startTime)
     throws Exception {
     Map<String, AutomationTestResult> map = new HashMap<>();
+    int currentTestLogOrder = 0;
 
     for (TestResult testResult : testResults) {
       for (SuiteResult suite : testResult.getSuites()) {
@@ -67,6 +68,7 @@ private static List<AutomationTestResult> useTestMethodAsTestCase(ParseRequest r
 
           if (!map.containsKey(automationContent)) {
             AutomationTestResult testLog = new AutomationTestResult();
+            testLog.setOrder(currentTestLogOrder++);
             testLog.setAutomationContent(automationContent);
             testLog.setExecutedStartDate(startDate);
             testLog.setExecutedEndDate(computeEndTime(startDate, caseResult.getDuration()));
@@ -103,6 +105,7 @@ private static List<AutomationTestResult> useTestMethodAsTestCase(ParseRequest r
   private static List<AutomationTestResult> useClassNameAsTestCase(ParseRequest request, List<TestResult> testResults, Date startTime)
     throws Exception {
     Map<String, AutomationTestResult> map = new HashMap<>();
+    int currentTestLogOrder = 0;
 
     for (TestResult testResult : testResults) {
       for (SuiteResult suite : testResult.getSuites()) {
@@ -117,6 +120,7 @@ private static List<AutomationTestResult> useClassNameAsTestCase(ParseRequest re
             testLog = map.get(caseResult.getClassName());
           } else {
             testLog = new AutomationTestResult();
+            testLog.setOrder(currentTestLogOrder++);
             testLog.setAutomationContent(caseResult.getClassName());
             testLog.setExecutedStartDate(startDate);
             testLog.setExecutedEndDate(computeEndTime(startDate, suite.getDuration()));

diff --git a/src/main/resources/com/qasymphony/ci/plugin/action/PushingResultAction/config.properties b/src/main/resources/com/qasymphony/ci/plugin/action/PushingResultAction/config.properties
@@ -13,7 +13,7 @@ label.class_mode=Each JUnit Test Suite (class) = a qTest Test Case
 label.method_mode=Each JUnit Test Case (method) = a qTest Test Case
 label.releaseOption = Submit test result to a Release as settings in your qTest Manager
 label.existingContainerOption = Submit test results to an existing container
-label.overwriteExistingTestSteps = Overwrite existing test steps and test step logs
+label.overwriteExistingTestSteps = Overwrite existing test steps
 label.container = Container
 label.checkedNewTestRuns = Create new Test Runs every build date
 instruction.testLog= * Test Logs submitted to qTest will be associated with the target Release