JENKINS-50125 Abstract ParametersDefinitionProperty creation in test.

jenkinsci · Apr 23, 2018 · f7b2dee · f7b2dee
1 parent ec0e6c1
commit f7b2dee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/...ionTest/groovy/com/ceilfors/jenkins/plugins/jiratrigger/JiraTriggerIntegrationTest.groovy b/...ionTest/groovy/com/ceilfors/jenkins/plugins/jiratrigger/JiraTriggerIntegrationTest.groovy
@@ -7,8 +7,6 @@ import com.ceilfors.jenkins.plugins.jiratrigger.integration.JulLogLevelRule
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException
 import hudson.model.AbstractBuild
 import hudson.model.FreeStyleProject
-import hudson.model.ParametersDefinitionProperty
-import hudson.model.StringParameterDefinition
 import hudson.model.TaskListener
 import hudson.security.GlobalMatrixAuthorizationStrategy
 import hudson.security.HudsonPrivateSecurityRealm
@@ -135,7 +133,8 @@ class JiraTriggerIntegrationTest extends Specification {
         given:
         def issue = TestUtils.createIssue('TEST-1234')
         def project = jenkins.createJiraCommentTriggeredProject('job')
-        project.addProperty(new ParametersDefinitionProperty([new StringParameterDefinition('PARAM', 'param')]))
+        project.addParameter('PARAM1', 'param1')
+        project.addParameter('PARAM2', 'param2')
         project.addParameterMapping('KEY', 'key')
         jenkins.quietPeriod = 0
 
@@ -148,7 +147,8 @@ class JiraTriggerIntegrationTest extends Specification {
         scheduledProjects.size() != 0
         AbstractBuild build = jenkins.getScheduledBuild(scheduledProjects[0])
         def environment = build.getEnvironment(TaskListener.NULL)
-        environment.get('PARAM') == 'param'
+        environment.get('PARAM1') == 'param1'
+        environment.get('PARAM2') == 'param2'
         environment.get('KEY') == 'TEST-1234'
     }
 

diff --git a/...est/groovy/com/ceilfors/jenkins/plugins/jiratrigger/integration/JiraTriggerProject.groovy b/...est/groovy/com/ceilfors/jenkins/plugins/jiratrigger/integration/JiraTriggerProject.groovy
@@ -4,8 +4,8 @@ import com.ceilfors.jenkins.plugins.jiratrigger.JiraTrigger
 import com.ceilfors.jenkins.plugins.jiratrigger.parameter.CustomFieldParameterMapping
 import com.ceilfors.jenkins.plugins.jiratrigger.parameter.IssueAttributePathParameterMapping
 import hudson.model.FreeStyleProject
-import hudson.model.JobProperty
-
+import hudson.model.ParametersDefinitionProperty
+import hudson.model.StringParameterDefinition
 /**
  * @author ceilfors
  */
@@ -32,8 +32,14 @@ abstract class JiraTriggerProject {
         project.save()
     }
 
-    void addProperty(JobProperty jobProperty) {
-        project.addProperty(jobProperty)
+    void addParameter(String name, String defaultValue) {
+        def parameterDefinition = new StringParameterDefinition(name, defaultValue)
+        ParametersDefinitionProperty pdp = project.getProperty(ParametersDefinitionProperty)
+        if (pdp != null) {
+            pdp.parameterDefinitions.add(parameterDefinition)
+        } else {
+            project.addProperty(new ParametersDefinitionProperty([parameterDefinition]))
+        }
         project.save()
     }