[JENKINS-30206] WorkflowParameterDefinitionBranchProperty working fine from a test at least.

jglick · jglick · commit 9c7fab4f6ba5 · 2015-08-31T09:03:34.000-04:00
Originally-Committed-As: b19985d062703304ba317a8f82743187469a4f27
diff --git a/multibranch/src/test/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowParameterDefinitionBranchPropertyTest.java b/multibranch/src/test/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowParameterDefinitionBranchPropertyTest.java
@@ -25,21 +25,38 @@
 package org.jenkinsci.plugins.workflow.multibranch;
 
 import hudson.model.DescriptorVisibilityFilter;
+import hudson.model.ParameterDefinition;
+import hudson.model.ParametersAction;
+import hudson.model.StringParameterDefinition;
+import hudson.model.StringParameterValue;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import jenkins.branch.BranchProperty;
 import jenkins.branch.BranchPropertyDescriptor;
+import jenkins.branch.BranchSource;
 import jenkins.branch.BuildRetentionBranchProperty;
+import jenkins.branch.DefaultBranchPropertyStrategy;
 import jenkins.branch.RateLimitBranchProperty;
+import jenkins.plugins.git.GitSCMSource;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import static org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectTest.findBranchProject;
+import org.jenkinsci.plugins.workflow.steps.scm.GitSampleRepoRule;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.junit.ClassRule;
 import org.junit.Rule;
+import org.jvnet.hudson.test.BuildWatcher;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 public class WorkflowParameterDefinitionBranchPropertyTest {
 
+    @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
     @Rule public JenkinsRule r = new JenkinsRule();
+    @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
 
     @Test public void propertyVisible() throws Exception {
         WorkflowMultiBranchProject p = r.jenkins.createProject(WorkflowMultiBranchProject.class, "p");
@@ -56,6 +73,25 @@ public class WorkflowParameterDefinitionBranchPropertyTest {
         assertEquals(expected, clazzes);
     }
 
-    // TODO can configure property and pass parameters to branch projects
+    @Issue("JENKINS-30206")
+    @Test public void useParameter() throws Exception {
+        sampleRepo.init();
+        sampleRepo.write("Jenkinsfile", "echo \"received ${myparam}\"");
+        sampleRepo.git("add", "Jenkinsfile");
+        sampleRepo.git("commit", "--all", "--message=flow");
+        WorkflowMultiBranchProject mp = r.jenkins.createProject(WorkflowMultiBranchProject.class, "p");
+        WorkflowParameterDefinitionBranchProperty prop = new WorkflowParameterDefinitionBranchProperty();
+        prop.setParameterDefinitions(Collections.<ParameterDefinition>singletonList(new StringParameterDefinition("myparam", "default value")));
+        mp.getSourcesList().add(new BranchSource(new GitSCMSource(null, sampleRepo.toString(), "", "*", "", false), new DefaultBranchPropertyStrategy(new BranchProperty[] {prop})));
+        WorkflowJob p = findBranchProject(mp, "master");
+        assertEquals(1, mp.getItems().size());
+        r.waitUntilNoActivity();
+        WorkflowRun b1 = p.getLastBuild();
+        assertEquals(1, b1.getNumber());
+        r.assertLogContains("received default value", b1);
+        WorkflowRun b2 = r.assertBuildStatusSuccess(p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("myparam", "special value"))));
+        assertEquals(2, b2.getNumber());
+        r.assertLogContains("received special value", b2);
+    }
 
 }
