Add default variable name for ReleaseNotes generation.

JENKINS-30829
jenkinsci · Oct 26, 2015 · dc14647 · dc14647
1 parent 23ee171
commit dc14647
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/jira/JiraCreateReleaseNotes.java b/src/main/java/hudson/plugins/jira/JiraCreateReleaseNotes.java
@@ -32,9 +32,12 @@ public String getDisplayName() {
         public boolean isApplicable(final AbstractProject<?, ?> item) {
             return true;
         }
+
     }
 
     public static final String DEFAULT_FILTER = "status in (Resolved, Closed)";
+    public static final String DEFAULT_ENVVAR_NAME = "RELEASE_NOTES";
+
     private String jiraEnvironmentVariable;
     private String jiraProjectKey;
     private String jiraRelease;
@@ -54,7 +57,7 @@ public JiraCreateReleaseNotes(final String jiraProjectKey,
                                   final String jiraFilter) {
         this.jiraRelease = jiraRelease;
         this.jiraProjectKey = jiraProjectKey;
-        this.jiraEnvironmentVariable = jiraEnvironmentVariable;
+        this.jiraEnvironmentVariable = defaultIfEmpty(jiraEnvironmentVariable, DEFAULT_ENVVAR_NAME);
         this.jiraFilter = defaultIfEmpty(jiraFilter, DEFAULT_FILTER);
     }
 

diff --git a/...in/resources/hudson/plugins/jira/JiraCreateReleaseNotes/help-jiraEnvironmentVariable.html b/...in/resources/hudson/plugins/jira/JiraCreateReleaseNotes/help-jiraEnvironmentVariable.html
@@ -1,4 +1,4 @@
 <div>
-    <p>Specify the environment variable to which the release notes will be stored.</p>
+    <p>Specify the environment variable to which the release notes will be stored, defaults to RELEASE_NOTES.</p>
     <p>This can be used in another build step which supports environments. </p>
 </div>
diff --git a/src/test/java/hudson/plugins/jira/JiraCreateReleaseNotesTest.java b/src/test/java/hudson/plugins/jira/JiraCreateReleaseNotesTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(MockitoJUnitRunner.class)
 public class JiraCreateReleaseNotesTest {
@@ -72,6 +72,12 @@ else if (expanded.equals(JIRA_RELEASE_PARAM))
 
     }
 
+    @Test
+    public void testDefaults(){
+        JiraCreateReleaseNotes jcrn = new JiraCreateReleaseNotes(JIRA_PRJ,JIRA_RELEASE,"");
+        assertEquals(JiraCreateReleaseNotes.DEFAULT_ENVVAR_NAME, jcrn.getJiraEnvironmentVariable());
+        assertEquals(JiraCreateReleaseNotes.DEFAULT_FILTER, jcrn.getJiraFilter());
+    }
 
     @Test
     public void jiraApiCallDefaultFilter() throws InterruptedException, IOException {