From 2fe47370d1d70b9dfbe75dd0c32854a9c34b212e Mon Sep 17 00:00:00 2001 From: sghill Date: Wed, 16 Oct 2013 13:29:42 -0400 Subject: [PATCH] Adding ParametersAction#merge(ParametersAction) method with tests. --- .../java/hudson/model/ParametersAction.java | 34 +++++--- .../hudson/model/ParametersActionTest.java | 79 +++++++++++++++++++ 2 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 core/src/test/java/hudson/model/ParametersActionTest.java diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java index c5cab54dea..09aebf7ebf 100644 --- a/core/src/main/java/hudson/model/ParametersAction.java +++ b/core/src/main/java/hudson/model/ParametersAction.java @@ -36,7 +36,6 @@ import hudson.util.VariableResolver; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -45,6 +44,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Sets.newHashSet; + /** * Records the parameter values used for a build. * @@ -164,23 +166,31 @@ public class ParametersAction implements Action, Iterable, Queue * Creates a new {@link ParametersAction} that contains all the parameters in this action * with the overrides / new values given as parameters. */ - public ParametersAction createUpdated(Collection newValues) { - List r = new ArrayList(); + public ParametersAction createUpdated(Collection overrides) { + if(overrides == null) { + return new ParametersAction(parameters); + } + List combinedParameters = newArrayList(overrides); + Set names = newHashSet(); - Set names = new HashSet(); - for (ParameterValue v : newValues) { - names.add(v.name); + for(ParameterValue v : overrides) { + names.add(v.getName()); } - for (Iterator itr = parameters.iterator(); itr.hasNext(); ) { - ParameterValue v = itr.next(); - if (!names.contains(v.getName())) - r.add(v); + for (ParameterValue v : parameters) { + if (!names.contains(v.getName())) { + combinedParameters.add(v); + } } - r.addAll(newValues); + return new ParametersAction(combinedParameters); + } - return new ParametersAction(r); + public ParametersAction merge(ParametersAction overrides) { + if(overrides == null) { + return new ParametersAction(parameters); + } + return createUpdated(overrides.getParameters()); } private Object readResolve() { diff --git a/core/src/test/java/hudson/model/ParametersActionTest.java b/core/src/test/java/hudson/model/ParametersActionTest.java new file mode 100644 index 0000000000..ee565fb50d --- /dev/null +++ b/core/src/test/java/hudson/model/ParametersActionTest.java @@ -0,0 +1,79 @@ +package hudson.model; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; + +public class ParametersActionTest { + + private ParametersAction baseParamsAB; + private StringParameterValue baseA; + + @Before + public void setUp() { + baseA = new StringParameterValue("a", "base-a"); + StringParameterValue baseB = new StringParameterValue("b", "base-b"); + baseParamsAB = new ParametersAction(baseA, baseB); + } + + @Test + public void mergeShouldOverrideParameters() { + StringParameterValue overrideB = new StringParameterValue("b", "override-b"); + ParametersAction extraParams = new ParametersAction(overrideB); + + ParametersAction params = baseParamsAB.merge(extraParams); + + StringParameterValue a = (StringParameterValue) params.getParameter("a"); + StringParameterValue b = (StringParameterValue) params.getParameter("b"); + assertEquals(baseA, a); + assertEquals(overrideB, b); + } + + @Test + public void mergeShouldCombineDisparateParameters() { + StringParameterValue overrideB = new StringParameterValue("b", "override-b"); + ParametersAction extraParams = new ParametersAction(overrideB); + + ParametersAction params = baseParamsAB.merge(extraParams); + + StringParameterValue a = (StringParameterValue) params.getParameter("a"); + StringParameterValue b = (StringParameterValue) params.getParameter("b"); + assertEquals(baseA, a); + assertEquals(overrideB, b); + } + + @Test + public void mergeShouldHandleEmptyOverrides() { + ParametersAction params = baseParamsAB.merge(new ParametersAction()); + + StringParameterValue a = (StringParameterValue) params.getParameter("a"); + assertEquals(baseA, a); + } + + @Test + public void mergeShouldHandleNullOverrides() { + ParametersAction params = baseParamsAB.merge(null); + + StringParameterValue a = (StringParameterValue) params.getParameter("a"); + assertEquals(baseA, a); + } + + @Test + public void mergeShouldReturnNewInstanceWithOverride() { + StringParameterValue overrideA = new StringParameterValue("a", "override-a"); + ParametersAction overrideParams = new ParametersAction(overrideA); + + ParametersAction params = baseParamsAB.merge(overrideParams); + + assertNotSame(baseParamsAB, params); + } + + @Test + public void createUpdatedShouldReturnNewInstanceWithNullOverride() { + ParametersAction params = baseParamsAB.createUpdated(null); + + assertNotSame(baseParamsAB, params); + } +}