fix the build failure logic

Author: rantoniuk

src/main/java/hudson/plugins/jira/VersionCreator.java

@@ -42,22 +42,27 @@ protected boolean perform(
             List<ExtendedVersion> existingVersions =
                     Optional.ofNullable(session.getVersions(realProjectKey)).orElse(Collections.emptyList());
 
+            // past logic to fail the build if the version already exists
             if (existingVersions.stream().anyMatch(v -> v.getName().equals(finalRealVersion))) {
                 listener.getLogger().println(Messages.JiraVersionCreator_VersionExists(realVersion, realProjectKey));
-            } else {
-                listener.getLogger().println(Messages.JiraVersionCreator_CreatingVersion(realVersion, realProjectKey));
-                addVersion(realVersion, realProjectKey, session);
+                if (listener instanceof BuildListener) {
+                    ((BuildListener) listener).finished(Result.FAILURE);
+                }
+                return false;
             }
 
+            listener.getLogger().println(Messages.JiraVersionCreator_CreatingVersion(realVersion, realProjectKey));
+            addVersion(realVersion, realProjectKey, session);
+            return true;
         } catch (Exception e) {
             e.printStackTrace(
                     listener.fatalError("Unable to add version %s to Jira project %s", realVersion, realProjectKey, e));
-            if (listener instanceof BuildListener) {
-                ((BuildListener) listener).finished(Result.FAILURE);
-            }
-            return false;
         }
-        return true;
+
+        if (listener instanceof BuildListener) {
+            ((BuildListener) listener).finished(Result.FAILURE);
+        }
+        return false;
     }
 
     /**

src/test/java/hudson/plugins/jira/VersionCreatorTest.java

@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -90,24 +91,41 @@ void createMocks() {
     void callsJiraWithSpecifiedParameters() throws InterruptedException, IOException {
         when(build.getEnvironment(listener)).thenReturn(env);
         when(site.getSession(any())).thenReturn(session);
-        when(session.getVersions(JIRA_PRJ)).thenReturn(Arrays.asList(existingVersion));
 
+        // for new version, verify the addVersion method is called
+        when(session.getVersions(JIRA_PRJ)).thenReturn(null);
         versionCreator.perform(project, JIRA_VER, JIRA_PRJ, build, listener);
-        verify(session).addVersion(versionCaptor.capture(), projectCaptor.capture());
+        verify(session, times(1)).addVersion(versionCaptor.capture(), projectCaptor.capture());
         assertThat(projectCaptor.getValue(), is(JIRA_PRJ));
         assertThat(versionCaptor.getValue(), is(JIRA_VER));
+        verify(logger, times(1)).println(Messages.JiraVersionCreator_CreatingVersion(JIRA_VER, JIRA_PRJ));
+
+        // for existing version, verify the addVersion method is not called
+        reset(session);
+        when(session.getVersions(JIRA_PRJ)).thenReturn(Arrays.asList(existingVersion));
+        versionCreator.perform(project, JIRA_VER, JIRA_PRJ, build, listener);
+        verify(session, times(0)).addVersion(versionCaptor.capture(), projectCaptor.capture());
+        verify(logger, times(1)).println(Messages.JiraVersionCreator_VersionExists(JIRA_VER, JIRA_PRJ));
     }
 
     @Test
     void expandsEnvParameters() throws InterruptedException, IOException {
         when(build.getEnvironment(listener)).thenReturn(env);
         when(site.getSession(any())).thenReturn(session);
-        when(session.getVersions(JIRA_PRJ)).thenReturn(Arrays.asList(existingVersion));
 
+        // for new version, verify the addVersion method is called
+        when(session.getVersions(JIRA_PRJ)).thenReturn(null);
         versionCreator.perform(project, JIRA_VER_PARAM, JIRA_PRJ_PARAM, build, listener);
-        verify(session).addVersion(versionCaptor.capture(), projectCaptor.capture());
+        verify(session, times(1)).addVersion(versionCaptor.capture(), projectCaptor.capture());
         assertThat(projectCaptor.getValue(), is(JIRA_PRJ));
         assertThat(versionCaptor.getValue(), is(JIRA_VER));
+
+        // for existing version, verify the addVersion method is called
+        reset(session);
+        when(session.getVersions(JIRA_PRJ)).thenReturn(Arrays.asList(existingVersion));
+        versionCreator.perform(project, JIRA_VER_PARAM, JIRA_PRJ_PARAM, build, listener);
+        verify(session, times(0)).addVersion(versionCaptor.capture(), projectCaptor.capture());
+        verify(logger, times(1)).println(Messages.JiraVersionCreator_VersionExists(JIRA_VER, JIRA_PRJ));
     }
 
     @Test