Merge pull request #35 from imonteroperez/resolve-branches

Bugfix autoresolve test reference on different stage name

Author: imonteroperez

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestAction.java

@@ -100,11 +100,11 @@ public JiraTestAction(JiraTestData testData, CaseResult test) {
 
         this.testData = testData;
         this.test = test;
-        issueKey = TestToIssueMapping.getInstance().getTestIssueKey(job, test.getId());
-        if (issueKey != null) {
+        for (String key: JiraUtils.searchIssueKeys(job, testData.getEnvVars(), test)) {
+            issueKey = key;
             IssueRestClient issueRestClient = JiraUtils.getJiraDescriptor().getRestClient().getIssueClient();
             try {
-                Issue issue = issueRestClient.getIssue(issueKey).claim();
+                Issue issue = issueRestClient.getIssue(key).claim();
                 issueStatus = issue.getStatus().getName();
                 issueSummary = issue.getSummary();
                 JiraTestDataPublisher.JiraTestDataPublisherDescriptor jiraDescriptor = JiraUtils.getJiraDescriptor();

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java

@@ -237,26 +237,25 @@ private boolean resolveIssues(TaskListener listener, Job project, Job job,
         boolean solved = false;
         try {
             for(CaseResult test : testCaseResults) {
-                if(test.isPassed() && test.getPreviousResult() != null && test.getPreviousResult().isFailed()
-                        && TestToIssueMapping.getInstance().getTestIssueKey(job, test.getId()) != null) {
+                if(test.isPassed() && test.getPreviousResult() != null && test.getPreviousResult().isFailed()) {
                     synchronized (test.getId()) {
-                        String issueKey = TestToIssueMapping.getInstance().getTestIssueKey(job, test.getId());
-                        IssueRestClient issueRestClient = getDescriptor().getRestClient().getIssueClient();
-                        Issue issue = issueRestClient.getIssue(issueKey).claim();
-                        boolean transitionExecuted = false;
-                        for (Transition transition : issueRestClient.getTransitions(issue).claim()) {
-                            if (transition.getName().toLowerCase().contains("resolve")) {
-                                issueRestClient.transition(issue, new TransitionInput(transition.getId()));
-                                transitionExecuted = true;
-                                solved = true;
-                                break;
+                        for (String issueKey: JiraUtils.searchIssueKeys(job, envVars, test)) {
+                            IssueRestClient issueRestClient = getDescriptor().getRestClient().getIssueClient();
+                            Issue issue = issueRestClient.getIssue(issueKey).claim();
+                            boolean transitionExecuted = false;
+                            for (Transition transition : issueRestClient.getTransitions(issue).claim()) {
+                                if (transition.getName().toLowerCase().contains("resolve")) {
+                                    issueRestClient.transition(issue, new TransitionInput(transition.getId()));
+                                    transitionExecuted = true;
+                                    solved = true;
+                                    break;
+                                }
+                            }
+        
+                            if (!transitionExecuted) {
+                                listener.getLogger().println("Could not find transition to resolve issue " + issueKey);
                             }
                         }
-    
-                        if (!transitionExecuted) {
-                            listener.getLogger().println("Could not find transition to resolve issue " + issueKey);
-                        }
-    
                     }
                 }
             }

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraUtils.java

@@ -135,6 +135,35 @@ public static String createIssue(Job job, Job project, EnvVars envVars, CaseResu
         }
     }
 
+    /**
+     * Given a test case result, it searchs for all the issue keys related with it
+     * from the local issue map or from the Jira server  
+     * @param job
+     * @param envVars
+     * @param test
+     * @return related issue keys from issue map or from Jira server
+     * @throws RestClientException
+     */
+    public static Set<String> searchIssueKeys(Job job, EnvVars envVars, CaseResult test) throws RestClientException {
+        synchronized (test.getId()) {
+            Set<String> issueKeys = new HashSet<>();
+            String issueKey = TestToIssueMapping.getInstance().getTestIssueKey(job, test.getId());
+            if (StringUtils.isNotBlank(issueKey)) {
+                issueKeys.add(issueKey);
+                return issueKeys;
+            }
+            
+            IssueInput issueInput = JiraUtils.createIssueInput(job, test, envVars);
+            SearchResult searchResult = JiraUtils.findIssues(job, test, envVars, issueInput);
+            if (searchResult != null && searchResult.getTotal() > 0) {
+                for (Issue issue: searchResult.getIssues()) {
+                    issueKeys.add(issue.getKey());
+                }
+            }
+            return issueKeys;
+        }
+    }
+    
     private static IssueInput createIssueInput(Job project, TestResult test, EnvVars envVars) {
         final IssueInputBuilder newIssueBuilder = new IssueInputBuilder(
                 JobConfigMapping.getInstance().getProjectKey(project),