Skip to content

[JENKINS-46124] - support map with EnvStep #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jetersen wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[JENKINS-46124] - support map with EnvStep #105

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21ab92d
support map with EnvStep
jetersen Jan 27, 2020
898b05e
map arguments to string
jetersen Jan 27, 2020
b89ccbc
call toString on value
jetersen Jan 27, 2020
34178ae
DRY
jetersen Jan 30, 2020
2b151a0
simplify map tests and conversion based on review
jetersen Feb 3, 2020
1aa3c3f
add missing env from assertion
jetersen Feb 3, 2020
20d8cf7
check null values
jetersen Feb 19, 2020
4f52a0f
a comma too much
jetersen Feb 19, 2020
8d385a2
Cast key to String
jetersen Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
check null values
  • Loading branch information
@jetersen
jetersen committed Feb 19, 2020
commit 20d8cf70d5bcff02244d21574010d1a11652bf1e
16 changes: 8 additions & 8 deletions src/test/java/org/jenkinsci/plugins/workflow/steps/EnvStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,19 +164,19 @@ public class EnvStepTest {
WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition(
"node {\n" +
" withEnv(a: 1, b: 2, c: 'hello world', d: true) {\n" +
" echo \"a=$a b=$b c=$c d=$d\"" +
" withEnv(a: 1, b: 2, c: 'hello world', d: true, e: null) {\n" +
" echo(/a=$a b=$b c=$c d=$d, e=${env.e}/)" +
" }\n" +
"}", true));
WorkflowRun b = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0));
story.j.assertLogContains("a=1 b=2 c=hello world d=true", b);
story.j.assertLogContains("a=1 b=2 c=hello world d=true e=null", b);
List<FlowNode> coreStepNodes = new DepthFirstScanner().filteredNodes(
b.getExecution(),
Predicates.and(
new NodeStepTypePredicate("withEnv"),
n -> n instanceof StepStartNode && !((StepStartNode) n).isBody()));
assertThat(coreStepNodes, Matchers.hasSize(1));
assertEquals("a, b, c, d", ArgumentsAction.getStepArgumentsAsString(coreStepNodes.get(0)));
assertEquals("a, b, c, d, e", ArgumentsAction.getStepArgumentsAsString(coreStepNodes.get(0)));
}
});
}
Expand All @@ -187,19 +187,19 @@ public class EnvStepTest {
WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "p");
p.setDefinition(new CpsFlowDefinition(
"node {\n" +
" withEnv([A: 1, B: 2, C: 'hello world', D: true]) {\n" +
" echo \"A=$A B=$B C=$C D=$D\"\n" +
" withEnv([A: 1, B: 2, C: 'hello world', D: true, E: null]) {\n" +
" echo(/A=$A B=$B C=$C D=$D E=${env.E}/)\n" +
" }\n" +
"}", true));
WorkflowRun b = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0));
story.j.assertLogContains("A=1 B=2 C=hello world D=true", b);
story.j.assertLogContains("A=1 B=2 C=hello world D=true E=null", b);
List<FlowNode> coreStepNodes = new DepthFirstScanner().filteredNodes(
b.getExecution(),
Predicates.and(
new NodeStepTypePredicate("withEnv"),
n -> n instanceof StepStartNode && !((StepStartNode) n).isBody()));
assertThat(coreStepNodes, Matchers.hasSize(1));
assertEquals("A, B, C, D", ArgumentsAction.getStepArgumentsAsString(coreStepNodes.get(0)));
assertEquals("A, B, C, D, E", ArgumentsAction.getStepArgumentsAsString(coreStepNodes.get(0)));
}
});
}
Expand Down