Merge pull request #154 from abayer/jenkins-43681-verify-test

[JENKINS-43681] Just verify that a simple expression works as well
jenkinsci · Apr 25, 2017 · 595bf33 · 595bf33
2 parents a185431 + e2001b6
commit 595bf33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...inition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/EnvironmentTest.java b/...inition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/EnvironmentTest.java
@@ -164,7 +164,8 @@ public void nonLiteralEnvironment() throws Exception {
                         "BUILD_NUM_ENV is 1",
                         "ANOTHER_ENV is 1",
                         "INHERITED_ENV is 1 is inherited",
-                        "ACME_FUNC is banana tada")
+                        "ACME_FUNC is banana tada",
+                        "JUST_A_CONSTANT is 3")
                 .go();
     }
 

diff --git a/pipeline-model-definition/src/test/resources/nonLiteralEnvironment.groovy b/pipeline-model-definition/src/test/resources/nonLiteralEnvironment.groovy
@@ -29,6 +29,7 @@ pipeline {
         ANOTHER_ENV = "${currentBuild.getNumber()}"
         INHERITED_ENV = "\${BUILD_NUM_ENV} is inherited"
         ACME_FUNC = returnAThing("banana")
+        JUST_A_CONSTANT = "${1 + 2}"
     }
 
     agent {
@@ -43,6 +44,7 @@ pipeline {
                 sh 'echo "ANOTHER_ENV is $ANOTHER_ENV"'
                 sh 'echo "INHERITED_ENV is $INHERITED_ENV"'
                 sh 'echo "ACME_FUNC is $ACME_FUNC"'
+                sh 'echo "JUST_A_CONSTANT is $JUST_A_CONSTANT"'
             }
         }
     }