Merge pull request #65 from ikedam/feature/JENKINS-22705_FixBadParame…

…terName [JENKINS-22705] Fixed "Use files in matrix child builds" to work
jenkinsci · Apr 26, 2014 · 6ffdde8 · 6ffdde8
2 parents 3ac46d0 + 4a85bae
commit 6ffdde8
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java
@@ -49,20 +49,20 @@ public class FileBuildParameters extends AbstractBuildParameters {
 
 	/*properties used for a matrix project*/
 	private final boolean useMatrixChild;
-	private final String combinatioFilter;
+	private final String combinationFilter;
 	private final boolean onlyExactRuns;
 
 	@DataBoundConstructor
-	public FileBuildParameters(String propertiesFile, String encoding, boolean failTriggerOnMissing, boolean useMatrixBuild, String combinationFilter, boolean onlyExactRuns) {
+	public FileBuildParameters(String propertiesFile, String encoding, boolean failTriggerOnMissing, boolean useMatrixChild, String combinationFilter, boolean onlyExactRuns) {
 		this.propertiesFile = propertiesFile;
 		this.encoding = Util.fixEmptyAndTrim(encoding);
 		this.failTriggerOnMissing = failTriggerOnMissing;
-		this.useMatrixChild = useMatrixBuild;
+		this.useMatrixChild = useMatrixChild;
 		if (this.useMatrixChild) {
-			this.combinatioFilter = combinationFilter;
+			this.combinationFilter = combinationFilter;
 			this.onlyExactRuns = onlyExactRuns;
 		} else {
-			this.combinatioFilter = null;
+			this.combinationFilter = null;
 			this.onlyExactRuns = false;
 		}
 	}
@@ -147,14 +147,14 @@ public boolean apply(@Nullable MatrixRun run) {
 						if (run == null) {
 							return false;
 						}
-						if (StringUtils.isBlank(getCombinatioFilter())) {
+						if (StringUtils.isBlank(getCombinationFilter())) {
 							// no combination filter stands for all children.
 							return true;
 						}
 						Combination c = run.getParent().getCombination();
 						AxisList axes = run.getParent().getParent().getAxes();
 
-						return c.evalGroovyExpression(axes, getCombinatioFilter());
+						return c.evalGroovyExpression(axes, getCombinationFilter());
 					}
 				}
 			);
@@ -179,8 +179,8 @@ public boolean isUseMatrixChild() {
 		return useMatrixChild;
 	}
 
-	public String getCombinatioFilter() {
-		return combinatioFilter;
+	public String getCombinationFilter() {
+		return combinationFilter;
 	}
 
 	public boolean isOnlyExactRuns() {

diff --git a/src/main/resources/hudson/plugins/parameterizedtrigger/FileBuildParameters/config.jelly b/src/main/resources/hudson/plugins/parameterizedtrigger/FileBuildParameters/config.jelly
@@ -9,7 +9,7 @@
   <!-- When rendered via Ajax, configFor is available only when Jenkins >= 1.495 -->
   <j:if test="${(configFor == null or configFor == 'publisher') and descriptor.isMatrixProject(it)}">
     <!-- Here is displayed only for matrix project-->
-    <f:optionalBlock field="useMatrixChild" title="${%Use files in matrix child builds}">
+    <f:optionalBlock field="useMatrixChild" title="${%Use files in matrix child builds}" inline="true">
       <f:entry field="combinationFilter" title="Combination Filter">
         <f:textbox />
       </f:entry>

diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildTriggerConfigTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildTriggerConfigTest.java
@@ -54,6 +54,7 @@
 import hudson.util.FormValidation;
 
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
+import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.SingleFileSCM;
 import org.jvnet.hudson.test.ExtractResourceSCM;
@@ -708,4 +709,42 @@ public void testMatrixBuildsOnlyExactRuns() throws Exception {
             build.delete();
         }
     }
+
+    @Bug(22705)
+    public void testMatrixBuildsConfiguration() throws Exception {
+        FreeStyleProject downstream = createFreeStyleProject();
+
+        MatrixProject upstream = createMatrixProject();
+        upstream.setAxes(new AxisList(new TextAxis("axis1", "value1", "value2")));
+        upstream.getPublishersList().add(new BuildTrigger(
+                new BuildTriggerConfig(downstream.getFullName(), ResultCondition.SUCCESS, true, Arrays.<AbstractBuildParameters>asList(
+                        new FileBuildParameters("properties.txt", "UTF-8", true, true, "axis1=value1", true)
+                ))
+        ));
+        upstream.save();
+
+        String upstreamName = upstream.getFullName();
+
+        WebClient wc = createWebClient();
+        submit(wc.getPage(upstream, "configure").getFormByName("config"));
+
+        upstream = jenkins.getItemByFullName(upstreamName, MatrixProject.class);
+        assertNotNull(upstream);
+
+        BuildTrigger trigger = upstream.getPublishersList().get(BuildTrigger.class);
+        assertNotNull(trigger);
+
+        assertEquals(1, trigger.getConfigs().size());
+
+        BuildTriggerConfig config = trigger.getConfigs().get(0);
+
+        assertEquals(1, config.getConfigs().size());
+        FileBuildParameters p = (FileBuildParameters)config.getConfigs().get(0);
+        assertEquals("properties.txt", p.getPropertiesFile());
+        assertEquals("UTF-8", p.getEncoding());
+        assertTrue(p.getFailTriggerOnMissing());
+        assertTrue(p.isUseMatrixChild());
+        assertEquals("axis1=value1", p.getCombinationFilter());
+        assertTrue(p.isOnlyExactRuns());
+    }
 }