Permalink
Please sign in to comment.
Browse files
[JENKINS-37781] More tests
Fixed some issues those tests revealed. Also fixed a bug where the last line of a script or when closure wasn't parsed
- Loading branch information...
Showing
with
205 additions
and 7 deletions.
- +10 −0 ...line-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
- +23 −5 ...finition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
- +5 −0 ...rc/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
- +16 −0 pipeline-model-definition/src/main/resources/ast-schema.json
- +59 −1 ...-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
- +48 −0 pipeline-model-definition/src/test/resources/when/simpleWhen.groovy
- +43 −0 pipeline-model-definition/src/test/resources/when/whenEmpty.groovy
- +1 −1 pipeline-model-definition/src/test/resources/{simpleWhen.groovy → when/whenException.groovy}
@@ -0,0 +1,48 @@ | |||
/* | |||
* The MIT License | |||
* | |||
* Copyright (c) 2016, CloudBees, Inc. | |||
* | |||
* Permission is hereby granted, free of charge, to any person obtaining a copy | |||
* of this software and associated documentation files (the "Software"), to deal | |||
* in the Software without restriction, including without limitation the rights | |||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||
* copies of the Software, and to permit persons to whom the Software is | |||
* furnished to do so, subject to the following conditions: | |||
* | |||
* The above copyright notice and this permission notice shall be included in | |||
* all copies or substantial portions of the Software. | |||
* | |||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||
* THE SOFTWARE. | |||
* | |||
*/ | |||
|
|||
pipeline { | |||
agent label: "here" | |||
stages { | |||
stage("One") { | |||
steps { | |||
echo "Hello" | |||
} | |||
} | |||
stage("Two") { | |||
when { | |||
echo "Should I run?" | |||
return env.SECOND_STAGE == "RUN" | |||
} | |||
steps { | |||
script { | |||
echo "World" | |||
echo "Heal it" | |||
} | |||
|
|||
} | |||
} | |||
} | |||
} |
@@ -0,0 +1,43 @@ | |||
/* | |||
* The MIT License | |||
* | |||
* Copyright (c) 2016, CloudBees, Inc. | |||
* | |||
* Permission is hereby granted, free of charge, to any person obtaining a copy | |||
* of this software and associated documentation files (the "Software"), to deal | |||
* in the Software without restriction, including without limitation the rights | |||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||
* copies of the Software, and to permit persons to whom the Software is | |||
* furnished to do so, subject to the following conditions: | |||
* | |||
* The above copyright notice and this permission notice shall be included in | |||
* all copies or substantial portions of the Software. | |||
* | |||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||
* THE SOFTWARE. | |||
* | |||
*/ | |||
|
|||
pipeline { | |||
agent label: "here" | |||
stages { | |||
stage("One") { | |||
steps { | |||
echo "Hello" | |||
} | |||
} | |||
stage("Two") { | |||
when { | |||
|
|||
} | |||
steps { | |||
echo "World" | |||
} | |||
} | |||
} | |||
} |
0 comments on commit
819bbdf